From f1cec69efb254d3f1023f15d39687dc25c2c8bad Mon Sep 17 00:00:00 2001 From: "Mr. Stallion" Date: Tue, 23 Jun 2020 18:38:16 -0500 Subject: [PATCH] Version management --- docs/_config.yml | 6 ++-- electron/main.ts | 82 ++++++++++++++++++++++++------------------- electron/pack.js | 1 + electron/package.json | 2 +- 4 files changed, 51 insertions(+), 40 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index fc71c5c..e0863a6 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -48,11 +48,11 @@ theme: jekyll-theme-slate download: - win_url: https://github.com/mrstallion/fchat-rising/releases/download/v3.0.13-rising-v1/F-Chat.Rising.Setup.exe + win_url: https://github.com/mrstallion/fchat-rising/releases/download/v1.0.0/F-Chat-Rising-v1.0.0-win.exe win_size: 68 MB - mac_url: https://github.com/mrstallion/fchat-rising/releases/download/v3.0.13-rising-v1/F-Chat.Rising.dmg + mac_url: https://github.com/mrstallion/fchat-rising/releases/download/v1.0.0/F-Chat-Rising-v1.0.0-macos.dmg mac_size: 72 MB - linux_url: https://github.com/mrstallion/fchat-rising/releases/download/v3.0.13-rising-v1/fchat-rising.AppImage + linux_url: https://github.com/mrstallion/fchat-rising/releases/download/v1.0.0/F-Chat-Rising-v1.0.0-linux.AppImage linux_size: 74 MB diff --git a/electron/main.ts b/electron/main.ts index 77715cc..69b1d1b 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -44,13 +44,15 @@ import {defaultHost, GeneralSettings} from './common'; import { getSafeLanguages, knownLanguageNames, updateSupportedLanguages } from './language'; import * as windowState from './window_state'; import BrowserWindow = Electron.BrowserWindow; -// import MenuItem = Electron.MenuItem; +import MenuItem = Electron.MenuItem; import { ElectronBlocker } from '@cliqz/adblocker-electron'; import fetch from 'node-fetch'; import MenuItemConstructorOptions = Electron.MenuItemConstructorOptions; import * as _ from 'lodash'; import DownloadItem = Electron.DownloadItem; +const pck = require('./package.json'); + // Module to control application life. const app = electron.app; @@ -306,41 +308,49 @@ function onReady(): void { setGeneralSettings(settings); } - // const updaterUrl = `https://client.f-list.net/${process.platform}`; - // if(process.env.NODE_ENV === 'production') { - // electron.autoUpdater.setFeedURL({url: updaterUrl + (settings.beta ? '?channel=beta' : ''), serverType: 'json'}); - // setTimeout(() => electron.autoUpdater.checkForUpdates(), 10000); - // const updateTimer = setInterval(() => electron.autoUpdater.checkForUpdates(), 3600000); - // electron.autoUpdater.on('update-downloaded', () => { - // clearInterval(updateTimer); - // const menu = electron.Menu.getApplicationMenu()!; - // const item = menu.getMenuItemById('update') as MenuItem | null; - // if(item !== null) item.visible = true; - // else - // menu.append(new electron.MenuItem({ - // label: l('action.updateAvailable'), - // submenu: electron.Menu.buildFromTemplate([{ - // label: l('action.update'), - // click: () => { - // for(const w of windows) w.webContents.send('quit'); - // electron.autoUpdater.quitAndInstall(); - // } - // }, { - // label: l('help.changelog'), - // click: showPatchNotes - // }]), - // id: 'update' - // })); - // electron.Menu.setApplicationMenu(menu); - // for(const w of windows) w.webContents.send('update-available', true); - // }); - // electron.autoUpdater.on('update-not-available', () => { - // for(const w of windows) w.webContents.send('update-available', false); - // const item = electron.Menu.getApplicationMenu()!.getMenuItemById('update') as MenuItem | null; - // if(item !== null) item.visible = false; - // }); - // electron.autoUpdater.on('error', (e) => log.error(e)); - // } + // require('update-electron-app')( + // { + // repo: 'https://github.com/mrstallion/fchat-rising.git', + // updateInterval: '3 hours', + // logger: require('electron-log') + // } + // ); + + const updaterUrl = `https://update.electronjs.org/mrstallion/fchat-rising/${process.platform}-${process.arch}/${pck.version}`; + if(process.env.NODE_ENV === 'production') { + electron.autoUpdater.setFeedURL({url: updaterUrl + (settings.beta ? '?channel=beta' : ''), serverType: 'json'}); + setTimeout(() => electron.autoUpdater.checkForUpdates(), 10000); + const updateTimer = setInterval(() => electron.autoUpdater.checkForUpdates(), 3600000); + electron.autoUpdater.on('update-downloaded', () => { + clearInterval(updateTimer); + const menu = electron.Menu.getApplicationMenu()!; + const item = menu.getMenuItemById('update') as MenuItem | null; + if(item !== null) item.visible = true; + else + menu.append(new electron.MenuItem({ + label: l('action.updateAvailable'), + submenu: electron.Menu.buildFromTemplate([{ + label: l('action.update'), + click: () => { + for(const w of windows) w.webContents.send('quit'); + electron.autoUpdater.quitAndInstall(); + } + }, { + label: l('help.changelog'), + click: showPatchNotes + }]), + id: 'update' + })); + electron.Menu.setApplicationMenu(menu); + for(const w of windows) w.webContents.send('update-available', true); + }); + electron.autoUpdater.on('update-not-available', () => { + for(const w of windows) w.webContents.send('update-available', false); + const item = electron.Menu.getApplicationMenu()!.getMenuItemById('update') as MenuItem | null; + if(item !== null) item.visible = false; + }); + electron.autoUpdater.on('error', (e) => log.error(e)); + } const viewItem = { label: `&${l('action.view')}`, diff --git a/electron/pack.js b/electron/pack.js index eaa3c0a..8d3f783 100644 --- a/electron/pack.js +++ b/electron/pack.js @@ -78,6 +78,7 @@ require('electron-packager')({ exe: 'F-Chat.exe', title: 'F-Chat Rising', setupExe: setupName, + name: 'fchat' // remoteReleases: 'https://client.f-list.net/win32/' + (isBeta ? '?channel=beta' : ''), // signWithParams: process.argv.length > 3 ? `/a /f ${process.argv[2]} /p ${process.argv[3]} /fd sha256 /tr http://timestamp.digicert.com /td sha256` : undefined }).catch((e) => console.error(`Error while creating installer: ${e.message}`)); diff --git a/electron/package.json b/electron/package.json index b43fbda..684d2b3 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "fchat", - "version": "3.0.13-rising-v1", + "version": "1.0.0", "author": "The F-List Team and Mister Stallion (Esq.)", "description": "F-List.net Chat Client", "main": "main.js",