From 68b361e60512d5cd2acb30e300a532414986aeb6 Mon Sep 17 00:00:00 2001
From: Chubby Granny Chaser <hydralauncher@proton.me>
Date: Thu, 15 Aug 2024 20:46:21 +0100
Subject: [PATCH] feat: fixing real debrid download

---
 package.json                                  |   3 +-
 .../events/torrenting/start-game-download.ts  |   4 -
 .../services/download/download-manager.ts     |   2 -
 .../download/generic-http-downloader.ts       |  25 ++-
 src/main/services/download/http-download.ts   |   2 +-
 .../download/real-debrid-downloader.ts        |  58 ++-----
 src/main/services/real-debrid.ts              |   2 +-
 src/renderer/src/app.css.ts                   |   2 +-
 src/renderer/src/components/hero/hero.css.ts  |   1 -
 .../src/components/modal/modal.css.ts         |   1 +
 src/renderer/src/main.tsx                     |  10 +-
 .../src/pages/downloads/downloads.tsx         |   4 +-
 .../description-header/description-header.tsx |   5 +-
 .../pages/game-details/game-details.css.ts    |   1 -
 .../pages/game-details/hero/hero-panel.css.ts |   1 +
 .../modals/download-settings-modal.tsx        |  24 ++-
 .../modals/game-options-modal.css.ts          |   1 -
 .../pages/game-details/sidebar/sidebar.css.ts |   1 -
 .../settings/settings-download-sources.tsx    |   4 +-
 .../settings/settings-real-debrid.css.ts      |   1 -
 .../src/pages/user/user-block-modal.tsx       |   4 +-
 src/renderer/src/pages/user/user-content.tsx  |   6 +-
 .../src/pages/user/user-sign-out-modal.tsx    |   2 +-
 src/shared/index.ts                           |   3 +
 torrent-client/downloader.py                  |  62 -------
 torrent-client/main.py                        |  26 +--
 torrent-client/torrent_downloader.py          | 158 ++++++++++++++++++
 yarn.lock                                     |  13 +-
 28 files changed, 241 insertions(+), 185 deletions(-)
 delete mode 100644 torrent-client/downloader.py
 create mode 100644 torrent-client/torrent_downloader.py

diff --git a/package.json b/package.json
index 54d689b2..aa77084e 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,7 @@
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
-    "@fontsource/fira-mono": "^5.0.13",
-    "@fontsource/fira-sans": "^5.0.20",
+    "@fontsource/noto-sans": "^5.0.22",
     "@primer/octicons-react": "^19.9.0",
     "@reduxjs/toolkit": "^2.2.3",
     "@sentry/electron": "^5.1.0",
