chore: refactor a bit

Author: yofukashino

src/main/asar.ts

@@ -6,12 +6,12 @@ export function unpackAsar(dir: string, file: string): string {
   const filePath = join(dir, file);
   const unpackedName = `${filePath}.unpacked`;
   try {
-    if (statSync(filePath).isDirectory() || !filePath.endsWith(".asar")) return file;
+    if (statSync(filePath).isDirectory() || !filePath.endsWith(".asar")) return filePath;
     extractAll(filePath, unpackedName);
     rmSync(filePath);
   } catch (err) {
     console.log(err);
   }
   console.log(`Asar ${filePath} replaced with folder`);
-  return `${file}.unpacked`;
+  return unpackedName;
 }

src/main/ipc/installer.ts

@@ -235,8 +235,11 @@ export async function installAddon(
 
   try {
     if (existsSync(filePath)) rmSync(filePath, { recursive: true, force: true });
+
     const unpacked = `${filePath}.unpacked`;
-    if (existsSync(unpacked)) rmSync(unpacked, { recursive: true, force: true });
+    if (path.endsWith(".unpacked") && existsSync(unpacked))
+      rmSync(unpacked, { recursive: true, force: true });
+
     await writeFile(filePath, buf);
   } catch (err) {
     return {

src/main/ipc/plugins.ts

@@ -20,8 +20,7 @@ export const isFileAPlugin = (f: Dirent | Stats, name: string): boolean => {
 };
 
 function getPlugin(pluginName: string): RepluggedPlugin {
-  pluginName = unpackAsar(PLUGINS_DIR, pluginName);
-  const pluginPath = join(PLUGINS_DIR, pluginName);
+  const pluginPath = unpackAsar(PLUGINS_DIR, pluginName);
   const manifestPath = join(pluginPath, "manifest.json");
   if (!manifestPath.startsWith(`${PLUGINS_DIR}${sep}`)) {
     // Ensure file changes are restricted to the base path

src/main/ipc/themes.ts

@@ -20,9 +20,7 @@ export const isFileATheme = (f: Dirent | Stats, name: string): boolean => {
 };
 
 async function getTheme(path: string): Promise<RepluggedTheme> {
-  path = unpackAsar(THEMES_DIR, path);
-
-  const themePath = join(THEMES_DIR, path);
+  const themePath = unpackAsar(THEMES_DIR, path);
   const manifestPath = join(themePath, "manifest.json");
   if (!manifestPath.startsWith(`${THEMES_DIR}${sep}`)) {
     // Ensure file changes are restricted to the base path