Merge branch 'main' into feature/better-repack-modal

src/main/services/repack-tracker/online-fix.ts

@@ -3,21 +3,19 @@ import { decodeNonUtf8Response, savePage } from "./helpers";
 import { logger } from "../logger";
 import { JSDOM } from "jsdom";
 
-import { format, parse, sub } from "date-fns";
-import { ru } from "date-fns/locale";
-
 import createWorker from "@main/workers/torrent-parser.worker?nodeWorker";
 import { toMagnetURI } from "parse-torrent";
 
 const worker = createWorker({});
 
-import { onlinefixFormatter } from "@main/helpers";
 import makeFetchCookie from "fetch-cookie";
 import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
 import { formatBytes } from "@shared";
 
 const ONLINE_FIX_URL = "https://online-fix.me/";
 
+let totalPages = 1;
+
 export const getNewRepacksFromOnlineFix = async (
   existingRepacks: Repack[] = [],
   page = 1,
@@ -74,18 +72,16 @@ export const getNewRepacksFromOnlineFix = async (
 
   const repacks: QueryDeepPartialEntity<Repack>[] = [];
   const articles = Array.from(document.querySelectorAll(".news"));
-  const totalPages = Number(
-    document.querySelector("nav > a:nth-child(13)")?.textContent
-  );
+
+  if (page == 1) {
+    totalPages = Number(
+      document.querySelector("nav > a:nth-child(13)")?.textContent
+    );
+  }
 
   try {
     await Promise.all(
       articles.map(async (article) => {
-        const gameText = article.querySelector("h2.title")?.textContent?.trim();
-        if (!gameText) return;
-
-        const gameName = onlinefixFormatter(gameText);
-
         const gameLink = article.querySelector("a")?.getAttribute("href");
         if (!gameLink) return;
 
@@ -94,32 +90,6 @@ export const getNewRepacksFromOnlineFix = async (
         );
         const gameDocument = new JSDOM(gamePage).window.document;
 
-        const uploadDateText = gameDocument.querySelector("time")?.textContent;
-        if (!uploadDateText) return;
-
-        let decodedDateText = uploadDateText;
-
-        // "Вчера" means yesterday.
-        if (decodedDateText.includes("Вчера")) {
-          const yesterday = sub(new Date(), { days: 1 });
-          const formattedYesterday = format(yesterday, "d LLLL yyyy", {
-            locale: ru,
-          });
-          decodedDateText = decodedDateText.replace(
-            "Вчера", // "Change yesterday to the default expected date format"
-            formattedYesterday
-          );
-        }
-
-        const uploadDate = parse(
-          decodedDateText,
-          "d LLLL yyyy, HH:mm",
-          new Date(),
-          {
-            locale: ru,
-          }
-        );
-
         const torrentButtons = Array.from(
           gameDocument.querySelectorAll("a")
         ).filter((a) => a.textContent?.includes("Torrent"));
@@ -148,13 +118,15 @@ export const getNewRepacksFromOnlineFix = async (
         worker.once("message", (torrent) => {
           if (!torrent) return;
 
+          const { name, created } = torrent;
+
           repacks.push({
             fileSize: formatBytes(torrent.length ?? 0),
             magnet: toMagnetURI(torrent),
             page: 1,
             repacker: "onlinefix",
-            title: gameName,
-            uploadDate: uploadDate,
+            title: name,
+            uploadDate: created,
           });
         });
 

src/main/services/repack-tracker/xatab.ts

@@ -12,6 +12,9 @@ import { formatBytes } from "@shared";
 import { getFileBuffer } from "@main/helpers";
 
 const worker = createWorker({});
+worker.setMaxListeners(11);
+
+let totalPages = 1;
 
 const formatXatabDate = (str: string) => {
   const date = new Date();
@@ -69,27 +72,37 @@ export const getNewRepacksFromXatab = async (
 
   const repacks: QueryDeepPartialEntity<Repack>[] = [];
 
-  for (const $a of Array.from(
-    window.document.querySelectorAll(".entry__title a")
-  )) {
-    try {
-      const repack = await getXatabRepack(($a as HTMLAnchorElement).href);
-
-      if (repack) {
-        repacks.push({
-          title: $a.textContent!,
-          repacker: "Xatab",
-          ...repack,
-          page,
-        });
-      }
-    } catch (err: unknown) {
-      logger.error((err as Error).message, {
-        method: "getNewRepacksFromXatab",
-      });
-    }
+  if (page === 1) {
+    totalPages = Number(
+      window.document.querySelector(
+        "#bottom-nav > div.pagination > a:nth-child(12)"
+      )?.textContent
+    );
   }
 
+  const repacksFromPage = Array.from(
+    window.document.querySelectorAll(".entry__title a")
+  ).map(($a) => {
+    return getXatabRepack(($a as HTMLAnchorElement).href)
+      .then((repack) => {
+        if (repack) {
+          repacks.push({
+            title: $a.textContent!,
+            repacker: "Xatab",
+            ...repack,
+            page,
+          });
+        }
+      })
+      .catch((err: unknown) => {
+        logger.error((err as Error).message, {
+          method: "getNewRepacksFromXatab",
+        });
+      });
+  });
+
+  await Promise.all(repacksFromPage);
+
   const newRepacks = repacks.filter(
     (repack) =>
       !existingRepacks.some(
@@ -98,6 +111,7 @@ export const getNewRepacksFromXatab = async (
   );
 
   if (!newRepacks.length) return;
+  if (page === totalPages) return;
 
   await savePage(newRepacks);