feat: cancel job if exists

oae · Oct 14, 2022 · 130c339 · 130c339
1 parent bce4832
commit 130c339
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git 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
@@ -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(