diff --git a/src/main/events/torrenting/start-game-download.ts b/src/main/events/torrenting/start-game-download.ts
index aa33c99a..cea41596 100644
--- a/src/main/events/torrenting/start-game-download.ts
+++ b/src/main/events/torrenting/start-game-download.ts
@@ -44,8 +44,6 @@ const startGameDownload = async (
   );
 
   if (game) {
-    console.log("game", game);
-
     await gameRepository.update(
       {
         id: game.id,
@@ -97,8 +95,6 @@ const startGameDownload = async (
     },
   });
 
-  console.log(updatedGame);
-
   createGame(updatedGame!);
 
   await downloadQueueRepository.delete({ game: { id: updatedGame!.id } });
diff --git a/src/main/services/download/download-manager.ts b/src/main/services/download/download-manager.ts
index b9c9d5a6..52a66693 100644
--- a/src/main/services/download/download-manager.ts
+++ b/src/main/services/download/download-manager.ts
@@ -102,8 +102,6 @@ export class DownloadManager {
       const token = await GofileApi.authorize();
       const downloadLink = await GofileApi.getDownloadLink(id!);
 
-      console.log(downloadLink, token, "<<<");
-
       GenericHTTPDownloader.startDownload(game, downloadLink, {
         Cookie: `accountToken=${token}`,
       });
diff --git a/src/main/services/download/generic-http-downloader.ts b/src/main/services/download/generic-http-downloader.ts
index 4977d503..8384a5fd 100644
--- a/src/main/services/download/generic-http-downloader.ts
+++ b/src/main/services/download/generic-http-downloader.ts
@@ -2,7 +2,7 @@ import { Game } from "@main/entity";
 import { gameRepository } from "@main/repository";
 import { calculateETA } from "./helpers";
 import { DownloadProgress } from "@types";
-import { HTTPDownload } from "./http-download";
+import { HttpDownload } from "./http-download";
 
 export class GenericHTTPDownloader {
   private static downloads = new Map<number, string>();
@@ -11,7 +11,7 @@ export class GenericHTTPDownloader {
   public static async getStatus() {
     if (this.downloadingGame) {
       const gid = this.downloads.get(this.downloadingGame.id)!;
-      const status = await HTTPDownload.getStatus(gid);
+      const status = HttpDownload.getStatus(gid);
 
       if (status) {
         const progress =
@@ -60,7 +60,7 @@ export class GenericHTTPDownloader {
       const gid = this.downloads.get(this.downloadingGame!.id!);
 
       if (gid) {
-        await HTTPDownload.pauseDownload(gid);
+        await HttpDownload.pauseDownload(gid);
       }
 
       this.downloadingGame = null;
@@ -76,26 +76,23 @@ export class GenericHTTPDownloader {
 
     if (this.downloads.has(game.id)) {
       await this.resumeDownload(game.id!);
-
       return;
     }
 
-    if (downloadUrl) {
-      const gid = await HTTPDownload.startDownload(
-        game.downloadPath!,
-        downloadUrl,
-        headers
-      );
+    const gid = await HttpDownload.startDownload(
+      game.downloadPath!,
+      downloadUrl,
+      headers
+    );
 
-      this.downloads.set(game.id!, gid);
-    }
+    this.downloads.set(game.id!, gid);
   }
 
   static async cancelDownload(gameId: number) {
     const gid = this.downloads.get(gameId);
 
     if (gid) {
-      await HTTPDownload.cancelDownload(gid);
+      await HttpDownload.cancelDownload(gid);
       this.downloads.delete(gameId);
     }
   }
@@ -104,7 +101,7 @@ export class GenericHTTPDownloader {
     const gid = this.downloads.get(gameId);
 
     if (gid) {
-      await HTTPDownload.resumeDownload(gid);
+      await HttpDownload.resumeDownload(gid);
     }
   }
 }
diff --git a/src/main/services/download/http-download.ts b/src/main/services/download/http-download.ts
index fb573ff4..cd8cbee5 100644
--- a/src/main/services/download/http-download.ts
+++ b/src/main/services/download/http-download.ts
@@ -2,7 +2,7 @@ import { DownloadItem } from "electron";
 import { WindowManager } from "../window-manager";
 import path from "node:path";
 
-export class HTTPDownload {
+export class HttpDownload {
   private static id = 0;
 
   private static downloads: Record<string, DownloadItem> = {};
diff --git a/src/main/services/download/real-debrid-downloader.ts b/src/main/services/download/real-debrid-downloader.ts
index f61cb1ff..c6925f57 100644
--- a/src/main/services/download/real-debrid-downloader.ts
+++ b/src/main/services/download/real-debrid-downloader.ts
@@ -3,7 +3,7 @@ import { RealDebridClient } from "../real-debrid";
 import { gameRepository } from "@main/repository";
 import { calculateETA } from "./helpers";
 import { DownloadProgress } from "@types";
-import { HTTPDownload } from "./http-download";
+import { HttpDownload } from "./http-download";
 
 export class RealDebridDownloader {
   private static downloads = new Map<number, string>();
@@ -13,19 +13,23 @@ export class RealDebridDownloader {
 
   private static async getRealDebridDownloadUrl() {
     if (this.realDebridTorrentId) {
-      const torrentInfo = await RealDebridClient.getTorrentInfo(
+      let torrentInfo = await RealDebridClient.getTorrentInfo(
         this.realDebridTorrentId
       );
 
-      const { status, links } = torrentInfo;
-
-      if (status === "waiting_files_selection") {
+      if (torrentInfo.status === "waiting_files_selection") {
         await RealDebridClient.selectAllFiles(this.realDebridTorrentId);
-        return null;
+
+        torrentInfo = await RealDebridClient.getTorrentInfo(
+          this.realDebridTorrentId
+        );
       }
 
+      const { links, status } = torrentInfo;
+
       if (status === "downloaded") {
         const [link] = links;
+
         const { download } = await RealDebridClient.unrestrictLink(link);
         return decodeURIComponent(download);
       }
@@ -38,8 +42,6 @@ export class RealDebridDownloader {
         this.downloadingGame?.uri
       );
 
-      console.log("download>>", download);
-
       return decodeURIComponent(download);
     }
 
@@ -49,7 +51,7 @@ export class RealDebridDownloader {
   public static async getStatus() {
     if (this.downloadingGame) {
       const gid = this.downloads.get(this.downloadingGame.id)!;
-      const status = await HTTPDownload.getStatus(gid);
+      const status = HttpDownload.getStatus(gid);
 
       if (status) {
         const progress =
@@ -91,33 +93,6 @@ export class RealDebridDownloader {
       }
     }
 
-    if (this.realDebridTorrentId && this.downloadingGame) {
-      const torrentInfo = await RealDebridClient.getTorrentInfo(
-        this.realDebridTorrentId
-      );
-
-      const { status } = torrentInfo;
-
-      if (status === "downloaded") {
-        this.startDownload(this.downloadingGame);
-      }
-
-      const progress = torrentInfo.progress / 100;
-      const totalDownloaded = progress * torrentInfo.bytes;
-
-      return {
-        numPeers: 0,
-        numSeeds: torrentInfo.seeders,
-        downloadSpeed: torrentInfo.speed,
-        timeRemaining: calculateETA(
-          torrentInfo.bytes,
-          totalDownloaded,
-          torrentInfo.speed
-        ),
-        isDownloadingMetadata: status === "magnet_conversion",
-      } as DownloadProgress;
-    }
-
     return null;
   }
 
@@ -125,7 +100,7 @@ export class RealDebridDownloader {
     if (this.downloadingGame) {
       const gid = this.downloads.get(this.downloadingGame.id);
       if (gid) {
-        await HTTPDownload.pauseDownload(gid);
+        await HttpDownload.pauseDownload(gid);
       }
     }
 
@@ -146,18 +121,19 @@ export class RealDebridDownloader {
       );
     }
 
+    this.downloadingGame = game;
+
     const downloadUrl = await this.getRealDebridDownloadUrl();
 
     if (downloadUrl) {
       this.realDebridTorrentId = null;
 
-      const gid = await HTTPDownload.startDownload(
+      const gid = await HttpDownload.startDownload(
         game.downloadPath!,
         downloadUrl
       );
 
       this.downloads.set(game.id!, gid);
-      this.downloadingGame = game;
     }
   }
 
@@ -165,7 +141,7 @@ export class RealDebridDownloader {
     const gid = this.downloads.get(gameId);
 
     if (gid) {
-      await HTTPDownload.cancelDownload(gid);
+      await HttpDownload.cancelDownload(gid);
       this.downloads.delete(gameId);
     }
 
@@ -177,7 +153,7 @@ export class RealDebridDownloader {
     const gid = this.downloads.get(gameId);
 
     if (gid) {
-      await HTTPDownload.resumeDownload(gid);
+      await HttpDownload.resumeDownload(gid);
     }
   }
 }
diff --git a/src/main/services/real-debrid.ts b/src/main/services/real-debrid.ts
index 2e0debe6..26ba4c79 100644
--- a/src/main/services/real-debrid.ts
+++ b/src/main/services/real-debrid.ts
@@ -46,7 +46,7 @@ export class RealDebridClient {
   static async selectAllFiles(id: string) {
     const searchParams = new URLSearchParams({ files: "all" });
 
-    await this.instance.post(
+    return this.instance.post(
       `/torrents/selectFiles/${id}`,
       searchParams.toString()
     );
diff --git a/src/renderer/src/app.css.ts b/src/renderer/src/app.css.ts
index a5f9394b..c829021a 100644
--- a/src/renderer/src/app.css.ts
+++ b/src/renderer/src/app.css.ts
@@ -26,7 +26,7 @@ globalStyle("html, body, #root, main", {
 globalStyle("body", {
   overflow: "hidden",
   userSelect: "none",
-  fontFamily: "'Fira Mono', monospace",
+  fontFamily: "Noto Sans, sans-serif",
   fontSize: vars.size.body,
   background: vars.color.background,
   color: vars.color.body,
diff --git a/src/renderer/src/components/hero/hero.css.ts b/src/renderer/src/components/hero/hero.css.ts
index cdb36ee2..eaf0a101 100644
--- a/src/renderer/src/components/hero/hero.css.ts
+++ b/src/renderer/src/components/hero/hero.css.ts
@@ -45,7 +45,6 @@ export const description = style({
   maxWidth: "700px",
   color: vars.color.muted,
   textAlign: "left",
-  fontFamily: "'Fira Sans', sans-serif",
   lineHeight: "20px",
   marginTop: `${SPACING_UNIT * 2}px`,
 });
diff --git a/src/renderer/src/components/modal/modal.css.ts b/src/renderer/src/components/modal/modal.css.ts
index 45154015..d9d14fda 100644
--- a/src/renderer/src/components/modal/modal.css.ts
+++ b/src/renderer/src/components/modal/modal.css.ts
@@ -24,6 +24,7 @@ export const modal = recipe({
     animation: `${scaleFadeIn} 0.2s cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running`,
     backgroundColor: vars.color.background,
     borderRadius: "4px",
+    minWidth: "400px",
     maxWidth: "600px",
     color: vars.color.body,
     maxHeight: "100%",
diff --git a/src/renderer/src/main.tsx b/src/renderer/src/main.tsx
index f87d66bf..b88348f0 100644
--- a/src/renderer/src/main.tsx
+++ b/src/renderer/src/main.tsx
@@ -8,12 +8,10 @@ import { HashRouter, Route, Routes } from "react-router-dom";
 
 import * as Sentry from "@sentry/electron/renderer";
 
-import "@fontsource/fira-mono/400.css";
-import "@fontsource/fira-mono/500.css";
-import "@fontsource/fira-mono/700.css";
-import "@fontsource/fira-sans/400.css";
-import "@fontsource/fira-sans/500.css";
-import "@fontsource/fira-sans/700.css";
+import "@fontsource/noto-sans/400.css";
+import "@fontsource/noto-sans/500.css";
+import "@fontsource/noto-sans/700.css";
+
 import "react-loading-skeleton/dist/skeleton.css";
 
 import { App } from "./app";
diff --git a/src/renderer/src/pages/downloads/downloads.tsx b/src/renderer/src/pages/downloads/downloads.tsx
index 531bc526..5a9c228c 100644
--- a/src/renderer/src/pages/downloads/downloads.tsx
+++ b/src/renderer/src/pages/downloads/downloads.tsx
@@ -132,9 +132,7 @@ export function Downloads() {
             <ArrowDownIcon size={24} />
           </div>
           <h2>{t("no_downloads_title")}</h2>
-          <p style={{ fontFamily: "Fira Sans" }}>
-            {t("no_downloads_description")}
-          </p>
+          <p>{t("no_downloads_description")}</p>
         </div>
       )}
     </>
diff --git a/src/renderer/src/pages/game-details/description-header/description-header.tsx b/src/renderer/src/pages/game-details/description-header/description-header.tsx
index e4272534..cd73c52a 100644
--- a/src/renderer/src/pages/game-details/description-header/description-header.tsx
+++ b/src/renderer/src/pages/game-details/description-header/description-header.tsx
@@ -19,7 +19,10 @@ export function DescriptionHeader() {
             date: shopDetails?.release_date.date,
           })}
         </p>
-        <p>{t("publisher", { publisher: shopDetails.publishers[0] })}</p>
+
+        {Array.isArray(shopDetails.publishers) && (
+          <p>{t("publisher", { publisher: shopDetails.publishers[0] })}</p>
+        )}
       </section>
     </div>
   );
diff --git a/src/renderer/src/pages/game-details/game-details.css.ts b/src/renderer/src/pages/game-details/game-details.css.ts
index f0bbfd2e..3dc0ec94 100644
--- a/src/renderer/src/pages/game-details/game-details.css.ts
+++ b/src/renderer/src/pages/game-details/game-details.css.ts
@@ -101,7 +101,6 @@ export const descriptionContent = style({
 export const description = style({
   userSelect: "text",
   lineHeight: "22px",
-  fontFamily: "'Fira Sans', sans-serif",
   fontSize: "16px",
   padding: `${SPACING_UNIT * 3}px ${SPACING_UNIT * 2}px`,
   "@media": {
diff --git a/src/renderer/src/pages/game-details/hero/hero-panel.css.ts b/src/renderer/src/pages/game-details/hero/hero-panel.css.ts
index e10d55a5..c379c1c3 100644
--- a/src/renderer/src/pages/game-details/hero/hero-panel.css.ts
+++ b/src/renderer/src/pages/game-details/hero/hero-panel.css.ts
@@ -9,6 +9,7 @@ export const panel = recipe({
     height: "72px",
     minHeight: "72px",
     padding: `${SPACING_UNIT * 2}px ${SPACING_UNIT * 3}px`,
+    backgroundColor: vars.color.darkBackground,
     display: "flex",
     alignItems: "center",
     justifyContent: "space-between",
diff --git a/src/renderer/src/pages/game-details/modals/download-settings-modal.tsx b/src/renderer/src/pages/game-details/modals/download-settings-modal.tsx
index d102d2b2..dff73ea0 100644
--- a/src/renderer/src/pages/game-details/modals/download-settings-modal.tsx
+++ b/src/renderer/src/pages/game-details/modals/download-settings-modal.tsx
@@ -60,14 +60,22 @@ export function DownloadSettingsModal({
         .then((defaultDownloadsPath) => setSelectedPath(defaultDownloadsPath));
     }
 
-    if (
-      userPreferences?.realDebridApiToken &&
-      downloaders.includes(Downloader.RealDebrid)
-    ) {
-      setSelectedDownloader(Downloader.RealDebrid);
-    } else {
-      setSelectedDownloader(downloaders[0]);
-    }
+    const filteredDownloaders = downloaders.filter((downloader) => {
+      if (downloader === Downloader.RealDebrid)
+        return userPreferences?.realDebridApiToken;
+      return true;
+    });
+
+    /* Gives preference to Real Debrid */
+    const selectedDownloader = filteredDownloaders.includes(
+      Downloader.RealDebrid
+    )
+      ? Downloader.RealDebrid
+      : filteredDownloaders[0];
+
+    setSelectedDownloader(
+      selectedDownloader === undefined ? null : selectedDownloader
+    );
   }, [
     userPreferences?.downloadsPath,
     downloaders,
diff --git a/src/renderer/src/pages/game-details/modals/game-options-modal.css.ts b/src/renderer/src/pages/game-details/modals/game-options-modal.css.ts
index 8bf0ae7f..f844a686 100644
--- a/src/renderer/src/pages/game-details/modals/game-options-modal.css.ts
+++ b/src/renderer/src/pages/game-details/modals/game-options-modal.css.ts
@@ -15,7 +15,6 @@ export const gameOptionHeader = style({
 });
 
 export const gameOptionHeaderDescription = style({
-  fontFamily: "'Fira Sans', sans-serif",
   fontWeight: "400",
 });
 
diff --git a/src/renderer/src/pages/game-details/sidebar/sidebar.css.ts b/src/renderer/src/pages/game-details/sidebar/sidebar.css.ts
index e6d8b60a..734e6eb3 100644
--- a/src/renderer/src/pages/game-details/sidebar/sidebar.css.ts
+++ b/src/renderer/src/pages/game-details/sidebar/sidebar.css.ts
@@ -46,7 +46,6 @@ export const requirementButton = style({
 export const requirementsDetails = style({
   padding: `${SPACING_UNIT * 2}px`,
   lineHeight: "22px",
-  fontFamily: "'Fira Sans', sans-serif",
   fontSize: "16px",
 });
 
diff --git a/src/renderer/src/pages/settings/settings-download-sources.tsx b/src/renderer/src/pages/settings/settings-download-sources.tsx
index 8214117a..64d653b0 100644
--- a/src/renderer/src/pages/settings/settings-download-sources.tsx
+++ b/src/renderer/src/pages/settings/settings-download-sources.tsx
@@ -82,9 +82,7 @@ export function SettingsDownloadSources() {
         onAddDownloadSource={handleAddDownloadSource}
       />
 
-      <p style={{ fontFamily: '"Fira Sans"' }}>
-        {t("download_sources_description")}
-      </p>
+      <p>{t("download_sources_description")}</p>
 
       <div className={styles.downloadSourcesHeader}>
         <Button
diff --git a/src/renderer/src/pages/settings/settings-real-debrid.css.ts b/src/renderer/src/pages/settings/settings-real-debrid.css.ts
index a9b545df..0dfc9d78 100644
--- a/src/renderer/src/pages/settings/settings-real-debrid.css.ts
+++ b/src/renderer/src/pages/settings/settings-real-debrid.css.ts
@@ -9,6 +9,5 @@ export const form = style({
 });
 
 export const description = style({
-  fontFamily: "'Fira Sans', sans-serif",
   marginBottom: `${SPACING_UNIT * 2}px`,
 });
diff --git a/src/renderer/src/pages/user/user-block-modal.tsx b/src/renderer/src/pages/user/user-block-modal.tsx
index e179e4da..311eb060 100644
--- a/src/renderer/src/pages/user/user-block-modal.tsx
+++ b/src/renderer/src/pages/user/user-block-modal.tsx
@@ -25,9 +25,7 @@ export const UserBlockModal = ({
         onClose={onClose}
       >
         <div className={styles.signOutModalContent}>
-          <p style={{ fontFamily: "Fira Sans" }}>
-            {t("user_block_modal_text", { displayName })}
-          </p>
+          <p>{t("user_block_modal_text", { displayName })}</p>
           <div className={styles.signOutModalButtonsContainer}>
             <Button onClick={onConfirm} theme="danger">
               {t("block_user")}
diff --git a/src/renderer/src/pages/user/user-content.tsx b/src/renderer/src/pages/user/user-content.tsx
index 81db119d..7425f102 100644
--- a/src/renderer/src/pages/user/user-content.tsx
+++ b/src/renderer/src/pages/user/user-content.tsx
@@ -371,11 +371,7 @@ export function UserContent({
                 <TelescopeIcon size={24} />
               </div>
               <h2>{t("no_recent_activity_title")}</h2>
-              {isMe && (
-                <p style={{ fontFamily: "Fira Sans" }}>
-                  {t("no_recent_activity_description")}
-                </p>
-              )}
+              {isMe && <p>{t("no_recent_activity_description")}</p>}
             </div>
           ) : (
             <div
diff --git a/src/renderer/src/pages/user/user-sign-out-modal.tsx b/src/renderer/src/pages/user/user-sign-out-modal.tsx
index b9565a1d..afc5561b 100644
--- a/src/renderer/src/pages/user/user-sign-out-modal.tsx
+++ b/src/renderer/src/pages/user/user-sign-out-modal.tsx
@@ -23,7 +23,7 @@ export const UserSignOutModal = ({
         onClose={onClose}
       >
         <div className={styles.signOutModalContent}>
-          <p style={{ fontFamily: "Fira Sans" }}>{t("sign_out_modal_text")}</p>
+          <p>{t("sign_out_modal_text")}</p>
           <div className={styles.signOutModalButtonsContainer}>
             <Button onClick={onConfirm} theme="danger">
               {t("sign_out")}
diff --git a/src/shared/index.ts b/src/shared/index.ts
index ba68876f..af4ac17d 100644
--- a/src/shared/index.ts
+++ b/src/shared/index.ts
@@ -53,6 +53,8 @@ export const removeSpecialEditionFromName = (name: string) =>
 export const removeDuplicateSpaces = (name: string) =>
   name.replace(/\s{2,}/g, " ");
 
+export const replaceDotsWithSpace = (name: string) => name.replace(/\./g, " ");
+
 export const replaceUnderscoreWithSpace = (name: string) =>
   name.replace(/_/g, " ");
 
@@ -60,6 +62,7 @@ export const formatName = pipe<string>(
   removeReleaseYearFromName,
   removeSpecialEditionFromName,
   replaceUnderscoreWithSpace,
+  replaceDotsWithSpace,
   (str) => str.replace(/DIRECTOR'S CUT/g, ""),
   removeSymbolsFromName,
   removeDuplicateSpaces,
diff --git a/torrent-client/downloader.py b/torrent-client/downloader.py
deleted file mode 100644
index 142da020..00000000
--- a/torrent-client/downloader.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import libtorrent as lt
-
-class Downloader:
-    def __init__(self, port: str):
-        self.torrent_handles = {}
-        self.downloading_game_id = -1
-        self.session = lt.session({'listen_interfaces': '0.0.0.0:{port}'.format(port=port)})
-
-    def start_download(self, game_id: int, magnet: str, save_path: str):
-        params = {'url': magnet, 'save_path': save_path}
-        torrent_handle = self.session.add_torrent(params)
-        self.torrent_handles[game_id] = torrent_handle
-        torrent_handle.set_flags(lt.torrent_flags.auto_managed)
-        torrent_handle.resume()
-
-        self.downloading_game_id = game_id
-
-    def pause_download(self, game_id: int):
-        torrent_handle = self.torrent_handles.get(game_id)
-        if torrent_handle:
-            torrent_handle.pause()
-            torrent_handle.unset_flags(lt.torrent_flags.auto_managed)
-            self.downloading_game_id = -1
-
-    def cancel_download(self, game_id: int):
-        torrent_handle = self.torrent_handles.get(game_id)
-        if torrent_handle:
-            torrent_handle.pause()
-            self.session.remove_torrent(torrent_handle)
-            self.torrent_handles[game_id] = None
-            self.downloading_game_id = -1
-
-    def abort_session(self):
-        for game_id in self.torrent_handles:
-            torrent_handle = self.torrent_handles[game_id]
-            torrent_handle.pause()
-            self.session.remove_torrent(torrent_handle)
-            
-        self.session.abort()
-        self.torrent_handles = {}
-        self.downloading_game_id = -1
-
-    def get_download_status(self):
-        if self.downloading_game_id == -1:
-            return None
-
-        torrent_handle = self.torrent_handles.get(self.downloading_game_id)
-
-        status = torrent_handle.status()
-        info = torrent_handle.get_torrent_info()
-
-        return {
-            'folderName': info.name() if info else "",
-            'fileSize': info.total_size() if info else 0,
-            'gameId': self.downloading_game_id,
-            'progress': status.progress,
-            'downloadSpeed': status.download_rate,
-            'numPeers': status.num_peers,
-            'numSeeds': status.num_seeds,
-            'status': status.state,
-            'bytesDownloaded': status.progress * info.total_size() if info else status.all_time_download,
-        }
diff --git a/torrent-client/main.py b/torrent-client/main.py
index 004cd108..c25f95a4 100644
--- a/torrent-client/main.py
+++ b/torrent-client/main.py
@@ -3,19 +3,19 @@ from http.server import HTTPServer, BaseHTTPRequestHandler
 import json
 import urllib.parse
 import psutil
-from downloader import Downloader
+from torrent_downloader import TorrentDownloader
 
 torrent_port = sys.argv[1]
 http_port = sys.argv[2]
 rpc_password = sys.argv[3]
 start_download_payload = sys.argv[4]
 
-downloader = None
+torrent_downloader = None
 
 if start_download_payload:
     initial_download = json.loads(urllib.parse.unquote(start_download_payload))
-    downloader = Downloader(torrent_port)
-    downloader.start_download(initial_download['game_id'], initial_download['magnet'], initial_download['save_path'])
+    torrent_downloader = TorrentDownloader(torrent_port)
+    torrent_downloader.start_download(initial_download['game_id'], initial_download['magnet'], initial_download['save_path'])
 
 class Handler(BaseHTTPRequestHandler):
     rpc_password_header = 'x-hydra-rpc-password'
@@ -31,7 +31,7 @@ class Handler(BaseHTTPRequestHandler):
             self.send_header("Content-type", "application/json")
             self.end_headers()
 
-            status = downloader.get_download_status()
+            status = torrent_downloader.get_download_status()
 
             self.wfile.write(json.dumps(status).encode('utf-8'))
 
@@ -54,7 +54,7 @@ class Handler(BaseHTTPRequestHandler):
             self.wfile.write(json.dumps(process_list).encode('utf-8'))
     
     def do_POST(self):
-        global downloader
+        global torrent_downloader
 
         if self.path == "/action":
             if self.headers.get(self.rpc_password_header) != rpc_password:
@@ -66,18 +66,18 @@ class Handler(BaseHTTPRequestHandler):
             post_data = self.rfile.read(content_length)
             data = json.loads(post_data.decode('utf-8'))
 
-            if downloader is None:
-                downloader = Downloader(torrent_port)
+            if torrent_downloader is None:
+                torrent_downloader = TorrentDownloader(torrent_port)
 
             if data['action'] == 'start':
-                downloader.start_download(data['game_id'], data['magnet'], data['save_path'])
+                torrent_downloader.start_download(data['game_id'], data['magnet'], data['save_path'])
             elif data['action'] == 'pause':
-                downloader.pause_download(data['game_id'])
+                torrent_downloader.pause_download(data['game_id'])
             elif data['action'] == 'cancel':
-                downloader.cancel_download(data['game_id'])
+                torrent_downloader.cancel_download(data['game_id'])
             elif data['action'] == 'kill-torrent':
-                downloader.abort_session()
-                downloader = None
+                torrent_downloader.abort_session()
+                torrent_downloader = None
 
             self.send_response(200)
             self.end_headers()
diff --git a/torrent-client/torrent_downloader.py b/torrent-client/torrent_downloader.py
new file mode 100644
index 00000000..d59cd28b
--- /dev/null
+++ b/torrent-client/torrent_downloader.py
@@ -0,0 +1,158 @@
+import libtorrent as lt
+
+class TorrentDownloader:
+    def __init__(self, port: str):
+        self.torrent_handles = {}
+        self.downloading_game_id = -1
+        self.session = lt.session({'listen_interfaces': '0.0.0.0:{port}'.format(port=port)})
+        self.trackers = [
+            "udp://tracker.opentrackr.org:1337/announce",
+            "http://tracker.opentrackr.org:1337/announce",
+            "udp://open.tracker.cl:1337/announce",
+            "udp://open.demonii.com:1337/announce",
+            "udp://open.stealth.si:80/announce",
+            "udp://tracker.torrent.eu.org:451/announce",
+            "udp://exodus.desync.com:6969/announce",
+            "udp://tracker.theoks.net:6969/announce",
+            "udp://tracker-udp.gbitt.info:80/announce",
+            "udp://explodie.org:6969/announce",
+            "https://tracker.tamersunion.org:443/announce",
+            "udp://tracker2.dler.org:80/announce",
+            "udp://tracker1.myporn.club:9337/announce",
+            "udp://tracker.tiny-vps.com:6969/announce",
+            "udp://tracker.dler.org:6969/announce",
+            "udp://tracker.bittor.pw:1337/announce",
+            "udp://tracker.0x7c0.com:6969/announce",
+            "udp://retracker01-msk-virt.corbina.net:80/announce",
+            "udp://opentracker.io:6969/announce",
+            "udp://open.free-tracker.ga:6969/announce",
+            "udp://new-line.net:6969/announce",
+            "udp://moonburrow.club:6969/announce",
+            "udp://leet-tracker.moe:1337/announce",
+            "udp://bt2.archive.org:6969/announce",
+            "udp://bt1.archive.org:6969/announce",
+            "http://tracker2.dler.org:80/announce",
+            "http://tracker1.bt.moack.co.kr:80/announce",
+            "http://tracker.dler.org:6969/announce",
+            "http://tr.kxmp.cf:80/announce",
+            "udp://u.peer-exchange.download:6969/announce",
+            "udp://ttk2.nbaonlineservice.com:6969/announce",
+            "udp://tracker.tryhackx.org:6969/announce",
+            "udp://tracker.srv00.com:6969/announce",
+            "udp://tracker.skynetcloud.site:6969/announce",
+            "udp://tracker.jamesthebard.net:6969/announce",
+            "udp://tracker.fnix.net:6969/announce",
+            "udp://tracker.filemail.com:6969/announce",
+            "udp://tracker.farted.net:6969/announce",
+            "udp://tracker.edkj.club:6969/announce",
+            "udp://tracker.dump.cl:6969/announce",
+            "udp://tracker.deadorbit.nl:6969/announce",
+            "udp://tracker.darkness.services:6969/announce",
+            "udp://tracker.ccp.ovh:6969/announce",
+            "udp://tamas3.ynh.fr:6969/announce",
+            "udp://ryjer.com:6969/announce",
+            "udp://run.publictracker.xyz:6969/announce",
+            "udp://public.tracker.vraphim.com:6969/announce",
+            "udp://p4p.arenabg.com:1337/announce",
+            "udp://p2p.publictracker.xyz:6969/announce",
+            "udp://open.u-p.pw:6969/announce",
+            "udp://open.publictracker.xyz:6969/announce",
+            "udp://open.dstud.io:6969/announce",
+            "udp://open.demonoid.ch:6969/announce",
+            "udp://odd-hd.fr:6969/announce",
+            "udp://martin-gebhardt.eu:25/announce",
+            "udp://jutone.com:6969/announce",
+            "udp://isk.richardsw.club:6969/announce",
+            "udp://evan.im:6969/announce",
+            "udp://epider.me:6969/announce",
+            "udp://d40969.acod.regrucolo.ru:6969/announce",
+            "udp://bt.rer.lol:6969/announce",
+            "udp://amigacity.xyz:6969/announce",
+            "udp://1c.premierzal.ru:6969/announce",
+            "https://trackers.run:443/announce",
+            "https://tracker.yemekyedim.com:443/announce",
+            "https://tracker.renfei.net:443/announce",
+            "https://tracker.pmman.tech:443/announce",
+            "https://tracker.lilithraws.org:443/announce",
+            "https://tracker.imgoingto.icu:443/announce",
+            "https://tracker.cloudit.top:443/announce",
+            "https://tracker-zhuqiy.dgj055.icu:443/announce",
+            "http://tracker.renfei.net:8080/announce",
+            "http://tracker.mywaifu.best:6969/announce",
+            "http://tracker.ipv6tracker.org:80/announce",
+            "http://tracker.files.fm:6969/announce",
+            "http://tracker.edkj.club:6969/announce",
+            "http://tracker.bt4g.com:2095/announce",
+            "http://tracker-zhuqiy.dgj055.icu:80/announce",
+            "http://t1.aag.moe:17715/announce",
+            "http://t.overflow.biz:6969/announce",
+            "http://bittorrent-tracker.e-n-c-r-y-p-t.net:1337/announce",
+            "udp://torrents.artixlinux.org:6969/announce",
+            "udp://mail.artixlinux.org:6969/announce",
+            "udp://ipv4.rer.lol:2710/announce",
+            "udp://concen.org:6969/announce",
+            "udp://bt.rer.lol:2710/announce",
+            "udp://aegir.sexy:6969/announce",
+            "https://www.peckservers.com:9443/announce",
+            "https://tracker.ipfsscan.io:443/announce",
+            "https://tracker.gcrenwp.top:443/announce",
+            "http://www.peckservers.com:9000/announce",
+            "http://tracker1.itzmx.com:8080/announce",
+            "http://ch3oh.ru:6969/announce",
+            "http://bvarf.tracker.sh:2086/announce",
+        ]
+
+    def start_download(self, game_id: int, magnet: str, save_path: str):
+        params = {'url': magnet, 'save_path': save_path, 'trackers': self.trackers}
+        torrent_handle = self.session.add_torrent(params)
+        self.torrent_handles[game_id] = torrent_handle
+        torrent_handle.set_flags(lt.torrent_flags.auto_managed)
+        torrent_handle.resume()
+
+        self.downloading_game_id = game_id
+
+    def pause_download(self, game_id: int):
+        torrent_handle = self.torrent_handles.get(game_id)
+        if torrent_handle:
+            torrent_handle.pause()
+            torrent_handle.unset_flags(lt.torrent_flags.auto_managed)
+            self.downloading_game_id = -1
+
+    def cancel_download(self, game_id: int):
+        torrent_handle = self.torrent_handles.get(game_id)
+        if torrent_handle:
+            torrent_handle.pause()
+            self.session.remove_torrent(torrent_handle)
+            self.torrent_handles[game_id] = None
+            self.downloading_game_id = -1
+
+    def abort_session(self):
+        for game_id in self.torrent_handles:
+            torrent_handle = self.torrent_handles[game_id]
+            torrent_handle.pause()
+            self.session.remove_torrent(torrent_handle)
+            
+        self.session.abort()
+        self.torrent_handles = {}
+        self.downloading_game_id = -1
+
+    def get_download_status(self):
+        if self.downloading_game_id == -1:
+            return None
+
+        torrent_handle = self.torrent_handles.get(self.downloading_game_id)
+
+        status = torrent_handle.status()
+        info = torrent_handle.get_torrent_info()
+
+        return {
+            'folderName': info.name() if info else "",
+            'fileSize': info.total_size() if info else 0,
+            'gameId': self.downloading_game_id,
+            'progress': status.progress,
+            'downloadSpeed': status.download_rate,
+            'numPeers': status.num_peers,
+            'numSeeds': status.num_seeds,
+            'status': status.state,
+            'bytesDownloaded': status.progress * info.total_size() if info else status.all_time_download,
+        }
diff --git a/yarn.lock b/yarn.lock
index cf749216..74b9a8a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -943,15 +943,10 @@
   resolved "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz"
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
-"@fontsource/fira-mono@^5.0.13":
-  version "5.0.13"
-  resolved "https://registry.npmjs.org/@fontsource/fira-mono/-/fira-mono-5.0.13.tgz"
-  integrity sha512-fZDjR2BdAqmauEbTjcIT62zYzbOgDa5+IQH34D2k8Pxmy1T815mAqQkZciWZVQ9dc/BgdTtTUV9HJ2ulBNwchg==
-
-"@fontsource/fira-sans@^5.0.20":
-  version "5.0.20"
-  resolved "https://registry.npmjs.org/@fontsource/fira-sans/-/fira-sans-5.0.20.tgz"
-  integrity sha512-inmUjoKPrgnO4uUaZTAgP0b6YdhDfA52axHXvdTwgLvwd2kn3ZgK52UZoxD0VnrvTOjLA/iE4oC0tNtz4nyb5g==
+"@fontsource/noto-sans@^5.0.22":
+  version "5.0.22"
+  resolved "https://registry.yarnpkg.com/@fontsource/noto-sans/-/noto-sans-5.0.22.tgz#2c5249347ba84fef16e71a58e0ec01b460174093"
+  integrity sha512-PwjvKPGFbgpwfKjWZj1zeUvd7ExUW2AqHE9PF9ysAJ2gOuzIHWE6mEVIlchYif7WC2pQhn+g0w6xooCObVi+4A==
 
 "@humanwhocodes/config-array@^0.11.14":
   version "0.11.14"