diff --git a/package.json b/package.json index 376e8dc..d2fa242 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Miru", - "version": "2.6.0", + "version": "2.6.1", "author": "ThaUnknown_ ", "main": "src/index.js", "homepage": "https://github.com/ThaUnknown/miru#readme", diff --git a/src/index.js b/src/index.js index b4445ba..7eb1cfe 100644 --- a/src/index.js +++ b/src/index.js @@ -1,7 +1,5 @@ const { app, BrowserWindow, protocol, shell, ipcMain } = require('electron') const path = require('path') -const log = require('electron-log') -const { autoUpdater } = require('electron-updater') require('./main/misc.js') if (process.defaultApp) { @@ -45,8 +43,6 @@ ipcMain.on('open', (event, url) => { shell.openExternal(url) }) -autoUpdater.logger = log -autoUpdater.logger.transports.file.level = 'info' // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. @@ -67,8 +63,6 @@ function UpsertKeyValue (obj, keyToChange, value) { } function createWindow () { - autoUpdater.checkForUpdatesAndNotify() - // Create the browser window. mainWindow = new BrowserWindow({ width: 1600, diff --git a/src/main/misc.js b/src/main/misc.js index bad1408..374e387 100644 --- a/src/main/misc.js +++ b/src/main/misc.js @@ -1,5 +1,7 @@ const { dialog, ipcMain, BrowserWindow, app } = require('electron') const { Client } = require('discord-rpc') +const log = require('electron-log') +const { autoUpdater } = require('electron-updater') ipcMain.on('dialog', async (event, data) => { const { filePaths } = await dialog.showOpenDialog({ @@ -47,7 +49,7 @@ discord.on('ready', () => { }) function loginRPC () { discord.login({ clientId: '954855428355915797' }).catch(() => { - setTimeout(loginRPC, 5000) + setTimeout(loginRPC, 5000).unref() }) } loginRPC() @@ -55,3 +57,14 @@ loginRPC() ipcMain.on('version', (event) => { event.sender.send('version', app.getVersion()) // fucking stupid }) + +autoUpdater.logger = log +autoUpdater.logger.transports.file.level = 'info' +ipcMain.on('update', () => { + autoUpdater.checkForUpdatesAndNotify() +}) + +autoUpdater.checkForUpdatesAndNotify() +autoUpdater.on('update-available', () => { + BrowserWindow.getAllWindows()[0]?.send('update', true) +}) diff --git a/src/renderer/src/App.svelte b/src/renderer/src/App.svelte index 0436415..4f62a5d 100644 --- a/src/renderer/src/App.svelte +++ b/src/renderer/src/App.svelte @@ -17,7 +17,7 @@ setContext('view', view) - let sidebar = writable(true) + const sidebar = writable(true) setContext('sidebar', sidebar) setContext('gallery', writable(null)) diff --git a/src/renderer/src/lib/pages/Settings.svelte b/src/renderer/src/lib/pages/Settings.svelte index eeea717..911560e 100644 --- a/src/renderer/src/lib/pages/Settings.svelte +++ b/src/renderer/src/lib/pages/Settings.svelte @@ -1,4 +1,5 @@