mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-27 10:32:58 +02:00
08af9de190
* Started revisions support * More rev changes * More rev changes * More revs changes * Fixed deletion algorithm * More tests and moved updated time to separate field * Display info when restoring note * Better handling of existing notes * wip * Further improvements and fixed tests * Better handling of changes created via sync * Enable chokidar again * Testing special case * Further improved logic to handle notes that existed before the revision service * Added tests * Better handling of encrypted revisions * Improved handling of deleted note revisions by moving logic to collectRevision * Improved handling of old notes by moving logic to collectRevision() * Handle case when deleting revisions while one is still encrypted * UI tweaks * Added revision service to mobile app * Fixed config screens on mobile and desktop * Enabled revisions on CLI app
244 lines
6.3 KiB
JavaScript
244 lines
6.3 KiB
JavaScript
const { _ } = require('lib/locale.js');
|
|
const { BrowserWindow, Menu, Tray } = require('electron');
|
|
const { shim } = require('lib/shim');
|
|
const url = require('url')
|
|
const path = require('path')
|
|
const urlUtils = require('lib/urlUtils.js');
|
|
const { dirname, basename } = require('lib/path-utils');
|
|
const fs = require('fs-extra');
|
|
|
|
class ElectronAppWrapper {
|
|
|
|
constructor(electronApp, env, profilePath) {
|
|
this.electronApp_ = electronApp;
|
|
this.env_ = env;
|
|
this.profilePath_ = profilePath;
|
|
this.win_ = null;
|
|
this.willQuitApp_ = false;
|
|
this.tray_ = null;
|
|
this.buildDir_ = null;
|
|
}
|
|
|
|
electronApp() {
|
|
return this.electronApp_;
|
|
}
|
|
|
|
setLogger(v) {
|
|
this.logger_ = v;
|
|
}
|
|
|
|
logger() {
|
|
return this.logger_;
|
|
}
|
|
|
|
window() {
|
|
return this.win_;
|
|
}
|
|
|
|
createWindow() {
|
|
const windowStateKeeper = require('electron-window-state');
|
|
|
|
const stateOptions = {
|
|
defaultWidth: 800,
|
|
defaultHeight: 600,
|
|
file: 'window-state-' + this.env_ + '.json',
|
|
}
|
|
|
|
if (this.profilePath_) stateOptions.path = this.profilePath_;
|
|
|
|
// Load the previous state with fallback to defaults
|
|
const windowState = windowStateKeeper(stateOptions);
|
|
|
|
const windowOptions = {
|
|
x: windowState.x,
|
|
y: windowState.y,
|
|
width: windowState.width,
|
|
height: windowState.height,
|
|
backgroundColor: '#fff', // required to enable sub pixel rendering, can't be in css
|
|
webPreferences: {
|
|
nodeIntegration: true,
|
|
},
|
|
};
|
|
|
|
// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098
|
|
// Fix: https://github.com/electron-userland/electron-builder/issues/2269
|
|
if (shim.isLinux()) windowOptions.icon = path.join(__dirname, '..', 'build/icons/128x128.png');
|
|
|
|
require('electron-context-menu')({
|
|
shouldShowMenu: (event, params) => {
|
|
// params.inputFieldType === 'none' when right-clicking the text editor. This is a bit of a hack to detect it because in this
|
|
// case we don't want to use the built-in context menu but a custom one.
|
|
return params.isEditable && params.inputFieldType !== 'none';
|
|
},
|
|
});
|
|
|
|
this.win_ = new BrowserWindow(windowOptions)
|
|
|
|
this.win_.loadURL(url.format({
|
|
pathname: path.join(__dirname, 'index.html'),
|
|
protocol: 'file:',
|
|
slashes: true
|
|
}))
|
|
|
|
// Uncomment this to view errors if the application does not start
|
|
if (this.env_ === 'dev') this.win_.webContents.openDevTools();
|
|
|
|
this.win_.on('close', (event) => {
|
|
// If it's on macOS, the app is completely closed only if the user chooses to close the app (willQuitApp_ will be true)
|
|
// otherwise the window is simply hidden, and will be re-open once the app is "activated" (which happens when the
|
|
// user clicks on the icon in the task bar).
|
|
|
|
// On Windows and Linux, the app is closed when the window is closed *except* if the tray icon is used. In which
|
|
// case the app must be explicitely closed with Ctrl+Q or by right-clicking on the tray icon and selecting "Exit".
|
|
|
|
if (process.platform === 'darwin') {
|
|
if (this.willQuitApp_) {
|
|
this.win_ = null;
|
|
} else {
|
|
event.preventDefault();
|
|
this.hide();
|
|
}
|
|
} else {
|
|
if (this.trayShown() && !this.willQuitApp_) {
|
|
event.preventDefault();
|
|
this.win_.hide();
|
|
} else {
|
|
this.win_ = null;
|
|
}
|
|
}
|
|
})
|
|
|
|
// Let us register listeners on the window, so we can update the state
|
|
// automatically (the listeners will be removed when the window is closed)
|
|
// and restore the maximized or full screen state
|
|
windowState.manage(this.win_);
|
|
}
|
|
|
|
async waitForElectronAppReady() {
|
|
if (this.electronApp().isReady()) return Promise.resolve();
|
|
|
|
return new Promise((resolve, reject) => {
|
|
const iid = setInterval(() => {
|
|
if (this.electronApp().isReady()) {
|
|
clearInterval(iid);
|
|
resolve();
|
|
}
|
|
}, 10);
|
|
});
|
|
}
|
|
|
|
async quit() {
|
|
this.electronApp_.quit();
|
|
}
|
|
|
|
exit(errorCode = 0) {
|
|
this.electronApp_.exit(errorCode);
|
|
}
|
|
|
|
trayShown() {
|
|
return !!this.tray_;
|
|
}
|
|
|
|
// This method is used in macOS only to hide the whole app (and not just the main window)
|
|
// including the menu bar. This follows the macOS way of hidding an app.
|
|
hide() {
|
|
this.electronApp_.hide();
|
|
}
|
|
|
|
buildDir() {
|
|
if (this.buildDir_) return this.buildDir_;
|
|
let dir = __dirname + '/build';
|
|
if (!fs.pathExistsSync(dir)) {
|
|
dir = dirname(__dirname) + '/build';
|
|
if (!fs.pathExistsSync(dir)) throw new Error('Cannot find build dir');
|
|
}
|
|
|
|
this.buildDir_ = dir;
|
|
return dir;
|
|
}
|
|
|
|
trayIconFilename_() {
|
|
let output = '';
|
|
|
|
if (process.platform === 'darwin') {
|
|
output = 'macos-16x16Template.png'; // Electron Template Image format
|
|
} else {
|
|
output = '16x16.png';
|
|
}
|
|
|
|
if (this.env_ === 'dev') output = '16x16-dev.png'
|
|
|
|
return output;
|
|
}
|
|
|
|
// Note: this must be called only after the "ready" event of the app has been dispatched
|
|
createTray(contextMenu) {
|
|
try {
|
|
this.tray_ = new Tray(this.buildDir() + '/icons/' + this.trayIconFilename_())
|
|
this.tray_.setToolTip(this.electronApp_.getName())
|
|
this.tray_.setContextMenu(contextMenu)
|
|
|
|
this.tray_.on('click', () => {
|
|
this.window().show();
|
|
});
|
|
} catch (error) {
|
|
console.error("Cannot create tray", error);
|
|
}
|
|
}
|
|
|
|
destroyTray() {
|
|
if (!this.tray_) return;
|
|
this.tray_.destroy();
|
|
this.tray_ = null;
|
|
}
|
|
|
|
ensureSingleInstance() {
|
|
if (this.env_ === 'dev') return false;
|
|
|
|
const gotTheLock = this.electronApp_.requestSingleInstanceLock();
|
|
|
|
if (!gotTheLock) {
|
|
// Another instance is already running - exit
|
|
this.electronApp_.quit();
|
|
return true;
|
|
}
|
|
|
|
// Someone tried to open a second instance - focus our window instead
|
|
this.electronApp_.on('second-instance', (event, commandLine, workingDirectory) => {
|
|
const win = this.window();
|
|
if (!win) return;
|
|
if (win.isMinimized()) win.restore();
|
|
win.show();
|
|
win.focus();
|
|
});
|
|
|
|
return false;
|
|
}
|
|
|
|
async start() {
|
|
// Since we are doing other async things before creating the window, we might miss
|
|
// the "ready" event. So we use the function below to make sure that the app is ready.
|
|
await this.waitForElectronAppReady();
|
|
|
|
const alreadyRunning = this.ensureSingleInstance();
|
|
if (alreadyRunning) return;
|
|
|
|
this.createWindow();
|
|
|
|
this.electronApp_.on('before-quit', () => {
|
|
this.willQuitApp_ = true;
|
|
})
|
|
|
|
this.electronApp_.on('window-all-closed', () => {
|
|
this.electronApp_.quit();
|
|
})
|
|
|
|
this.electronApp_.on('activate', () => {
|
|
this.win_.show();
|
|
})
|
|
}
|
|
|
|
}
|
|
|
|
module.exports = { ElectronAppWrapper };
|