lifegpc/eh-downloader
1
0
Fork 0
mirror of https://github.com/lifegpc/eh-downloader.git synced 2026-07-08 01:31:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug

Browse Source
This commit is contained in:
lifegpc
2024-06-07 21:39:07 +08:00
parent 55fd040eb0
commit 60080258e1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tasks/import.ts
View File

@@ -34,6 +34,8 @@ interface Page {
sampled_name: string;
}
const VALID_EXTS = [".jpg", ".png", ".gif"];
const PROGRESS_UPDATE_INTERVAL = 200;
class ImportManager {
@@ -161,9 +163,10 @@ class FileLoader {
if (this.#has_prefix) {
name = `${index.toString().padStart(3, "0")}_${name}`;
}
console.log(name);
let t = this.#get_file(name);
if (t) return t;
const ext = extname(name);
const ext = extname(name).toLowerCase();
if (ext != ".jpg") {
const n = name.slice(0, name.length - 4) + ".jpg";
t = this.#get_file(n);
@@ -173,7 +176,7 @@ class FileLoader {
get_zip(name: string) {
let t = this.#get_zip(name);
if (t) return t;
const ext = extname(name);
const ext = extname(name).toLowerCase();
if (ext != ".jpg") {
const n = name.slice(0, name.length - 4) + ".jpg";
t = this.#get_zip(n);
@@ -191,6 +194,10 @@ class FileLoader {
let has_prefix = true;
const re = new RegExp(`^\\d{${this.#filecount.toString().length}}_`);
for (const f of this.#files) {
const ext = extname(f).toLowerCase();
if (!VALID_EXTS.includes(ext)) {
continue;
}
if (!f.match(re)) {
has_prefix = false;
break;
@@ -331,8 +338,8 @@ export async function import_task(task: Task, manager: TaskManager) {
token: i.token,
};
db.add_pmeta(pmeta);
const oriext = extname(i.name);
const nowext = extname(opath);
const oriext = extname(i.name).toLowerCase();
const nowext = extname(opath).toLowerCase();
const is_original = icfg.size == ImportSize.Original ||
(oriext != ".jpg" && oriext == nowext) ||
(oriext == nowext && size.width < icfg.size);