From 130c3393734bdf850297808009cd0ccbffc08286 Mon Sep 17 00:00:00 2001 From: Alperen Elhan Date: Fri, 14 Oct 2022 17:24:33 +0300 Subject: [PATCH] feat: cancel job if exists --- src/server/queue/checkChapters.ts | 28 ++++++++++++++++++++++++---- src/server/trpc/router/manga.ts | 4 ++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/server/queue/checkChapters.ts b/src/server/queue/checkChapters.ts index c7374f8..69dc691 100644 --- a/src/server/queue/checkChapters.ts +++ b/src/server/queue/checkChapters.ts @@ -44,7 +44,7 @@ const checkChapters = async (manga: MangaWithLibrary) => { opts: { jobId: `${sanitizer(manga.title)}_${chapterIndex - 1}_download`, }, - name: `${sanitizer(manga.title)}_${chapterIndex - 1}_download`, + name: `${sanitizer(manga.title)}_chapter#${chapterIndex - 1}_download`, data: { chapterIndex: chapterIndex - 1, source: manga.source, @@ -78,19 +78,39 @@ export const checkChaptersWorker = new Worker( }, ); +export const getJobIdFromTitle = (title: string) => `check_${sanitizer(title)}_chapters`; + +export const removeJob = async (title: string) => { + const jobId = getJobIdFromTitle(title); + const jobs = await checkChaptersQueue.getJobs('delayed'); + await Promise.all( + jobs + .filter((job) => job.opts.repeat?.jobId === jobId) + .map(async (job) => { + if (job.id) { + return checkChaptersQueue.remove(job.id); + } + return null; + }), + ); +}; + export const schedule = async (manga: MangaWithLibrary) => { if (manga.interval === 'never') { return; } + await removeJob(manga.title); + const jobId = getJobIdFromTitle(manga.title); + await checkChaptersQueue.add( - `check_${manga.title}_chapters`, + jobId, { manga, }, { - jobId: `check_${manga.libraryId}_${manga.id}_chapters`, - repeatJobKey: `check_${manga.libraryId}_${manga.id}_chapters`, + jobId, + repeatJobKey: jobId, repeat: { pattern: cronMap[manga.interval as keyof typeof cronMap], }, diff --git a/src/server/trpc/router/manga.ts b/src/server/trpc/router/manga.ts index 9aceb3e..f7a97bb 100644 --- a/src/server/trpc/router/manga.ts +++ b/src/server/trpc/router/manga.ts @@ -2,7 +2,7 @@ import { TRPCError } from '@trpc/server'; import path from 'path'; import { z } from 'zod'; import { sanitizer } from '../../../utils/sanitize'; -import { schedule } from '../../queue/checkChapters'; +import { removeJob, schedule } from '../../queue/checkChapters'; import { getAvailableSources, getMangaDetail, removeManga, search } from '../../utils/mangal'; import { t } from '../trpc'; @@ -68,7 +68,7 @@ export const mangaRouter = t.router({ }); const mangaPath = path.resolve(removed.Library.path, sanitizer(removed.title)); await removeManga(mangaPath); - // TODO: remove jobs also + await removeJob(removed.title); }), add: t.procedure .input(