From e7046484a0dc0e1bd63d0b2fa1c33919725aeb14 Mon Sep 17 00:00:00 2001 From: Juan Manuel Gonzalez Alama Date: Thu, 25 Jul 2019 12:56:14 -0300 Subject: [PATCH] Remove service's partition folder --- app/view/main/MainController.js | 10 +++++++--- electron/main.js | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js index daee3ffd..e7f1b7e8 100644 --- a/app/view/main/MainController.js +++ b/app/view/main/MainController.js @@ -158,13 +158,17 @@ Ext.define('Rambox.view.main.MainController', { function clearData(webview, tab) { webview.getWebContents().clearHistory(); webview.getWebContents().session.flushStorageData(); - webview.getWebContents().session.clearCache(function() { - webview.getWebContents().session.clearStorageData(function() { - webview.getWebContents().session.cookies.flushStore(function() { + + webview.getWebContents().session.cookies.flushStore(function() { + webview.getWebContents().session.clearCache(function() { + webview.getWebContents().session.clearStorageData(function() { // Remove record from localStorage Ext.getStore('Services').remove(rec); // Close tab tab.close(); + + ipc.send('removePartitionsFolder', webview.partition.replace('persist:', '')); + // Close waiting message if ( total === actual ) { Ext.Msg.hide(); diff --git a/electron/main.js b/electron/main.js index 39bdb274..2f78227b 100644 --- a/electron/main.js +++ b/electron/main.js @@ -13,6 +13,7 @@ const isDev = require('electron-is-dev'); const updater = require('./updater'); // File System var fs = require("fs"); +const fse = require('fs-extra'); const path = require('path'); if ( isDev ) app.getVersion = function() { return require('../package.json').version; }; // FOR DEV ONLY, BECAUSE IN DEV RETURNS ELECTRON'S VERSION @@ -321,6 +322,13 @@ ipcMain.on('setDontDisturb', function(event, arg) { config.set('dont_disturb', arg); }); +// Remove deleted service's folder from Partitions folder. +ipcMain.on('removePartitionsFolder', function(event, folder) { + var fullpath = path.join(app.getPath('userData'), 'Partitions', folder); + + fse.remove(fullpath); +}); + // Reload app ipcMain.on('reloadApp', function(event) { mainWindow.reload();