Set<number | bigint> Map<number | bigint, xxx> not works well

This commit is contained in:
2024-05-31 14:36:26 +08:00
parent 8ea3ee98b1
commit f57808c2ff
4 changed files with 11 additions and 11 deletions

View File

@@ -37,7 +37,7 @@ export type GalleryMetadataSingle = {
class GalleryMetadata {
obj;
map: Map<number | bigint, GalleryMetadataSingle | string>;
map: Map<bigint, GalleryMetadataSingle | string>;
constructor(text: string) {
this.obj = JSON.parse(text);
this.map = new Map();

View File

@@ -23,7 +23,7 @@ export const handler: Handlers = {
const gids = new Set(
ctx.params.gids.split(",").map((v) => parseBigInt(v)).filter((v) =>
!isNumNaN(v)
),
).map((v) => BigInt(v)),
);
const m = get_task_manager();
const re: Record<string, JSONResult<GMeta>> = {};

View File

@@ -55,7 +55,7 @@ export class TaskManager extends EventTarget {
cfg;
client;
db;
running_tasks: Map<number | bigint, RunningTask>;
running_tasks: Map<bigint, RunningTask>;
max_task_count;
meilisearch?: MeiliSearchServer;
#abort;
@@ -190,7 +190,7 @@ export class TaskManager extends EventTarget {
async check_task_is_running(task: Task) {
this.#check_closed();
if (task.pid == Deno.pid) {
return this.running_tasks.has(task.id);
return this.running_tasks.has(BigInt(task.id));
} else {
const r = await check_running(task.pid);
return r === true;
@@ -221,7 +221,7 @@ export class TaskManager extends EventTarget {
}
}
for (const id of removed_task) {
this.running_tasks.delete(id);
this.running_tasks.delete(BigInt(id));
}
for (const id of fataled_task) {
await this.db.delete_task_by_id(id);
@@ -309,7 +309,7 @@ export class TaskManager extends EventTarget {
? JSON.parse(task.details)
: DEFAULT_DOWNLOAD_CONFIG;
this.running_tasks.set(
task.id,
BigInt(task.id),
{
task: download_task(
task,
@@ -329,7 +329,7 @@ export class TaskManager extends EventTarget {
? JSON.parse(task.details)
: DEFAULT_EXPORT_ZIP_CONFIG;
this.running_tasks.set(
task.id,
BigInt(task.id),
{
task: export_zip(
task,
@@ -344,20 +344,20 @@ export class TaskManager extends EventTarget {
);
} else if (task.type === TaskType.UpdateMeiliSearchData) {
await this.waiting_unfinished_task();
this.running_tasks.set(task.id, {
this.running_tasks.set(BigInt(task.id), {
task: update_meili_search_data(task, this),
base: task,
});
} else if (task.type === TaskType.FixGalleryPage) {
await this.waiting_unfinished_task();
this.running_tasks.set(task.id, {
this.running_tasks.set(BigInt(task.id), {
task: fix_gallery_page(task, this),
base: task,
});
}
}
async update_task(t: Task) {
const r = this.running_tasks.get(t.id);
const r = this.running_tasks.get(BigInt(t.id));
if (r) {
r.base.details = t.details;
}

View File

@@ -212,7 +212,7 @@ export async function download_task(
task.gid,
task.token,
]);
const gdata = gdatas.map.get(task.gid);
const gdata = gdatas.map.get(BigInt(task.gid));
if (gdata === undefined) throw Error("Gallery metadata not included.");
if (typeof gdata === "string") throw Error(gdata);
const gmeta = gdatas.convert(gdata);