From c9be6b6b924824869b1fe6bf51d4069c9a84a831 Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:17:47 -0300 Subject: [PATCH 1/2] feat: replace console with logger --- src/main/events/cloud-save/upload-save-game.ts | 2 +- src/main/services/aria2.ts | 2 -- src/main/services/download/helpers.ts | 3 ++- src/main/services/download/torbox.ts | 5 +++-- src/main/services/python-rpc.ts | 4 ---- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/events/cloud-save/upload-save-game.ts b/src/main/events/cloud-save/upload-save-game.ts index a573b3ba..b3a514f5 100644 --- a/src/main/events/cloud-save/upload-save-game.ts +++ b/src/main/events/cloud-save/upload-save-game.ts @@ -89,7 +89,7 @@ const uploadSaveGame = async ( "Content-Type": "application/tar", }, onUploadProgress: (progressEvent) => { - console.log(progressEvent); + logger.log(progressEvent); }, }); diff --git a/src/main/services/aria2.ts b/src/main/services/aria2.ts index 8db32bb1..b7aa539c 100644 --- a/src/main/services/aria2.ts +++ b/src/main/services/aria2.ts @@ -22,8 +22,6 @@ export class Aria2 { ], { stdio: "inherit", windowsHide: true } ); - - console.log(this.process); } public static kill() { diff --git a/src/main/services/download/helpers.ts b/src/main/services/download/helpers.ts index 284e520a..0856eb16 100644 --- a/src/main/services/download/helpers.ts +++ b/src/main/services/download/helpers.ts @@ -1,5 +1,6 @@ import path from "node:path"; import fs from "node:fs"; +import { logger } from "../logger"; export const calculateETA = ( totalLength: number, @@ -33,7 +34,7 @@ export const getDirSize = async (dir: string): Promise => { return sizes.reduce((total, size) => total + size, 0); } catch (error) { - console.error(error); + logger.error(error); return 0; } }; diff --git a/src/main/services/download/torbox.ts b/src/main/services/download/torbox.ts index cf556a48..ed01bcd3 100644 --- a/src/main/services/download/torbox.ts +++ b/src/main/services/download/torbox.ts @@ -6,6 +6,7 @@ import type { TorBoxAddTorrentRequest, TorBoxRequestLinkRequest, } from "@types"; +import { logger } from "../logger"; export class TorBoxClient { private static instance: AxiosInstance; @@ -65,8 +66,8 @@ export class TorBoxClient { ); if (response.status !== 200) { - console.error(response.data.error); - console.error(response.data.detail); + logger.error(response.data.error); + logger.error(response.data.detail); return null; } diff --git a/src/main/services/python-rpc.ts b/src/main/services/python-rpc.ts index 622fb4ce..df37f02a 100644 --- a/src/main/services/python-rpc.ts +++ b/src/main/services/python-rpc.ts @@ -43,8 +43,6 @@ export class PythonRPC { } public static spawn(initialDownload?: StartDownloadPayload) { - console.log([this.BITTORRENT_PORT, this.RPC_PORT, this.RPC_PASSWORD]); - const commonArgs = [ this.BITTORRENT_PORT, this.RPC_PORT, @@ -86,8 +84,6 @@ export class PythonRPC { "main.py" ); - console.log(scriptPath); - const childProcess = cp.spawn("python3", [scriptPath, ...commonArgs], { stdio: ["inherit", "inherit"], }); From 56217fbcf82cb3ce48d681c2cc23d43cfbf009d1 Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:38:50 -0300 Subject: [PATCH 2/2] fix: bug after pause seed --- python_rpc/main.py | 7 +++++-- src/main/services/download/download-manager.ts | 16 +++++++--------- .../src/pages/downloads/download-group.tsx | 5 ++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/python_rpc/main.py b/python_rpc/main.py index 028e9fa3..ed4e7c4f 100644 --- a/python_rpc/main.py +++ b/python_rpc/main.py @@ -59,12 +59,15 @@ def seed_status(): return auth_error seed_status = [] + for game_id, downloader in downloads.items(): if not downloader: continue - + response = downloader.get_download_status() - + if response is None: + continue + if response.get('status') == 5: seed_status.append({ 'gameId': game_id, diff --git a/src/main/services/download/download-manager.ts b/src/main/services/download/download-manager.ts index 78452380..daa69113 100644 --- a/src/main/services/download/download-manager.ts +++ b/src/main/services/download/download-manager.ts @@ -158,13 +158,14 @@ export class DownloadManager { } public static async getSeedStatus() { - const seedStatus = await PythonRPC.rpc.get( - "/seed-status" - ); + const seedStatus = await PythonRPC.rpc + .get("/seed-status") + .then((res) => res.data); - if (!seedStatus.data.length) return; + console.log(seedStatus); + if (!seedStatus.length) return; - seedStatus.data.forEach(async (status) => { + seedStatus.forEach(async (status) => { const game = await gameRepository.findOne({ where: { id: status.gameId }, }); @@ -188,10 +189,7 @@ export class DownloadManager { } }); - WindowManager.mainWindow?.webContents.send( - "on-seeding-status", - JSON.parse(JSON.stringify(seedStatus.data)) - ); + WindowManager.mainWindow?.webContents.send("on-seeding-status", seedStatus); } static async pauseDownload() { diff --git a/src/renderer/src/pages/downloads/download-group.tsx b/src/renderer/src/pages/downloads/download-group.tsx index e9ae8a82..88cf1433 100644 --- a/src/renderer/src/pages/downloads/download-group.tsx +++ b/src/renderer/src/pages/downloads/download-group.tsx @@ -77,13 +77,12 @@ export function DownloadGroup({ }; const seedingMap = useMemo(() => { - if (!Array.isArray(seedingStatus) || seedingStatus.length === 0) { - return new Map(); - } const map = new Map(); + seedingStatus.forEach((seed) => { map.set(seed.gameId, seed); }); + return map; }, [seedingStatus]);