Refactor file paths to use path.join for cross-platform compatibility and improve error handling in directory creation. Enhance StremioService to check for Flatpak installation.

REVENGE977 · REVENGE977 · commit 841c9699b57b · 2025-04-12T12:01:21.000+03:00
diff --git a/src/Main.ts b/src/Main.ts
@@ -7,6 +7,8 @@ import Properties from "./core/Properties";
 import logger from "./utils/logger";
 import StremioService from "./utils/StremioService";
 
+app.setName("stremio-enhanced");
+
 let mainWindow: BrowserWindow | null;
 
 app.commandLine.appendSwitch('use-angle', 'gl'); // Uses OpenGL for rendering. Having it on OpenGL enables the audio tracks menu in the video player
@@ -66,11 +68,25 @@ app.on("ready", async () => {
     logger.info("Running on Electron version: v" + process.versions.electron);
     logger.info("Running on Chromium version: v" + process.versions.chrome);
 
+    logger.info("User data path: " + app.getPath("userData"));
+    logger.info("Themes path: " + Properties.themesPath);
+    logger.info("Plugins path: " + Properties.pluginsPath);
+
     try {
-        if(!existsSync(`${process.env.APPDATA}\\stremio-enhanced`)) mkdirSync(`${process.env.APPDATA}\\stremio-enhanced`);
-        if(!existsSync(Properties.themesPath)) mkdirSync(Properties.themesPath);
-        if(!existsSync(Properties.pluginsPath)) mkdirSync(Properties.pluginsPath);
-    }catch {}
+        const basePath = Properties.enhancedPath;
+    
+        if (!existsSync(basePath)) {
+            mkdirSync(basePath, { recursive: true });
+        }
+        if (!existsSync(Properties.themesPath)) {
+            mkdirSync(Properties.themesPath, { recursive: true });
+        }
+        if (!existsSync(Properties.pluginsPath)) {
+            mkdirSync(Properties.pluginsPath, { recursive: true });
+        }
+    } catch (err) {
+        logger.error("Failed to create necessary directories: " + err);
+    }
     
     if(!process.argv.includes("--no-stremio-service")) {
         const stremioServicePath = StremioService.checkExecutableExists();
diff --git a/src/Preload.ts b/src/Preload.ts
@@ -10,6 +10,8 @@ import DiscordPresence from "./utils/DiscordPresence";
 import { getAboutCategoryTemplate } from "./components/about-category/aboutCategory";
 import { getDefaultThemeTemplate } from "./components/default-theme/defaultTheme";
 import logger from "./utils/logger";
+import { join } from "path";
+import { pathToFileURL } from "url";
 
 window.addEventListener("load", async () => {
     intializeUserSettings();
@@ -102,7 +104,7 @@ window.addEventListener("load", async () => {
             
             // add themes to the settings
             themesList.forEach(theme => {
-                let readMetaData = Helpers.extractMetadataFromFile(`${properties.themesPath}\\${theme}`);
+                let readMetaData = Helpers.extractMetadataFromFile(join(properties.themesPath, theme));
                 
                 if (readMetaData && Object.keys(readMetaData).length > 0) {
                     if(readMetaData.name.toLowerCase() != "default") Settings.addItem("theme", theme, readMetaData);
@@ -112,7 +114,7 @@ window.addEventListener("load", async () => {
         
         // add plugins to the settings
         pluginsList.forEach(plugin => {
-            let readMetaData = Helpers.extractMetadataFromFile(`${properties.pluginsPath}\\${plugin}`);
+            let readMetaData = Helpers.extractMetadataFromFile(join(properties.pluginsPath, plugin));
             if (readMetaData && Object.keys(readMetaData).length > 0) Settings.addItem("plugin", plugin, readMetaData);
         })
         
@@ -140,14 +142,14 @@ function applyUserTheme() {
     if(localStorage.getItem("currentTheme") != null) {
         let currentTheme = localStorage.getItem("currentTheme");
         
-        if(currentTheme != "Default" && existsSync(`${properties.themesPath}\\${currentTheme}`)) {
+        if(currentTheme != "Default" && existsSync(join(properties.themesPath, currentTheme))) {
             if(document.getElementById("activeTheme")) document.getElementById("activeTheme").remove();
+            const themePath = join(properties.themesPath, currentTheme);
 
             let themeElement = document.createElement('link');
             themeElement.setAttribute("id", "activeTheme");
             themeElement.setAttribute("rel", "stylesheet");
-            themeElement.setAttribute("href", `${properties.themesPath}\\${currentTheme}`);
-
+            themeElement.setAttribute("href", pathToFileURL(themePath).toString());
             document.head.appendChild(themeElement);
         } else {
             localStorage.setItem("currentTheme", "Default");
diff --git a/src/components/apply-theme/apply-theme.js b/src/components/apply-theme/apply-theme.js
@@ -10,7 +10,7 @@ function applyTheme(theme) {
         const themeElement = document.createElement("link");
         themeElement.id = "activeTheme";
         themeElement.rel = "stylesheet";
-        themeElement.href = `{{ themesPath }}\\\\${theme}`;
+        themeElement.href = `{{ themesPath }}/${theme}`;
 
         document.head.appendChild(themeElement);
     }
diff --git a/src/components/apply-theme/applyTheme.ts b/src/components/apply-theme/applyTheme.ts
@@ -1,9 +1,10 @@
 import { readFileSync } from 'fs';
+import { pathToFileURL } from 'url';
 import Properties from '../../core/Properties';
 
 export function getApplyThemeTemplate() {
-    let template = readFileSync(__dirname + '/apply-theme.js', 'utf8');
+    const template = readFileSync(__dirname + '/apply-theme.js', 'utf8');
+    const themeBaseURL = pathToFileURL(Properties.themesPath).toString();
 
-    return template
-        .replace("{{ themesPath }}", Properties.themesPath.replace(/\\/g, "\\\\"));
-}
+    return template.replace("{{ themesPath }}", themeBaseURL);
+}
diff --git a/src/core/ModManager.ts b/src/core/ModManager.ts
@@ -7,13 +7,14 @@ import MetaData from "../interfaces/MetaData";
 import { getLogger } from "../utils/logger";
 import Properties from "./Properties";
 import { getApplyThemeTemplate } from "../components/apply-theme/applyTheme";
+import { join } from "path";
 
 class ModManager {
     private static logger = getLogger("ModManager");
     
     public static loadPlugin(pluginName:string) {
         if(document.getElementById(pluginName)) return;
-        let plugin = readFileSync(`${Properties.pluginsPath}\\${pluginName}`, "utf-8");
+        let plugin = readFileSync(join(properties.pluginsPath, pluginName), "utf-8");
         let script = document.createElement("script");
         script.innerHTML = plugin
         script.id = pluginName
@@ -77,23 +78,44 @@ class ModManager {
         })
     }
     
-    
     public static openThemesFolder() {
         helpers.waitForElm("#openthemesfolderBtn").then(() => {
-            let button = document.getElementById("openthemesfolderBtn");
-            button.addEventListener("click", () => {
-                exec(`start "" "${Properties.themesPath}"`);
-            })
-        })
+            const button = document.getElementById("openthemesfolderBtn");
+            button?.addEventListener("click", () => {
+                this.openFolder(Properties.themesPath);
+            });
+        });
     }
-    
+
     public static openPluginsFolder() {
         helpers.waitForElm("#openpluginsfolderBtn").then(() => {
-            let button = document.getElementById("openpluginsfolderBtn");
-            button.addEventListener("click", () => {
-                exec(`start "" "${Properties.pluginsPath}"`);
-            })
-        })
+            const button = document.getElementById("openpluginsfolderBtn");
+            button?.addEventListener("click", () => {
+                this.openFolder(Properties.pluginsPath);
+            });
+        });
+    }
+
+    private static openFolder(folderPath: string) {
+        let command: string;
+
+        switch (process.platform) {
+            case "win32":
+                command = `start "" "${folderPath}"`;
+                break;
+            case "darwin":
+                command = `open "${folderPath}"`;
+                break;
+            default:
+                command = `xdg-open "${folderPath}"`;
+                break;
+        }
+
+        exec(command, (error) => {
+            if (error) {
+                console.error(`Failed to open folder: ${folderPath}`, error);
+            }
+        });
     }
         
     public static scrollListener() {
@@ -165,8 +187,8 @@ class ModManager {
         if(itemFile.endsWith(".theme.css")) pluginOrTheme = "theme";
         else pluginOrTheme = "plugin";
 
-        let itemPath = `${pluginOrTheme == "theme" ? properties.themesPath : properties.pluginsPath}\\${itemFile}`;
-
+        const itemPath = join(pluginOrTheme === "theme" ? properties.themesPath : properties.pluginsPath, itemFile);
+        
         let installedItemMetaData:MetaData = helpers.extractMetadataFromFile(itemPath);
         if (installedItemMetaData && Object.keys(installedItemMetaData).length > 0) {
             let updateUrl = installedItemMetaData.updateUrl;
diff --git a/src/core/Properties.ts b/src/core/Properties.ts
@@ -1,7 +1,19 @@
+import { homedir } from "os";
+import { join } from "path";
+
 class Properties {
     public static themeLinkSelector: string = "head > link[rel=stylesheet]";
-    public static themesPath = `${process.env.APPDATA}\\stremio-enhanced\\themes`;
-    public static pluginsPath = `${process.env.APPDATA}\\stremio-enhanced\\plugins`;
+
+    private static baseDataPath: string = process.platform === "win32"
+        ? process.env.APPDATA || join(homedir(), "AppData", "Roaming")
+        : process.platform === "darwin"
+            ? join(homedir(), "Library", "Application Support")
+            : join(homedir(), ".config");
+
+    public static enhancedPath = join(Properties.baseDataPath, "stremio-enhanced");
+
+    public static themesPath = join(Properties.enhancedPath, "themes");
+    public static pluginsPath = join(Properties.enhancedPath, "plugins");
 }
 
-export default Properties;
+export default Properties;
diff --git a/src/utils/StremioService.ts b/src/utils/StremioService.ts
@@ -119,9 +119,42 @@ class StremioService {
                 installationPath = join('/Applications', 'StremioService.app', 'Contents', 'MacOS', 'stremio-service');
                 break;
             case 'linux':
-                installationPath = existsSync('/usr/local/bin/stremio-service') ? '/usr/local/bin/stremio-service' :
-                                existsSync('/usr/bin/stremio-service') ? '/usr/bin/stremio-service' :
-                                join(process.env.HOME || '', 'bin', 'stremio-service');
+                const standardPaths = [
+                    '/usr/local/bin/stremio-service',
+                    '/usr/bin/stremio-service',
+                    join(process.env.HOME || '', 'bin', 'stremio-service')
+                ];
+            
+                for (const path of standardPaths) {
+                    if (existsSync(path)) {
+                        installationPath = path;
+                        break;
+                    }
+                }
+            
+                // If not found in standard paths, check for Flatpak installation
+                if (!installationPath) {
+                    try {
+                        const execSync = require('child_process').execSync;
+                        const flatpakPath = execSync('which flatpak').toString().trim();
+            
+                        if (flatpakPath) {
+                            // Check if the Stremio Service Flatpak is installed
+                            const installed = execSync('flatpak list --app').toString();
+                            if (installed.includes('com.stremio.Service')) {
+                                const flatpakInstallPath = execSync('flatpak info --show-location com.stremio.Service')
+                                    .toString().trim();
+            
+                                const flatpakExecutable = join(flatpakInstallPath, 'files', 'bin', 'stremio-service');
+                                if (existsSync(flatpakExecutable)) {
+                                    installationPath = flatpakExecutable;
+                                }
+                            }
+                        }
+                    } catch (e) {
+                        this.logger.error("Flatpak check failed: " + e.message);
+                    }
+                }
                 break;
             default:
                 this.logger.error('Unsupported operating system');

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ function applyTheme(theme) {`
`10`	`10`	`const themeElement = document.createElement("link");`
`11`	`11`	`themeElement.id = "activeTheme";`
`12`	`12`	`themeElement.rel = "stylesheet";`
`13`		- themeElement.href = `{{ themesPath }}\\\\${theme}`;
	`13`	+ themeElement.href = `{{ themesPath }}/${theme}`;
`14`	`14`
`15`	`15`	`document.head.appendChild(themeElement);`
`16`	`16`	`}`