implemented apply and close

src/common/ipc.ts

@@ -47,11 +47,15 @@ export type WindowAction =
   | { type: 'change-color'; icons?: string; background?: string }
   | { type: 'close' };
 
+type ProcessRenamesOptions = {
+  exit?: boolean;
+};
+
 type IPCScanPaths = { type: 'scan-paths'; payload: string[] };
 type IPCScanResults = { type: 'scan-results'; payload: ScanResults };
 type IPCProcessRenames = {
   type: 'process-renames';
-  payload: RenameOperation[];
+  payload: { renames: RenameOperation[]; options: ProcessRenamesOptions };
 };
 type IPCRenameResults = { type: 'rename-results'; payload: RenameResults };
 type IPCRendererReady = { type: 'renderer-ready' };
@@ -102,11 +106,12 @@ export function scanResultsMessage(
 }
 
 export function processRenamesMessage(
-  renames: RenameOperation[]
+  renames: RenameOperation[],
+  options: ProcessRenamesOptions
 ): Channel<IPCProcessRenames> {
   return channel<IPCProcessRenames>({
     type: 'process-renames',
-    payload: renames,
+    payload: { renames, options },
   });
 }
 

src/main/main.ts

@@ -89,8 +89,13 @@ ipcMain.on('ipc-communication', async (event, message: IPCMainMessage) => {
       break;
     case 'process-renames':
       try {
-        const results = await processRenameOperations(message.payload);
-        event.reply(...renameResultsMessage(results));
+        const results = await processRenameOperations(message.payload.renames);
+
+        if (results.success && message.payload.options.exit) {
+          app.quit();
+        } else {
+          event.reply(...renameResultsMessage(results));
+        }
       } catch (error) {
         event.reply(...mainErrorMessage((error as Error).message));
       }

src/renderer/hooks/useMainData.ts

@@ -65,7 +65,6 @@ export function useMainData(): [MainData, Dispatch<SetStateAction<MainData>>] {
             );
             break;
           case 'main-error':
-            alert(message.payload);
             setMainData({
               ...mainData,
               error: message.payload,

src/renderer/hooks/useRenamesAsync.ts

@@ -333,8 +333,9 @@ function createContext(
 }
 
 function createFunction(code: string, context: EntryStats | {} = {}) {
-  const setup = `'use strict'; const console = {}, window = {}, self = {}, top = {}, document = {}, location = {}, navigation = {}, navigator = {}, parent = {}, localStorage = {}, sessionStorage = {}, indexedDB = {}, open = {}, close = {}, openDatabase = {}, fetch = {}, Storage = {}, cookieStore = {}, CookieStore = {}, alert = {};`;
-  // const newCode = `return function() {${setup} const f = ${code}; return f.bind(this);}.bind(this)()`;
+  const setup = `'use strict'; var console = {}, window = {}, self = {}, top = {}, document = {}, location = {}, navigation = {}, navigator = {}, parent = {}, localStorage = {}, sessionStorage = {}, indexedDB = {}, open = {}, close = {}, openDatabase = {}, fetch = {}, Storage = {}, cookieStore = {}, CookieStore = {}, alert = {};`;
+
   const newCode = `return function() {${setup} return (${code}).bind(this);}.bind(this)()`;
+
   return new Function(newCode).bind(context)();
 }

src/renderer/screens/RenameScreen/RenameScreen.test.tsx

@@ -122,14 +122,17 @@ describe('RenameScreen', () => {
       'ipc-communication',
       {
         type: 'process-renames',
-        payload: [
-          {
-            isDirectory: false,
-            basePath: '/',
-            from: 'test2.test',
-            to: 'test_2.test',
-          },
-        ],
+        payload: {
+          renames: [
+            {
+              isDirectory: false,
+              basePath: '/',
+              from: 'test2.test',
+              to: 'test_2.test',
+            },
+          ],
+          options: { exit: false },
+        },
       }
     );
   });

src/renderer/screens/RenameScreen/RenameScreen.tsx

@@ -72,7 +72,9 @@ export default function RenameScreen() {
     const operations = computeRenameOperations(entries, rowSelection);
 
     window.electron.ipcRenderer.sendMessage(
-      ...processRenamesMessage(operations)
+      ...processRenamesMessage(operations, {
+        exit: option.value === 'apply-and-close',
+      })
     );
     // TODO: implement apply and close
   };