This commit is contained in:
wgh136
2024-05-15 11:16:05 +08:00
parent 8f0e44216a
commit 2826f9f592
5 changed files with 263 additions and 26 deletions

View File

@@ -114,11 +114,15 @@ class DownloadingTask {
static String _generateFilePath(Illust illust, int index, String ext) {
final String downloadPath = appdata.settings["downloadPath"];
String subPathPatten = appdata.settings["downloadSubPath"];
final tags = appdata.settings["useTranslatedNameForDownload"] == false
? illust.tags.map((e) => e.name).toList()
: illust.tags.map((e) => e.translatedName ?? e.name).toList();
final tagsWeight = (appdata.settings["tagsWeight"] as String).split(' ');
tags.sort((a, b) => tagsWeight.indexOf(a) - tagsWeight.indexOf(b));
final originalTags = List<Tag>.from(illust.tags);
originalTags.sort((a, b){
return tagsWeight.indexOf(a.name) - tagsWeight.indexOf(b.name);
});
final tags = appdata.settings["useTranslatedNameForDownload"] == false
? originalTags.map((e) => e.name).toList()
: originalTags.map((e) => e.translatedName ?? e.name).toList();
subPathPatten = subPathPatten.replaceAll(r"${id}", illust.id.toString());
subPathPatten = subPathPatten.replaceAll(r"${title}", illust.title);
subPathPatten = subPathPatten.replaceAll(r"${author}", illust.author.name);

View File

@@ -106,7 +106,14 @@ class Network {
},
options: Options(
contentType: Headers.formUrlEncodedContentType,
validateStatus: (i) => true,
headers: headers));
if(res.statusCode != 200) {
var data = res.data ?? "";
if(data.contains("Invalid refresh token")) {
throw "Failed to refresh token. Plaese logout and re-login";
}
}
var account = Account.fromJson(json.decode(res.data!));
appdata.account = account;
appdata.writeData();