electron-main: Rework the event index initialization and deletion.

poljar · poljar · commit dd2c210cfb8f · 2019-11-14T16:14:48.000+01:00
diff --git a/electron_app/package.json b/electron_app/package.json
@@ -15,7 +15,6 @@
     "electron-window-state": "^4.1.0",
     "minimist": "^1.2.0",
     "png-to-ico": "^1.0.2",
-    "make-dir": "^3.0.0",
     "matrix-seshat": "^0.3.0"
   }
 }
diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
@@ -40,12 +40,13 @@ const { migrateFromOldOrigin } = require('./originMigrator');
 const windowStateKeeper = require('electron-window-state');
 const Store = require('electron-store');
 
+const fs = require('fs');
+const afs = fs.promises;
+
 let Seshat = null;
-let makeDir = null;
 
 try {
     Seshat = require('matrix-seshat');
-    makeDir = require('make-dir');
 } catch (e) {
 }
 
@@ -255,21 +256,34 @@ ipcMain.on('seshat', async function(ev, payload) {
             if (eventIndex === null) {
                 let p = path.normalize(eventStorePath);
                 try {
-                    await makeDir(p);
+                    await afs.mkdir(p, {recursive: true});
                     eventIndex = new Seshat(p, {passphrase: "DEFAULT_PASSPHRASE"});
-                    console.log("Initialized event store");
                 } catch (e) {
                     sendError(payload.id, e);
                     return;
                 }
             }
             break;
 
-        case 'deleteEventIndex':
-            await eventIndex.delete();
+        case 'closeEventIndex':
             eventIndex = null;
             break;
 
+        case 'deleteEventIndex':
+            const deleteFolderRecursive = async(p) =>  {
+                for (let entry of await afs.readdir(p)) {
+                    const curPath = path.join(p, entry);
+                    await afs.unlink(curPath);
+                }
+            }
+
+            try {
+                await deleteFolderRecursive(path.normalize(eventStorePath));
+            } catch (e) {
+            }
+
+            break;
+
         case 'isEventIndexEmpty':
             if (eventIndex === null) ret = true;
             else ret = await eventIndex.isEmpty();
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
@@ -149,6 +149,10 @@ class SeshatIndexerManager extends BaseEventIndexManager {
         return this._ipcCall('loadCheckpoints');
     }
 
+    async closeEventIndex(): Promise<> {
+        return this._ipcCall('closeEventIndex');
+    }
+
     async deleteEventIndex(): Promise<> {
         return this._ipcCall('deleteEventIndex');
     }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`"electron-window-state": "^4.1.0",`
`16`	`16`	`"minimist": "^1.2.0",`
`17`	`17`	`"png-to-ico": "^1.0.2",`
`18`		`- "make-dir": "^3.0.0",`
`19`	`18`	`"matrix-seshat": "^0.3.0"`
`20`	`19`	`}`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,10 @@ class SeshatIndexerManager extends BaseEventIndexManager {`
`149`	`149`	`return this._ipcCall('loadCheckpoints');`
`150`	`150`	`}`
`151`	`151`
	`152`	`+ async closeEventIndex(): Promise<> {`
	`153`	`+ return this._ipcCall('closeEventIndex');`
	`154`	`+ }`
	`155`	`+`
`152`	`156`	`async deleteEventIndex(): Promise<> {`
`153`	`157`	`return this._ipcCall('deleteEventIndex');`
`154`	`158`	`}`