BlockStorage/repertory-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.1.x_branch' into 1.2.x_branch

Browse Source
This commit is contained in:
sgraves76
2020-02-13 13:21:56 -06:00
parent 012254ede3 19fcf896df
commit 037dccea6e
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/electron.js
View File

@@ -50,6 +50,7 @@ let isShutdown = false;
let isQuiting = false; let isQuiting = false;
let isInstalling = false; let isInstalling = false;
let launchHidden = false; let launchHidden = false;
let cleanupReleases = false;
let mainWindow; let mainWindow;
let mainWindowTray; let mainWindowTray;
let trayContextMenu; let trayContextMenu;
@@ -153,6 +154,9 @@ const createWindow = () => {
}, },
checked: !launchHidden, checked: !launchHidden,
}, },
{
type: 'separator'
},
{ {
label: 'Auto-start', type: 'checkbox', click(item) { label: 'Auto-start', type: 'checkbox', click(item) {
if (item.checked) { if (item.checked) {
@@ -162,9 +166,6 @@ const createWindow = () => {
} }
} }
}, },
{
type: 'separator'
},
{ {
label: 'Launch Hidden', type: 'checkbox', click(item) { label: 'Launch Hidden', type: 'checkbox', click(item) {
launchHidden = !!item.checked; launchHidden = !!item.checked;
@@ -175,6 +176,16 @@ const createWindow = () => {
{ {
type: 'separator' type: 'separator'
}, },
{
label: 'Delete Old Releases', type: 'checkbox', click(item) {
cleanupReleases = !!item.checked;
saveUiSettings();
},
checked: cleanupReleases,
},
{
type: 'separator'
},
{ {
label: 'Exit and Unmount', click() { label: 'Exit and Unmount', click() {
closeApplication(); closeApplication();
@@ -208,7 +219,8 @@ const loadUiSettings = () => {
try { try {
if (fs.statSync(settingFile).isFile()) { if (fs.statSync(settingFile).isFile()) {
const settings = JSON.parse(fs.readFileSync(settingFile, 'utf8')); const settings = JSON.parse(fs.readFileSync(settingFile, 'utf8'));
launchHidden = settings.launch_hidden; launchHidden = !!settings.launch_hidden;
cleanupReleases = !!settings.cleanup_releases;
PlatformIPC.setPlatformOverride(settings.platform_override); PlatformIPC.setPlatformOverride(settings.platform_override);
} }
} catch (e) { } catch (e) {
@@ -219,6 +231,7 @@ const saveUiSettings = () => {
const settingFile = path.join(helpers.getDataDirectory(), 'ui.json'); const settingFile = path.join(helpers.getDataDirectory(), 'ui.json');
try { try {
fs.writeFileSync(settingFile, JSON.stringify({ fs.writeFileSync(settingFile, JSON.stringify({
cleanup_releases: cleanupReleases,
launch_hidden: launchHidden, launch_hidden: launchHidden,
platform_override: PlatformIPC.getPlatformOverride(), platform_override: PlatformIPC.getPlatformOverride(),
}), 'utf-8'); }), 'utf-8');
@@ -304,7 +317,7 @@ DownloadIPC.addListeners(ipcMain, standardIPCReply);
FilesystemIPC.addListeners(ipcMain, getMainWindow, dialog); FilesystemIPC.addListeners(ipcMain, getMainWindow, dialog);
MountsIPC.addListeners(ipcMain, setTrayImage, standardIPCReply); MountsIPC.addListeners(ipcMain, setTrayImage, standardIPCReply);
PlatformIPC.addListeners(ipcMain, detectScript, saveUiSettings); PlatformIPC.addListeners(ipcMain, detectScript, saveUiSettings);
ReleaseIPC.addListeners(ipcMain, standardIPCReply); ReleaseIPC.addListeners(ipcMain, () => cleanupReleases, standardIPCReply);
StateIPC.addListeners(ipcMain); StateIPC.addListeners(ipcMain);
SystemIPC.addListeners(ipcMain, closeApplication); SystemIPC.addListeners(ipcMain, closeApplication);
UpgradeIPC.addListeners(ipcMain, setIsInstalling, MountsIPC.unmountAllDrives, standardIPCReply); UpgradeIPC.addListeners(ipcMain, setIsInstalling, MountsIPC.unmountAllDrives, standardIPCReply);

4
src/renderer/ipc/ReleaseIPC.js
View File

@@ -5,7 +5,7 @@ const os = require('os');
const path = require('path'); const path = require('path');
const unzip = require('unzipper'); const unzip = require('unzipper');
const addListeners = (ipcMain, standardIPCReply) => { const addListeners = (ipcMain, getCleanupReleases, standardIPCReply) => {
ipcMain.on(Constants.IPC_Check_Installed, (event, data) => { ipcMain.on(Constants.IPC_Check_Installed, (event, data) => {
const destination = path.join(helpers.getDataDirectory(), data.Version); const destination = path.join(helpers.getDataDirectory(), data.Version);
helpers helpers
@@ -30,7 +30,9 @@ const addListeners = (ipcMain, standardIPCReply) => {
}); });
ipcMain.on(Constants.IPC_Cleanup_Releases + '_sync', (event, data) => { ipcMain.on(Constants.IPC_Cleanup_Releases + '_sync', (event, data) => {
if (getCleanupReleases()) {
helpers.cleanupOldReleases(data.version_list); helpers.cleanupOldReleases(data.version_list);
}
event.returnValue = true; event.returnValue = true;
}); });