friend is an enemy in disguise

Author: Cosmicoppai

backend/LiSA.py

@@ -9,12 +9,11 @@
 from multiprocessing import Pipe, Manager, freeze_support
 from video.downloader import DownloadManager
 from video.library import Library
-from pathlib import Path
 
 
 def run_api_server(port: int = 8000):
     ServerConfig.API_SERVER_ADDRESS = f"http://localhost:{port}"
-    print(f"server started on port: {port} \n You can access API SERVER on {ServerConfig.API_SERVER_ADDRESS}")
+    logging.info(f"server started on port: {port} \n You can access API SERVER on {ServerConfig.API_SERVER_ADDRESS}")
     start_api_server(port=port)
 
 
@@ -33,7 +32,7 @@ def get_ports():
 if __name__ == "__main__":
     freeze_support()
     try:
-        logging.basicConfig(filename=Path(__file__).parent.joinpath("LiSA.log"), filemode="w", level=logging.ERROR, format="%(name)s → %(levelname)s: %(message)s")
+        logging.basicConfig(level=logging.ERROR)
         DB.migrate()  # migrate the database
         DB()  # initialize the highest id
 

backend/video/downloader/downloader.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import sys
+
 import aiohttp
 import asyncio
 import m3u8
@@ -393,8 +395,13 @@ def _merge_segments(self, input_file: str | Path, output_file: str | Path = None
         if not output_file:
             output_file = self._output_file
 
-        # check if exe present in backend folder else fallback to default option
-        ffmpeg_loc = get_path("ffmpeg", Path(__file__).parent.parent.parent.parent.joinpath("./ffmpeg"))
+        # check if ffmpeg binary is present in system path, else fallback to the binary in backend folder
+        if getattr(sys, 'frozen', False):
+            application_path = sys._MEIPASS
+        else:
+            application_path = Path(__file__).parent.parent.parent.parent
+
+        ffmpeg_loc = get_path("ffmpeg", Path(application_path).joinpath("ffmpeg"))
 
         cmd = [
             ffmpeg_loc,

main.js

@@ -2,6 +2,7 @@ const { spawn } = require('child_process');
 const { app, BrowserWindow, ipcMain, shell } = require('electron');
 const isDevMode = require('electron-is-dev');
 const path = require('path');
+const fs = require('fs');
 
 let pythonServer;
 
@@ -27,21 +28,34 @@ function startPythonServer() {
         return;
     }
 
+    const logPath = path.join(path.dirname(process.execPath), 'LiSA.log');
+    fs.writeFileSync(logPath, '', { encoding: 'utf8' });  // clear logs
+
     pythonServer = spawn(cmd, {
         shell: true,
-        detached: isDevMode,
+        detached: false,
+        stdio: ['ignore', 'pipe', 'pipe']
+    });
+
+    const logStream = fs.createWriteStream(logPath, { flags: 'a' });
+    pythonServer.stdout.pipe(logStream);
+    pythonServer.stderr.pipe(logStream);
+
+    pythonServer.on('close', (_) => {
+        logStream.end();
     });
 }
 
+
 function killPythonServer() {
     if (!pythonServer) return;
 
     if (process.platform === 'win32') {
-        const killCmd = `taskkill /pid ${pythonServer.pid} /f /t`;
+        const killCmd = `tskill LiSA`;
         spawn('cmd.exe', ['/c', killCmd]);
-    } else pythonServer.kill('SIGINT');
-
-    console.log('Killed python server, PID: ', pythonServer.pid);
+    } else {
+        process.kill(-pythonServer.pid, 'SIGINT');
+    }
 
     pythonServer = null;
 }
@@ -191,7 +205,7 @@ app.whenReady().then(async () => {
 
 app.on('activate', () => {
     /**
-     * On macOS it's common to re-create a window in the app when the
+     * On macOS, it's common to re-create a window in the app when the
      * dock icon is clicked and there are no other windows open.
      */
     if (BrowserWindow.getAllWindows().length === 0) createWindow();
@@ -206,8 +220,7 @@ app.on('window-all-closed', () => {
     if (process.platform !== 'darwin') app.quit();
 });
 
-app.on('quit', function () {
-    // Clean up the Python server when the app quits
+app.on('quit', (event) => {
     killPythonServer();
 });