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

Better Ctrl + C support for download task

Browse Source
This commit is contained in:
lifegpc
2023-05-22 12:48:17 +08:00
parent 65efeec673
commit 5b89f1a556
4 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
task_manager.ts
View File

@@ -17,9 +17,13 @@ export class TaskManager {
db;
running_tasks: Map<number, Promise<Task>>;
max_task_count;
#abort;
#force_abort;
constructor(cfg: Config) {
this.cfg = cfg;
this.client = new Client(cfg);
this.#abort = new AbortController();
this.#force_abort = new AbortController();
this.client = new Client(cfg, this.#force_abort.signal);
this.db = new EhDb(cfg.db_path || cfg.base);
this.running_tasks = new Map();
this.max_task_count = cfg.max_task_count;
@@ -28,6 +32,12 @@ export class TaskManager {
#check_closed() {
if (this.#closed) throw new AlreadyClosedError();
}
abort(reason?: unknown) {
this.#abort.abort(reason);
}
get aborted() {
return this.#abort.signal.aborted;
}
async add_download_task(gid: number, token: string) {
this.#check_closed();
const otask = await this.db.check_download_task(gid, token);
@@ -74,7 +84,7 @@ export class TaskManager {
removed_task.push(id);
await this.db.delete_task(status.value);
} else if (status.status == PromiseStatus.Rejected) {
if (status.reason) console.log(status.reason);
if (status.reason && !this.aborted) console.log(status.reason);
removed_task.push(id);
}
}
@@ -87,7 +97,14 @@ export class TaskManager {
this.#closed = true;
this.db.close();
}
force_abort(reason?: unknown) {
this.#force_abort.abort(reason);
}
get force_aborted() {
return this.#force_abort.signal.aborted;
}
async run() {
if (this.aborted || this.force_aborted) throw new AlreadyClosedError();
this.#check_closed();
while (1) {
await this.check_running_tasks();
@@ -116,8 +133,22 @@ export class TaskManager {
if (task.type == TaskType.Download) {
this.running_tasks.set(
task.id,
download_task(task, this.client, this.db, this.cfg),
download_task(
task,
this.client,
this.db,
this.cfg,
this.#abort.signal,
this.#force_abort.signal,
),
);
}
}
async waiting_unfinished_task() {
while (1) {
await this.check_running_tasks();
if (this.running_tasks.size == 0) break;
await sleep(10);
}
}
}