Updated readme

.gitignore

@@ -35,9 +35,4 @@ _vieux/
 _mydocs
 .DS_Store
 Assets/DownloadBadges*.psd
-node_modules
-Tools/github_oauth_token.txt
-_releases
-ReactNativeClient/lib/csstojs/
-ElectronClient/app/gui/note-viewer/fonts/
-Tools/commit_hook.txt
+node_modules

.travis.yml

@@ -1,6 +1,3 @@
-# Only build tags (Doesn't work - doesn't build anything)
-if: tag IS present
-
 rvm: 2.3.3
 
 matrix:
@@ -46,8 +43,7 @@ before_install:
 
 script:
   - |
-    cd Tools
+    cd ElectronClient/app
+    rsync -aP ../../ReactNativeClient/lib/ lib/
     npm install
-    cd ../ElectronClient/app
-    rsync -aP --delete ../../ReactNativeClient/lib/ lib/
-    npm install && yarn dist
+    yarn dist

Assets/build_mac_icons.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+iconutil --convert icns macOs.iconset

Assets/check-square-o.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1472 930v318q0 119-84.5 203.5t-203.5 84.5h-832q-119 0-203.5-84.5t-84.5-203.5v-832q0-119 84.5-203.5t203.5-84.5h832q63 0 117 25 15 7 18 23 3 17-9 29l-49 49q-10 10-23 10-3 0-9-2-23-6-45-6h-832q-66 0-113 47t-47 113v832q0 66 47 113t113 47h832q66 0 113-47t47-113v-254q0-13 9-22l64-64q10-10 23-10 6 0 12 3 20 8 20 29zm231-489l-814 814q-24 24-57 24t-57-24l-430-430q-24-24-24-57t24-57l110-110q24-24 57-24t57 24l263 263 647-647q24-24 57-24t57 24l110 110q24 24 24 57t-24 57z"/></svg>

Assets/check-square.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M813 1299l614-614q19-19 19-45t-19-45l-102-102q-19-19-45-19t-45 19l-467 467-211-211q-19-19-45-19t-45 19l-102 102q-19 19-19 45t19 45l358 358q19 19 45 19t45-19zm851-883v960q0 119-84.5 203.5t-203.5 84.5h-960q-119 0-203.5-84.5t-84.5-203.5v-960q0-119 84.5-203.5t203.5-84.5h960q119 0 203.5 84.5t84.5 203.5z"/></svg>

Assets/square-o.svg

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='utf-8'?>
+<svg viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'><path d='M1312 256h-832q-66 0-113 47t-47 113v832q0 66 47 113t113 47h832q66 0 113-47t47-113v-832q0-66-47-113t-113-47zm288 160v832q0 119-84.5 203.5t-203.5 84.5h-832q-119 0-203.5-84.5t-84.5-203.5v-832q0-119 84.5-203.5t203.5-84.5h832q119 0 203.5 84.5t84.5 203.5z'/></svg>

BUILD.md

@@ -1,72 +1,40 @@
 # General information
 
-- All the applications share the same library, which, for historical reasons, is in ReactNativeClient/lib. This library is copied to the relevant directories when building each app.
-- The translations are built by running CliClient/build-translation.sh. You normally don't need to run this if you haven't updated the translation since the compiled files are on the repository.
+- All the applications share the same library, which, for historical reasons, is in ReactNativeClient/lib. This library is copied to the relevant directories when builing each app.
+- The translations are built by running CliClient/build-translation.sh. For this reasons, it's generally better to get the CLI app to build first so that everything is setup correctly.
+- Note: building translations is no longer required to run the apps, so you can ignore all the below requirements about gettext.
 
 ## macOS dependencies
 
-	brew install yarn node
-	echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile
-	source ~/.bash_profile
+     brew install yarn node xgettext
+     npm install -g node-gyp
+    echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile
+    source ~/.bash_profile
 
-If you get a node-gyp related error you might need to manually install it: `npm install -g node-gyp`
-
-## Linux and Windows (WSL) dependencies
+## Linux and Windows dependencies
 
 - Install yarn - https://yarnpkg.com/lang/en/docs/install/
 - Install node v8.x (check with `node --version`) - https://nodejs.org/en/
-- If you get a node-gyp related error you might need to manually install it: `npm install -g node-gyp`
-
-# Building the tools
-
-Before building any of the applications, you need to build the tools:
-
-```
-cd Tools
-npm install
-```
 
 # Building the Electron application
 
 ```
 cd ElectronClient/app
-rsync --delete -a ../../ReactNativeClient/lib/ lib/
+rsync -a ../../ReactNativeClient/lib/ lib/
 npm install
 yarn dist
 ```
 
 If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4`
 
-For node-gyp to work, you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
-
 That will create the executable file in the `dist` directory.
 
 From `/ElectronClient` you can also run `run.sh` to run the app for testing.
 
-## Building Electron application on Windows
-
-```
-cd Tools
-npm install
-cd ..\ElectronClient\app
-xcopy /C /I /H /R /Y /S ..\..\ReactNativeClient\lib lib
-npm install
-yarn dist
-```
-
 # Building the Mobile application
 
-First you need to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "Building Projects with Native Code" tab.
-
-Then, from `/ReactNativeClient`, run `npm install`, then `react-native run-ios` or `react-native run-android`.
+From `/ReactNativeClient`, run `npm install`, then `react-native run-ios` or `react-native run-android`.
 
 # Building the Terminal application
 
-```
-cd CliClient
-npm install
-./build.sh
-rsync --delete -aP ../ReactNativeClient/locales/ build/locales/
-```
-
-Run `run.sh` to start the application for testing.
+From `/CliClient`, run `npm install` then run `run.sh`. If you get an error about `xgettext`, comment out the command `node build-translation.js --silent` in build.sh

CONTRIBUTING.md

@@ -1,19 +0,0 @@
-# Reporting a bug
-
-Please check first that it [has not already been reported](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue). Also consider [enabling debug mode](https://github.com/laurent22/joplin/blob/master/readme/debugging.md) before reporting the issue so that you can provide as much details as possible to help fix it.
-
-If possible, **please provide a screenshot**. A screenshot showing the problem is often more useful than a paragraph describing it as it can make it immediately clear what the issue is.
-
-# Feature requests
-
-Again, please check that it has not already been requested. If it has, simply **up-vote the issue** - the ones with the most up-votes are likely to be implemented. Adding a "+1" comment does nothing.
-
-# Adding new features
-
-If you want to add a new feature, consider asking about it before implementing it to make sure it is within the scope of the project. Of course you are free to create the pull request directly but it is not guaranteed it is going to be accepted.
-
-Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
-
-# Coding style
-
-See the [prettier config](https://github.com/laurent22/joplin/blob/master/prettier.config.js).

CliClient/app/ResourceServer.js

@@ -1,6 +1,6 @@
 const { _ } = require('lib/locale.js');
 const { Logger } = require('lib/logger.js');
-const Resource = require('lib/models/Resource.js');
+const { Resource } = require('lib/models/resource.js');
 const { netUtils } = require('lib/net-utils.js');
 
 const http = require("http");

CliClient/app/app-gui.js

@@ -1,9 +1,9 @@
 const { Logger } = require('lib/logger.js');
-const Folder = require('lib/models/Folder.js');
-const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
-const Note = require('lib/models/Note.js');
-const Resource = require('lib/models/Resource.js');
+const { Folder } = require('lib/models/folder.js');
+const { Tag } = require('lib/models/tag.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Note } = require('lib/models/note.js');
+const { Resource } = require('lib/models/resource.js');
 const { cliUtils } = require('./cli-utils.js');
 const { reducer, defaultState } = require('lib/reducer.js');
 const { splitCommandString } = require('lib/string-utils.js');
@@ -14,7 +14,6 @@ const chalk = require('chalk');
 const tk = require('terminal-kit');
 const TermWrapper = require('tkwidgets/framework/TermWrapper.js');
 const Renderer = require('tkwidgets/framework/Renderer.js');
-const DecryptionWorker = require('lib/services/DecryptionWorker');
 
 const BaseWidget = require('tkwidgets/BaseWidget.js');
 const ListWidget = require('tkwidgets/ListWidget.js');
@@ -35,55 +34,37 @@ const ConsoleWidget = require('./gui/ConsoleWidget.js');
 
 class AppGui {
 
-	constructor(app, store, keymap) {
-		try {
-			this.app_ = app;
-			this.store_ = store;
+	constructor(app, store) {
+		this.app_ = app;
+		this.store_ = store;
 
-			BaseWidget.setLogger(app.logger());
+		BaseWidget.setLogger(app.logger());
 
-			this.term_ = new TermWrapper(tk.terminal);
+		this.term_ = new TermWrapper(tk.terminal);
 
-			// Some keys are directly handled by the tkwidget framework
-			// so they need to be remapped in a different way.
-			this.tkWidgetKeys_ = {
-				'focus_next': 'TAB',
-				'focus_previous': 'SHIFT_TAB',
-				'move_up': 'UP',
-				'move_down': 'DOWN',
-				'page_down': 'PAGE_DOWN',
-				'page_up': 'PAGE_UP',
-			};
+		this.renderer_ = null;
+		this.logger_ = new Logger();
+		this.buildUi();
 
-			this.renderer_ = null;
-			this.logger_ = new Logger();
-			this.buildUi();
+		this.renderer_ = new Renderer(this.term(), this.rootWidget_);
 
-			this.renderer_ = new Renderer(this.term(), this.rootWidget_);
+		this.app_.on('modelAction', async (event) => {
+			await this.handleModelAction(event.action);
+		});
 
-			this.app_.on('modelAction', async (event) => {
-				await this.handleModelAction(event.action);
-			});
+		this.shortcuts_ = this.setupShortcuts();
 
-			this.keymap_ = this.setupKeymap(keymap);
+		this.inputMode_ = AppGui.INPUT_MODE_NORMAL;
 
-			this.inputMode_ = AppGui.INPUT_MODE_NORMAL;
+		this.commandCancelCalled_ = false;
 
-			this.commandCancelCalled_ = false;
+		this.currentShortcutKeys_ = [];
+		this.lastShortcutKeyTime_ = 0;
 
-			this.currentShortcutKeys_ = [];
-			this.lastShortcutKeyTime_ = 0;
-
-			// Recurrent sync is setup only when the GUI is started. In
-			// a regular command it's not necessary since the process
-			// exits right away.
-			reg.setupRecurrentSync();
-			DecryptionWorker.instance().scheduleStart();
-		} catch (error) {
-			this.fullScreen(false);
-			console.error(error);
-			process.exit(1);
-		}
+		// Recurrent sync is setup only when the GUI is started. In
+		// a regular command it's not necessary since the process
+		// exits right away.
+		reg.setupRecurrentSync();
 	}
 
 	store() {
@@ -99,16 +80,8 @@ class AppGui {
 		await this.renderer_.renderRoot();
 	}
 
-	termSaveState() {
-		return this.term().saveState();
-	}
-
-	termRestoreState(state) {
-		return this.term().restoreState(state);
-	}
-
-	prompt(initialText = '', promptString = ':', options = null) {
-		return this.widget('statusBar').prompt(initialText, promptString, options);
+	prompt(initialText = '', promptString = ':') {
+		return this.widget('statusBar').prompt(initialText, promptString);
 	}
 
 	stdoutMaxWidth() {
@@ -122,7 +95,6 @@ class AppGui {
 	buildUi() {
 		this.rootWidget_ = new ReduxRootWidget(this.store_);
 		this.rootWidget_.name = 'root';
-		this.rootWidget_.autoShortcutsEnabled = false;
 
 		const folderList = new FolderListWidget();
 		folderList.style = {
@@ -287,31 +259,155 @@ class AppGui {
 
 	addCommandToConsole(cmd) {
 		if (!cmd) return;
-		const isConfigPassword = cmd.indexOf('config ') >= 0 && cmd.indexOf('password') >= 0;
-		if (isConfigPassword) return;
 		this.stdout(chalk.cyan.bold('> ' + cmd));	
 	}
 
-	setupKeymap(keymap) {
-		const output = [];
+	setupShortcuts() {
+		const shortcuts = {};
 
-		for (let i = 0; i < keymap.length; i++) {
-			const item = Object.assign({}, keymap[i]);
-
-			if (!item.command) throw new Error('Missing command for keymap item: ' + JSON.stringify(item));
-
-			if (!('type' in item)) item.type = 'exec';
-
-			if (item.command in this.tkWidgetKeys_) {
-				item.type = 'tkwidgets';
-			}
-
-			item.canRunAlongOtherCommands = item.type === 'function' && ['toggle_metadata', 'toggle_console'].indexOf(item.command) >= 0;
-
-			output.push(item);
+		shortcuts['TAB'] = {
+			friendlyName: 'Tab',
+			description: () => _('Give focus to next pane'),
+			isDocOnly: true,
 		}
 
-		return output;
+		shortcuts['SHIFT_TAB'] = {
+			friendlyName: 'Shift+Tab',
+			description: () => _('Give focus to previous pane'),
+			isDocOnly: true,
+		}
+
+		shortcuts[':'] = {
+			description: () => _('Enter command line mode'),
+			action: async () => {
+				const cmd = await this.widget('statusBar').prompt();
+				if (!cmd) return;
+				this.addCommandToConsole(cmd);
+				await this.processCommand(cmd);
+			},
+		};
+
+		shortcuts['ESC'] = { // Built into terminal-kit inputField
+			description: () => _('Exit command line mode'),
+			isDocOnly: true,
+		};
+
+		shortcuts['ENTER'] = {
+			description: () => _('Edit the selected note'),
+			action: () => {
+				const w = this.widget('mainWindow').focusedWidget;
+				if (w.name === 'folderList') {
+					this.widget('noteList').focus();
+				} else if (w.name === 'noteList' || w.name === 'noteText') {
+					this.processCommand('edit $n');
+				}
+			},
+		}
+
+		shortcuts['CTRL_C'] = {
+			description: () => _('Cancel the current command.'),
+			friendlyName: 'Ctrl+C',
+			isDocOnly: true,
+		}
+
+		shortcuts['CTRL_D'] = {
+			description: () => _('Exit the application.'),
+			friendlyName: 'Ctrl+D',
+			isDocOnly: true,
+		}
+
+		shortcuts['DELETE'] = {
+			description: () => _('Delete the currently selected note or notebook.'),
+			action: async () => {
+				if (this.widget('folderList').hasFocus) {
+					const item = this.widget('folderList').selectedJoplinItem;
+
+					if (!item) return;
+
+					if (item.type_ === BaseModel.TYPE_FOLDER) {
+						await this.processCommand('rmbook ' + item.id);
+					} else if (item.type_ === BaseModel.TYPE_TAG) {
+						this.stdout(_('To delete a tag, untag the associated notes.'));
+					} else if (item.type_ === BaseModel.TYPE_SEARCH) {
+						this.store().dispatch({
+							type: 'SEARCH_DELETE',
+							id: item.id,
+						});
+					}
+				} else if (this.widget('noteList').hasFocus) {
+					await this.processCommand('rmnote $n');
+				} else {
+					this.stdout(_('Please select the note or notebook to be deleted first.'));
+				}
+			}
+		};
+
+		shortcuts['BACKSPACE'] = {
+			alias: 'DELETE',
+		};
+
+		shortcuts[' '] = {
+			friendlyName: 'SPACE',
+			description: () => _('Set a to-do as completed / not completed'),
+			action: 'todo toggle $n',
+		}
+
+		shortcuts['tc'] = {
+			description: () => _('[t]oggle [c]onsole between maximized/minimized/hidden/visible.'),
+			action: () => {
+				if (!this.consoleIsShown()) {
+					this.showConsole();
+					this.minimizeConsole();
+				} else {
+					if (this.consoleIsMaximized()) {
+						this.hideConsole();
+					} else {
+						this.maximizeConsole();
+					}
+				}
+			},
+			canRunAlongOtherCommands: true,
+		}
+
+		shortcuts['/'] = {
+			description: () => _('Search'),
+			action: { type: 'prompt', initialText: 'search ""', cursorPosition: -2 },
+		};
+
+		shortcuts['tm'] = {
+			description: () => _('[t]oggle note [m]etadata.'),
+			action: () => {
+				this.toggleNoteMetadata();
+			},
+			canRunAlongOtherCommands: true,
+		}
+
+		shortcuts['mn'] = {
+			description: () => _('[M]ake a new [n]ote'),
+			action: { type: 'prompt', initialText: 'mknote ""', cursorPosition: -2 },
+		}
+
+		shortcuts['mt'] = {
+			description: () => _('[M]ake a new [t]odo'),
+			action: { type: 'prompt', initialText: 'mktodo ""', cursorPosition: -2 },
+		}
+
+		shortcuts['mb'] = {
+			description: () => _('[M]ake a new note[b]ook'),
+			action: { type: 'prompt', initialText: 'mkbook ""', cursorPosition: -2 },
+		}
+
+		shortcuts['yn'] = {
+			description: () => _('Copy ([Y]ank) the [n]ote to a notebook.'),
+			action: { type: 'prompt', initialText: 'cp $n ""', cursorPosition: -2 },
+		}
+
+		shortcuts['dn'] = {
+			description: () => _('Move the note to a notebook.'),
+			action: { type: 'prompt', initialText: 'mv $n ""', cursorPosition: -2 },
+		}
+
+		return shortcuts;
 	}
 
 	toggleConsole() {
@@ -386,16 +482,8 @@ class AppGui {
 		return this.logger_;
 	}
 
-	keymap() {
-		return this.keymap_;
-	}
-
-	keymapItemByKey(key) {
-		for (let i = 0; i < this.keymap_.length; i++) {
-			const item = this.keymap_[i];
-			if (item.keys.indexOf(key) >= 0) return item;
-		}
-		return null;
+	shortcuts() {
+		return this.shortcuts_;
 	}
 
 	term() {
@@ -426,78 +514,18 @@ class AppGui {
 		}
 	}
 
-	async processFunctionCommand(cmd) {
-
-		if (cmd === 'activate') {
-
-			const w = this.widget('mainWindow').focusedWidget;
-			if (w.name === 'folderList') {
-				this.widget('noteList').focus();
-			} else if (w.name === 'noteList' || w.name === 'noteText') {
-				this.processPromptCommand('edit $n');
-			}
-
-		} else if (cmd === 'delete') {
-
-			if (this.widget('folderList').hasFocus) {
-				const item = this.widget('folderList').selectedJoplinItem;
-
-				if (!item) return;
-
-				if (item.type_ === BaseModel.TYPE_FOLDER) {
-					await this.processPromptCommand('rmbook ' + item.id);
-				} else if (item.type_ === BaseModel.TYPE_TAG) {
-					this.stdout(_('To delete a tag, untag the associated notes.'));
-				} else if (item.type_ === BaseModel.TYPE_SEARCH) {
-					this.store().dispatch({
-						type: 'SEARCH_DELETE',
-						id: item.id,
-					});
-				}
-			} else if (this.widget('noteList').hasFocus) {
-				await this.processPromptCommand('rmnote $n');
-			} else {
-				this.stdout(_('Please select the note or notebook to be deleted first.'));
-			}
-
-		} else if (cmd === 'toggle_console') {
-
-			if (!this.consoleIsShown()) {
-				this.showConsole();
-				this.minimizeConsole();
-			} else {
-				if (this.consoleIsMaximized()) {
-					this.hideConsole();
-				} else {
-					this.maximizeConsole();
-				}
-			}
-
-		} else if (cmd === 'toggle_metadata') {
-
-			this.toggleNoteMetadata();
-
-		} else if (cmd === 'enter_command_line_mode') {
-
-			const cmd = await this.widget('statusBar').prompt();
-			if (!cmd) return;
-			this.addCommandToConsole(cmd);
-			await this.processPromptCommand(cmd);			
-
-		} else {
-
-			throw new Error('Unknown command: ' + cmd);
-
-		}
-	}
-
-	async processPromptCommand(cmd) {
+	async processCommand(cmd) {
 		if (!cmd) return;
 		cmd = cmd.trim();
 		if (!cmd.length) return;
 
 		this.logger().info('Got command: ' + cmd);
 
+		if (cmd === 'q' || cmd === 'wq' || cmd === 'qa') { // Vim bonus
+			await this.app().exit();
+			return;
+		}	
+
 		try {			
 			let note = this.widget('noteList').currentItem;
 			let folder = this.widget('folderList').currentItem;
@@ -520,10 +548,6 @@ class AppGui {
 		}
 
 		this.widget('console').scrollBottom();
-		
-		// Invalidate so that the screen is redrawn in case inputting a command has moved
-		// the GUI up (in particular due to autocompletion), it's moved back to the right position.
-		this.widget('root').invalidate();
 	}
 
 	async updateFolderList() {
@@ -748,34 +772,35 @@ class AppGui {
 				// -------------------------------------------------------------------------
 
 				const shortcutKey = this.currentShortcutKeys_.join('');
-				let keymapItem = this.keymapItemByKey(shortcutKey);
+				let cmd = shortcutKey in this.shortcuts_ ? this.shortcuts_[shortcutKey] : null;
 
 				// If this command is an alias to another command, resolve to the actual command
+				if (cmd && cmd.alias) cmd = this.shortcuts_[cmd.alias];
 
-				let processShortcutKeys = !this.app().currentCommand() && keymapItem;
-				if (keymapItem && keymapItem.canRunAlongOtherCommands) processShortcutKeys = true;
+				let processShortcutKeys = !this.app().currentCommand() && cmd;
+				if (cmd && cmd.canRunAlongOtherCommands) processShortcutKeys = true;
 				if (statusBar.promptActive) processShortcutKeys = false;
+				if (cmd && cmd.isDocOnly) processShortcutKeys = false;
 
 				if (processShortcutKeys) {
-					this.logger().info('Shortcut:', shortcutKey, keymapItem);
+					this.logger().info('Shortcut:', shortcutKey, cmd.description());
 
 					this.currentShortcutKeys_ = [];
-
-					if (keymapItem.type === 'function') {
-						this.processFunctionCommand(keymapItem.command);
-					} else if (keymapItem.type === 'prompt') {
-						let promptOptions = {};
-						if ('cursorPosition' in keymapItem) promptOptions.cursorPosition = keymapItem.cursorPosition;
-						const commandString = await statusBar.prompt(keymapItem.command ? keymapItem.command : '', null, promptOptions);
-						this.addCommandToConsole(commandString);
-						await this.processPromptCommand(commandString);
-					} else if (keymapItem.type === 'exec') {
-						this.stdout(keymapItem.command);
-						await this.processPromptCommand(keymapItem.command);
-					} else if (keymapItem.type === 'tkwidgets') {
-						this.widget('root').handleKey(this.tkWidgetKeys_[keymapItem.command]);
-					} else {
-						throw new Error('Unknown command type: ' + JSON.stringify(keymapItem));
+					if (typeof cmd.action === 'function') {
+						await cmd.action();
+					} else if (typeof cmd.action === 'object') {
+						if (cmd.action.type === 'prompt') {
+							let promptOptions = {};
+							if ('cursorPosition' in cmd.action) promptOptions.cursorPosition = cmd.action.cursorPosition;
+							const commandString = await statusBar.prompt(cmd.action.initialText ? cmd.action.initialText : '', null, promptOptions);
+							this.addCommandToConsole(commandString);
+							await this.processCommand(commandString);
+						} else {
+							throw new Error('Unknown command: ' + JSON.stringify(cmd.action));
+						}
+					} else { // String
+						this.stdout(cmd.action);
+						await this.processCommand(cmd.action);
 					}
 				}
 
@@ -801,4 +826,4 @@ class AppGui {
 AppGui.INPUT_MODE_NORMAL = 1;
 AppGui.INPUT_MODE_META = 2;
 
-module.exports = AppGui;
+module.exports = AppGui;

CliClient/app/app.js

@@ -5,12 +5,12 @@ const { JoplinDatabase } = require('lib/joplin-database.js');
 const { Database } = require('lib/database.js');
 const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
-const Setting = require('lib/models/Setting.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { Setting } = require('lib/models/setting.js');
 const { Logger } = require('lib/logger.js');
 const { sprintf } = require('sprintf-js');
 const { reg } = require('lib/registry.js');
@@ -21,7 +21,6 @@ const os = require('os');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');
 const EventEmitter = require('events');
-const Cache = require('lib/Cache');
 
 class Application extends BaseApplication {
 
@@ -35,7 +34,6 @@ class Application extends BaseApplication {
 		this.allCommandsLoaded_ = false;
 		this.showStackTraces_ = false;
 		this.gui_ = null;
-		this.cache_ = new Cache();
 	}
 
 	gui() {
@@ -146,15 +144,13 @@ class Application extends BaseApplication {
 				message += ' (' + options.answers.join('/') + ')';
 			}
 
-			let answer = await this.gui().prompt('', message + ' ', options);
+			let answer = await this.gui().prompt('', message + ' ');
 
 			if (options.type === 'boolean') {
 				if (answer === null) return false; // Pressed ESCAPE
 				if (!answer) answer = options.answers[0];
 				let positiveIndex = options.booleanAnswerDefault == 'y' ? 0 : 1;
 				return answer.toLowerCase() === options.answers[positiveIndex].toLowerCase();
-			} else {
-				return answer;
 			}
 		});
 
@@ -181,33 +177,22 @@ class Application extends BaseApplication {
 		await doExit();
 	}
 
-	commands(uiType = null) {
-		if (!this.allCommandsLoaded_) {
-			fs.readdirSync(__dirname).forEach((path) => {
-				if (path.indexOf('command-') !== 0) return;
-				const ext = fileExtension(path)
-				if (ext != 'js') return;
+	commands() {
+		if (this.allCommandsLoaded_) return this.commands_;
 
-				let CommandClass = require('./' + path);
-				let cmd = new CommandClass();
-				if (!cmd.enabled()) return;
-				cmd = this.setupCommand(cmd);
-				this.commands_[cmd.name()] = cmd;
-			});
+		fs.readdirSync(__dirname).forEach((path) => {
+			if (path.indexOf('command-') !== 0) return;
+			const ext = fileExtension(path)
+			if (ext != 'js') return;
 
-			this.allCommandsLoaded_ = true;
-		}
+			let CommandClass = require('./' + path);
+			let cmd = new CommandClass();
+			if (!cmd.enabled()) return;
+			cmd = this.setupCommand(cmd);
+			this.commands_[cmd.name()] = cmd;
+		});
 
-		if (uiType !== null) {
-			let temp = [];
-			for (let n in this.commands_) {
-				if (!this.commands_.hasOwnProperty(n)) continue;
-				const c = this.commands_[n];
-				if (!c.supportsUi(uiType)) continue;
-				temp[n] = c;
-			}
-			return temp;
-		}
+		this.allCommandsLoaded_ = true;
 
 		return this.commands_;
 	}
@@ -225,8 +210,12 @@ class Application extends BaseApplication {
 	async commandMetadata() {
 		if (this.commandMetadata_) return this.commandMetadata_;
 
-		let output = await this.cache_.getItem('metadata');
-		if (output) {
+		const osTmpdir = require('os-tmpdir');
+		const storage = require('node-persist');
+		await storage.init({ dir: osTmpdir() + '/commandMetadata', ttl: 1000 * 60 * 60 * 24 });
+
+		let output = await storage.getItem('metadata');
+		if (Setting.value('env') != 'dev' && output) {
 			this.commandMetadata_ = output;
 			return Object.assign({}, this.commandMetadata_);
 		}
@@ -240,7 +229,7 @@ class Application extends BaseApplication {
 			output[n] = cmd.metadata();
 		}
 
-		await this.cache_.setItem('metadata', output, 1000 * 60 * 60 * 24);
+		await storage.setItem('metadata', output);
 
 		this.commandMetadata_ = output;
 		return Object.assign({}, this.commandMetadata_);
@@ -257,13 +246,9 @@ class Application extends BaseApplication {
 		try {
 			CommandClass = require(__dirname + '/command-' + name + '.js');
 		} catch (error) {
-			if (error.message && error.message.indexOf('Cannot find module') >= 0) {
-				let e = new Error(_('No such command: %s', name));
-				e.type = 'notFound';
-				throw e;
-			} else {
-				throw error;
-			}
+			let e = new Error('No such command: ' + name);
+			e.type = 'notFound';
+			throw e;
 		}
 
 		let cmd = new CommandClass();
@@ -275,7 +260,7 @@ class Application extends BaseApplication {
 	dummyGui() {
 		return {
 			isDummy: () => { return true; },
-			prompt: (initialText = '', promptString = '', options = null) => { return cliUtils.prompt(initialText, promptString, options); },
+			prompt: (initialText = '', promptString = '') => { return cliUtils.prompt(initialText, promptString); },
 			showConsole: () => {},
 			maximizeConsole: () => {},
 			stdout: (text) => { console.info(text); },
@@ -283,10 +268,7 @@ class Application extends BaseApplication {
 			exit: () => {},
 			showModalOverlay: (text) => {},
 			hideModalOverlay: () => {},
-			stdoutMaxWidth: () => { return 100; },
-			forceRender: () => {},
-			termSaveState: () => {},
-			termRestoreState: (state) => {},
+			stdoutMaxWidth: () => { return 78; }
 		};
 	}
 
@@ -312,63 +294,6 @@ class Application extends BaseApplication {
 		return this.activeCommand_;
 	}
 
-	async loadKeymaps() {
-		const defaultKeyMap = [
-			{ "keys": [":"], "type": "function", "command": "enter_command_line_mode" },
-			{ "keys": ["TAB"], "type": "function", "command": "focus_next" },
-			{ "keys": ["SHIFT_TAB"], "type": "function", "command": "focus_previous" },
-			{ "keys": ["UP"], "type": "function", "command": "move_up" },
-			{ "keys": ["DOWN"], "type": "function", "command": "move_down" },
-			{ "keys": ["PAGE_UP"], "type": "function", "command": "page_up" },
-			{ "keys": ["PAGE_DOWN"], "type": "function", "command": "page_down" },
-			{ "keys": ["ENTER"], "type": "function", "command": "activate" },
-			{ "keys": ["DELETE", "BACKSPACE"], "type": "function", "command": "delete" },
-			{ "keys": [" "], "command": "todo toggle $n" },
-			{ "keys": ["tc"], "type": "function", "command": "toggle_console" },
-			{ "keys": ["tm"], "type": "function", "command": "toggle_metadata" },
-			{ "keys": ["/"], "type": "prompt", "command": "search \"\"", "cursorPosition": -2 },
-			{ "keys": ["mn"], "type": "prompt", "command": "mknote \"\"", "cursorPosition": -2 },
-			{ "keys": ["mt"], "type": "prompt", "command": "mktodo \"\"", "cursorPosition": -2 },
-			{ "keys": ["mb"], "type": "prompt", "command": "mkbook \"\"", "cursorPosition": -2 },
-			{ "keys": ["yn"], "type": "prompt", "command": "cp $n \"\"", "cursorPosition": -2 },
-			{ "keys": ["dn"], "type": "prompt", "command": "mv $n \"\"", "cursorPosition": -2 }
-		];
-
-		// Filter the keymap item by command so that items in keymap.json can override
-		// the default ones.
-		const itemsByCommand = {};
-
-		for (let i = 0; i < defaultKeyMap.length; i++) {
-			itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i]
-		}
-
-		const filePath = Setting.value('profileDir') + '/keymap.json';
-		if (await fs.pathExists(filePath)) {
-			try {
-				let configString = await fs.readFile(filePath, 'utf-8');
-				configString = configString.replace(/^\s*\/\/.*/, ''); // Strip off comments
-				const keymap = JSON.parse(configString);
-				for (let keymapIndex = 0; keymapIndex < keymap.length; keymapIndex++) {
-					const item = keymap[keymapIndex];
-					itemsByCommand[item.command] = item;
-				}
-			} catch (error) {
-				let msg = error.message ? error.message : '';
-				msg = 'Could not load keymap ' + filePath + '\n' + msg;
-				error.message = msg;
-				throw error;
-			}
-		}
-
-		const output = [];
-		for (let n in itemsByCommand) {
-			if (!itemsByCommand.hasOwnProperty(n)) continue;
-			output.push(itemsByCommand[n]);
-		}
-
-		return output;
-	}
-
 	async start(argv) {
 		argv = await super.start(argv);
 
@@ -381,25 +306,20 @@ class Application extends BaseApplication {
 		if (argv.length) {
 			this.gui_ = this.dummyGui();
 
-			this.currentFolder_ = await Folder.load(Setting.value('activeFolderId'));
-
 			try {
 				await this.execCommand(argv);
 			} catch (error) {
 				if (this.showStackTraces_) {
-					console.error(error);
+					console.info(error);
 				} else {
 					console.info(error.message);
 				}
-				process.exit(1);
 			}
 		} else { // Otherwise open the GUI
 			this.initRedux();
 
-			const keymap = await this.loadKeymaps();
-
 			const AppGui = require('./app-gui.js');
-			this.gui_ = new AppGui(this, this.store(), keymap);
+			this.gui_ = new AppGui(this, this.store());
 			this.gui_.setLogger(this.logger_);
 			await this.gui_.start();
 
@@ -414,7 +334,7 @@ class Application extends BaseApplication {
 
 			this.dispatch({
 				type: 'TAG_UPDATE_ALL',
-				items: tags,
+				tags: tags,
 			});
 
 			this.store().dispatch({

CliClient/app/autocompletion.js

@@ -1,199 +0,0 @@
-var { app } = require('./app.js');
-var Note = require('lib/models/Note.js');
-var Folder = require('lib/models/Folder.js');
-var Tag = require('lib/models/Tag.js');
-var { cliUtils } = require('./cli-utils.js');
-var yargParser = require('yargs-parser');
-var fs = require('fs-extra');
-
-async function handleAutocompletionPromise(line) {
-	// Auto-complete the command name
-	const names = await app().commandNames();
-	let words = getArguments(line);
-	//If there is only one word and it is not already a command name then you
-	//should look for commmands it could be
-	if (words.length == 1) {
-		if (names.indexOf(words[0]) === -1) {
-			let x = names.filter((n) => n.indexOf(words[0]) === 0);
-			if (x.length === 1) {
-				return x[0] + ' ';
-			}
-			return x.length > 0 ? x.map((a) => a + ' ') : line;
-		} else {
-			return line;
-		}
-	}
-	//There is more than one word and it is a command
-	const metadata = (await app().commandMetadata())[words[0]];
-	//If for some reason this command does not have any associated metadata
-	//just don't autocomplete. However, this should not happen.
-	if (metadata === undefined) {
-		return line;
-	}
-	//complete an option
-	let next = words.length > 1 ? words[words.length - 1] : '';
-	let l = [];
-	if (next[0] === '-') {
-		for (let i = 0; i<metadata.options.length; i++) {
-			const options = metadata.options[i][0].split(' ');
-		//if there are multiple options then they will be seperated by comma and
-			//space. The comma should be removed
-			if (options[0][options[0].length - 1] === ',') {
-				options[0] = options[0].slice(0, -1);
-			}
-			if (words.includes(options[0]) || words.includes(options[1])) {
-				continue;
-			}
-			//First two elements are the flag and the third is the description
-			//Only autocomplete long
-			if (options.length > 1 && options[1].indexOf(next) === 0) {
-				l.push(options[1]);
-			} else if (options[0].indexOf(next) === 0) {
-				l.push(options[0]);
-			}
-		}
-		if (l.length === 0) {
-			return line;
-		}
-		let ret = l.map(a=>toCommandLine(a));
-		ret.prefix = toCommandLine(words.slice(0, -1)) + ' ';
-		return ret;
-	}
-	//Complete an argument
-	//Determine the number of positional arguments by counting the number of
-	//words that don't start with a - less one for the command name
-	const positionalArgs = words.filter((a)=>a.indexOf('-') !== 0).length - 1;
-
-	let cmdUsage = yargParser(metadata.usage)['_'];
-	cmdUsage.splice(0, 1);
-
-	if (cmdUsage.length >= positionalArgs) {
-
-		let argName = cmdUsage[positionalArgs - 1];
-		argName = cliUtils.parseCommandArg(argName).name;
-
-		const currentFolder = app().currentFolder();
-
-		if (argName == 'note' || argName == 'note-pattern') {
-			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: next + '*' }) : [];
-			l.push(...notes.map((n) => n.title));
-		}
-
-		if (argName == 'notebook') {
-			const folders = await Folder.search({ titlePattern: next + '*' });
-			l.push(...folders.map((n) => n.title));
-		}
-
-		if (argName == 'item') {
-			const notes = currentFolder ? await Note.previews(currentFolder.id, { titlePattern: next + '*' }) : [];
-			const folders = await Folder.search({ titlePattern: next + '*' });
-			l.push(...notes.map((n) => n.title), folders.map((n) => n.title));
-		}
-
-		if (argName == 'tag') {
-			let tags = await Tag.search({ titlePattern: next + '*' });
-			l.push(...tags.map((n) => n.title));
-		}
-
-		if (argName == 'file') {
-			let files = await fs.readdir('.');
-			l.push(...files);
-		}
-
-		if (argName == 'tag-command') {
-			let c = filterList(['add', 'remove', 'list'], next);
-			l.push(...c);
-		}
-
-		if (argName == 'todo-command') {
-			let c = filterList(['toggle', 'clear'], next);
-			l.push(...c);
-		}
-	}
-	if (l.length === 1) {
-		return toCommandLine([...words.slice(0, -1), l[0]]);
-	} else if (l.length > 1) {
-		let ret = l.map(a=>toCommandLine(a));
-		ret.prefix = toCommandLine(words.slice(0, -1)) + ' ';
-		return ret;
-	}
-	return line;
-
-}
-function handleAutocompletion(str, callback) {
-	handleAutocompletionPromise(str).then(function(res) {
-		callback(undefined, res);
-	});
-}
-function toCommandLine(args) {
-	if (Array.isArray(args)) {
-		return args.map(function(a) {
-			if(a.indexOf('"') !== -1 || a.indexOf(' ') !== -1) {
-				return "'" + a + "'";
-			} else if (a.indexOf("'") !== -1) {
-				return '"' + a + '"';
-			} else {
-				return a;
-			}
-		}).join(' ');
-	} else {
-		if(args.indexOf('"') !== -1 || args.indexOf(' ') !== -1) {
-			return "'" + args + "' ";
-		} else if (args.indexOf("'") !== -1) {
-			return '"' + args + '" ';
-		} else {
-			return args + ' ';
-		}
-	}
-}
-function getArguments(line) {
-	let inSingleQuotes = false;
-	let inDoubleQuotes = false;
-	let currentWord = '';
-	let parsed = [];
-	for(let i = 0; i<line.length; i++) {
-		if(line[i] === '"') {
-			if(inDoubleQuotes) {
-				inDoubleQuotes = false;
-				//maybe push word to parsed?
-				//currentWord += '"';
-			} else {
-				inDoubleQuotes = true;
-				//currentWord += '"';
-			}
-		} else if(line[i] === "'") {
-			if(inSingleQuotes) {
-				inSingleQuotes = false;
-				//maybe push word to parsed?
-				//currentWord += "'";
-			} else {
-				inSingleQuotes = true;
-				//currentWord += "'";
-			}
-		} else if (/\s/.test(line[i]) &&
-			!(inDoubleQuotes || inSingleQuotes)) {
-			if (currentWord !== '') {
-				parsed.push(currentWord);
-				currentWord = '';
-			}
-		} else {
-			currentWord += line[i];
-		}
-	}
-	if (!(inSingleQuotes || inDoubleQuotes) && /\s/.test(line[line.length - 1])) {
-		parsed.push('');
-	} else {
-		parsed.push(currentWord);
-	}
-	return parsed;
-}
-function filterList(list, next) {
-	let output = [];
-	for (let i = 0; i < list.length; i++) {
-		if (list[i].indexOf(next) !== 0) continue;
-		output.push(list[i]);
-	}
-	return output;
-}
-
-module.exports = { handleAutocompletion };

CliClient/app/base-command.js

@@ -12,10 +12,6 @@ class BaseCommand {
 		throw new Error('Usage not defined');
 	}
 
-	encryptionCheck(item) {
-		if (item && item.encryption_applied) throw new Error(_('Cannot change encrypted item'));
-	}
-
 	description() {
 		throw new Error('Description not defined');
 	}
@@ -32,6 +28,10 @@ class BaseCommand {
 		return this.compatibleUis().indexOf(ui) >= 0;
 	}
 
+	aliases() {
+		return [];
+	}
+
 	options() {
 		return [];
 	}

CliClient/app/cli-integration-tests.js

@@ -5,10 +5,10 @@ const { Logger } = require('lib/logger.js');
 const { dirname } = require('lib/path-utils.js');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
 const { JoplinDatabase } = require('lib/joplin-database.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Setting = require('lib/models/Setting.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
 const { sprintf } = require('sprintf-js');
 const exec = require('child_process').exec
 

CliClient/app/cli-utils.js

@@ -178,39 +178,38 @@ cliUtils.promptConfirm = function(message, answers = null) {
 	});
 }
 
-// Note: initialText is there to have the same signature as statusBar.prompt() so that
-// it can be a drop-in replacement, however initialText is not used (and cannot be
-// with readline.question?).
-cliUtils.prompt = function(initialText = '', promptString = ':', options = null) {
-	if (!options) options = {};
-
+cliUtils.promptInput = function(message) {
 	const readline = require('readline');
-	const Writable = require('stream').Writable;
-
-	const mutableStdout = new Writable({
-		write: function(chunk, encoding, callback) {
-			if (!this.muted)
-			process.stdout.write(chunk, encoding);
-			callback();
-		}
-	});
 
 	const rl = readline.createInterface({
 		input: process.stdin,
-		output: mutableStdout,
-		terminal: true,
+		output: process.stdout
 	});
 
 	return new Promise((resolve, reject) => {
-		mutableStdout.muted = false;
-
-		rl.question(promptString, (answer) => {
+		rl.question(message + ' ', (answer) => {
 			rl.close();
-			if (!!options.secure) this.stdout_('');
 			resolve(answer);
 		});
+	});
+}
 
-		mutableStdout.muted = !!options.secure;
+// Note: initialText is there to have the same signature as statusBar.prompt() so that
+// it can be a drop-in replacement, however initialText is not used (and cannot be
+// with readline.question?).
+cliUtils.prompt = function(initialText = '', promptString = ':') {
+	const readline = require('readline');
+
+	const rl = readline.createInterface({
+		input: process.stdin,
+		output: process.stdout
+	});
+
+	return new Promise((resolve, reject) => {
+		rl.question(promptString, (answer) => {
+			rl.close();
+			resolve(answer);
+		});
 	});
 }
 

CliClient/app/command-attach.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
+const { BaseModel } = require('lib/base-model.js');
 const { shim } = require('lib/shim.js');
 const fs = require('fs-extra');
 
@@ -19,7 +19,6 @@ class Command extends BaseCommand {
 		let title = args['note'];
 
 		let note = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
-		this.encryptionCheck(note);
 		if (!note) throw new Error(_('Cannot find "%s".', title));
 
 		const localFilePath = args['file'];

CliClient/app/command-cat.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 
@@ -21,6 +21,10 @@ class Command extends BaseCommand {
 		];
 	}
 
+	enabled() {
+		return false;
+	}
+
 	async action(args) {
 		let title = args['note'];
 
@@ -29,9 +33,6 @@ class Command extends BaseCommand {
 
 		const content = args.options.verbose ? await Note.serialize(item) : await Note.serializeForEdit(item);
 		this.stdout(content);
-
-		app().gui().showConsole();
-		app().gui().maximizeConsole();
 	}
 
 }

CliClient/app/command-config.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { _, setLocale } = require('lib/locale.js');
 const { app } = require('./app.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 
 class Command extends BaseCommand {
 
@@ -23,11 +23,7 @@ class Command extends BaseCommand {
 		const verbose = args.options.verbose;
 
 		const renderKeyValue = (name) => {
-			const md = Setting.settingMetadata(name);
-			let value = Setting.value(name);
-			if (typeof value === 'object' || Array.isArray(value)) value = JSON.stringify(value);
-			if (md.secure) value = '********';
-
+			const value = Setting.value(name);
 			if (Setting.isEnum(name)) {
 				return _('%s = %s (%s)', name, value, Setting.enumOptionsDoc(name));
 			} else {

CliClient/app/command-cp.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-done.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
@@ -16,9 +16,8 @@ class Command extends BaseCommand {
 		return _('Marks a to-do as done.');
 	}
 
-	static async handleAction(commandInstance, args, isCompleted) {
+	static async handleAction(args, isCompleted) {
 		const note = await app().loadItem(BaseModel.TYPE_NOTE, args.note);
-		commandInstance.encryptionCheck(note);
 		if (!note) throw new Error(_('Cannot find "%s".', args.note));
 		if (!note.is_todo) throw new Error(_('Note is not a to-do: "%s"', args.note));
 
@@ -33,7 +32,7 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		await Command.handleAction(this, args, true);
+		await Command.handleAction(args, true);
 	}
 
 }

CliClient/app/command-dump.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-e2ee.js

@@ -1,184 +0,0 @@
-const { BaseCommand } = require('./base-command.js');
-const { _ } = require('lib/locale.js');
-const { cliUtils } = require('./cli-utils.js');
-const EncryptionService = require('lib/services/EncryptionService');
-const DecryptionWorker = require('lib/services/DecryptionWorker');
-const MasterKey = require('lib/models/MasterKey');
-const BaseItem = require('lib/models/BaseItem');
-const Setting = require('lib/models/Setting.js');
-
-class Command extends BaseCommand {
-
-	usage() {
-		return 'e2ee <command> [path]';
-	}
-
-	description() {
-		return _('Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status` and `target-status`.');
-	}
-
-	options() {
-		return [
-			// This is here mostly for testing - shouldn't be used
-			['-p, --password <password>', 'Use this password as master password (For security reasons, it is not recommended to use this option).'],
-			['-v, --verbose', 'More verbose output for the `target-status` command'],
-		];
-	}
-
-	async action(args) {
-		// change-password
-
-		const options = args.options;
-
-		if (args.command === 'enable') {
-			const password = options.password ? options.password.toString() : await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
-			if (!password) {
-				this.stdout(_('Operation cancelled'));
-				return;
-			}
-
-			await EncryptionService.instance().generateMasterKeyAndEnableEncryption(password);
-			return;
-		}
-
-		if (args.command === 'disable') {
-			await EncryptionService.instance().disableEncryption();
-			return;
-		}
-
-		if (args.command === 'decrypt') {
-			this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
-
-			while (true) {
-				try {
-					await DecryptionWorker.instance().start();
-					break;
-				} catch (error) {
-					if (error.code === 'masterKeyNotLoaded') {
-						const masterKeyId = error.masterKeyId;
-						const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
-						if (!password) {
-							this.stdout(_('Operation cancelled'));
-							return;
-						}
-						Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
-						await EncryptionService.instance().loadMasterKeysFromSettings();
-						continue;
-					}
-
-					throw error;
-				}
-			}
-
-			this.stdout(_('Completed decryption.'));
-
-			return;
-		}
-
-		if (args.command === 'status') {
-			this.stdout(_('Encryption is: %s', Setting.value('encryption.enabled') ? _('Enabled') : _('Disabled')));
-			return;
-		}
-
-		if (args.command === 'target-status') {
-			const fs = require('fs-extra');
-			const pathUtils = require('lib/path-utils.js');
-			const fsDriver = new (require('lib/fs-driver-node.js').FsDriverNode)();
-
-			const targetPath = args.path;
-			if (!targetPath) throw new Error('Please specify the sync target path.');
-
-			const dirPaths = function(targetPath) {
-				let paths = [];
-				fs.readdirSync(targetPath).forEach((path) => {
-					paths.push(path);
-				});
-				return paths;
-			}
-
-			let itemCount = 0;
-			let resourceCount = 0;
-			let encryptedItemCount = 0;
-			let encryptedResourceCount = 0;
-			let otherItemCount = 0;
-
-			let encryptedPaths = [];
-			let decryptedPaths = [];
-
-			let paths = dirPaths(targetPath);
-
-			for (let i = 0; i < paths.length; i++) {
-				const path = paths[i];
-				const fullPath = targetPath + '/' + path;
-				const stat = await fs.stat(fullPath);
-
-				// this.stdout(fullPath);
-
-				if (path === '.resource') {
-					let resourcePaths = dirPaths(fullPath);
-					for (let j = 0; j < resourcePaths.length; j++) {
-						const resourcePath = resourcePaths[j];
-						resourceCount++;
-						const fullResourcePath = fullPath + '/' + resourcePath;
-						const isEncrypted = await EncryptionService.instance().fileIsEncrypted(fullResourcePath);
-						if (isEncrypted) {
-							encryptedResourceCount++;
-							encryptedPaths.push(fullResourcePath);
-						} else {
-							decryptedPaths.push(fullResourcePath);
-						}
-					}
-				} else if (stat.isDirectory()) {
-					continue;
-				} else {
-					const content = await fs.readFile(fullPath, 'utf8');
-					const item = await BaseItem.unserialize(content);
-					const ItemClass = BaseItem.itemClass(item);
-
-					if (!ItemClass.encryptionSupported()) {
-						otherItemCount++;
-						continue;
-					}
-
-					itemCount++;
-
-					const isEncrypted = await EncryptionService.instance().itemIsEncrypted(item);
-
-					if (isEncrypted) {
-						encryptedItemCount++;
-						encryptedPaths.push(fullPath);
-					} else {
-						decryptedPaths.push(fullPath);
-					}
-				}
-			}
-
-			this.stdout('Encrypted items: ' + encryptedItemCount + '/' + itemCount);
-			this.stdout('Encrypted resources: ' + encryptedResourceCount + '/' + resourceCount);
-			this.stdout('Other items (never encrypted): ' + otherItemCount);
-
-			if (options.verbose) {
-				this.stdout('');
-				this.stdout('# Encrypted paths');
-				this.stdout('');
-				for (let i = 0; i < encryptedPaths.length; i++) {
-					const path = encryptedPaths[i];
-					this.stdout(path);
-				}
-
-				this.stdout('');
-				this.stdout('# Decrypted paths');
-				this.stdout('');
-				for (let i = 0; i < decryptedPaths.length; i++) {
-					const path = decryptedPaths[i];
-					this.stdout(path);
-				}
-			}
-
-			return;
-		}
-	}
-
-}
-
-module.exports = Command;

CliClient/app/command-edit.js

@@ -3,10 +3,10 @@ const { BaseCommand } = require('./base-command.js');
 const { uuid } = require('lib/uuid.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Setting = require('lib/models/Setting.js');
-const BaseModel = require('lib/BaseModel.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseModel } = require('lib/base-model.js');
 const { cliUtils } = require('./cli-utils.js');
 const { time } = require('lib/time-utils.js');
 
@@ -44,8 +44,6 @@ class Command extends BaseCommand {
 			if (!app().currentFolder()) throw new Error(_('No active notebook.'));
 			let note = await app().loadItem(BaseModel.TYPE_NOTE, title);
 
-			this.encryptionCheck(note);
-
 			if (!note) {
 				const ok = await this.prompt(_('Note does not exist: "%s". Create it?', title));
 				if (!ok) return;
@@ -78,14 +76,12 @@ class Command extends BaseCommand {
 
 			app().gui().showModalOverlay(_('Starting to edit note. Close the editor to get back to the prompt.'));
 			await app().gui().forceRender();
-			const termState = app().gui().termSaveState();
+			const termState = app().gui().term().saveState();
 
 			const spawnSync	= require('child_process').spawnSync;
-			const result = spawnSync(editorPath, editorArgs, { stdio: 'inherit' });
+			spawnSync(editorPath, editorArgs, { stdio: 'inherit' });
 
-			if (result.error) this.stdout(_('Error opening note in editor: %s', result.error.message));
-
-			app().gui().termRestoreState(termState);
+			app().gui().term().restoreState(termState);
 			app().gui().hideModalOverlay();
 			app().gui().forceRender();
 

CliClient/app/command-exit.js

@@ -12,10 +12,6 @@ class Command extends BaseCommand {
 		return _('Exits the application.');
 	}
 
-	compatibleUis() {
-		return ['gui'];
-	}
-
 	async action(args) {
 		await app().exit();
 	}

CliClient/app/command-export-sync-status.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { Database } = require('lib/database.js');
 const { app } = require('./app.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { _ } = require('lib/locale.js');
 const { ReportService } = require('lib/services/report.js');
 const fs = require('fs-extra');

CliClient/app/command-export.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
-const InteropService = require('lib/services/InteropService.js');
-const BaseModel = require('lib/BaseModel.js');
-const Note = require('lib/models/Note.js');
+const { Exporter } = require('lib/services/exporter.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Note } = require('lib/models/note.js');
 const { reg } = require('lib/registry.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
@@ -10,21 +10,15 @@ const fs = require('fs-extra');
 class Command extends BaseCommand {
 
 	usage() {
-		return 'export <path>';
+		return 'export <directory>';
 	}
 
 	description() {
-		return _('Exports Joplin data to the given path. By default, it will export the complete database including notebooks, notes, tags and resources.');
+		return _('Exports Joplin data to the given directory. By default, it will export the complete database including notebooks, notes, tags and resources.');
 	}
 
 	options() {
-		const service = new InteropService();
-		const formats = service.modules()
-			.filter(m => m.type === 'exporter')
-			.map(m => m.format + (m.description ? ' (' + m.description + ')' : ''));
-
 		return [
-			['--format <format>', _('Destination format: %s', formats.join(', '))],
 			['--note <note>', _('Exports only the given note.')],
 			['--notebook <notebook>', _('Exports only the given notebook.')],
 		];
@@ -32,9 +26,13 @@ class Command extends BaseCommand {
 	
 	async action(args) {
 		let exportOptions = {};
-		exportOptions.path = args.path;
-
-		exportOptions.format = args.options.format ? args.options.format : 'jex';
+		exportOptions.destDir = args.directory;
+		exportOptions.writeFile = (filePath, data) => {
+			return fs.writeFile(filePath, data);
+		};
+		exportOptions.copyFile = (source, dest) => {
+			return fs.copy(source, dest, { overwrite: true });
+		};
 
 		if (args.options.note) {
 
@@ -50,10 +48,10 @@ class Command extends BaseCommand {
 
 		}
 
-		const service = new InteropService();
-		const result = await service.export(exportOptions);
+		const exporter = new Exporter();
+		const result = await exporter.export(exportOptions);
 
-		result.warnings.map((w) => this.stdout(w));
+		reg.logger().info('Export result: ', result);
 	}
 
 }

CliClient/app/command-geoloc.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-help.js

@@ -2,7 +2,7 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { renderCommandHelp } = require('./help-utils.js');
 const { Database } = require('lib/database.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { wrap } = require('lib/string-utils.js');
 const { _ } = require('lib/locale.js');
 const { cliUtils } = require('./cli-utils.js');
@@ -18,7 +18,7 @@ class Command extends BaseCommand {
 	}
 
 	allCommands() {
-		const commands = app().commands(app().uiType());
+		const commands = app().commands();
 		let output = [];
 		for (let n in commands) {
 			if (!commands.hasOwnProperty(n)) continue;
@@ -36,22 +36,21 @@ class Command extends BaseCommand {
 	async action(args) {
 		const stdoutWidth = app().commandStdoutMaxWidth();
 
-		if (args.command === 'shortcuts' || args.command === 'keymap') {
-			this.stdout(_('For information on how to customise the shortcuts please visit %s', 'http://joplin.cozic.net/terminal/#shortcuts'));
-			this.stdout('');
-
+		if (args.command === 'shortcuts') {
 			if (app().gui().isDummy()) {
 				throw new Error(_('Shortcuts are not available in CLI mode.'));
 			}
 
-			const keymap = app().gui().keymap();
+			const shortcuts = app().gui().shortcuts();
 
 			let rows = [];
 
-			for (let i = 0; i < keymap.length; i++) {
-				const item = keymap[i];
-				const keys = item.keys.map((k) => k === ' ' ? '(SPACE)' : k);
-				rows.push([keys.join(', '), item.command]);
+			for (let n in shortcuts) {
+				if (!shortcuts.hasOwnProperty(n)) continue;
+				const shortcut = shortcuts[n];
+				if (!shortcut.description) continue;
+				n = shortcut.friendlyName ? shortcut.friendlyName : n;
+				rows.push([n, shortcut.description()]);
 			}
 
 			cliUtils.printArray(this.stdout.bind(this), rows);
@@ -66,7 +65,7 @@ class Command extends BaseCommand {
 		} else {
 			const commandNames = this.allCommands().map((a) => a.name());
 
-			this.stdout(_('Type `help [command]` for more information about a command; or type `help all` for the complete usage information.'));
+			this.stdout(_('Type `help [command]` for more information about a command.'));
 			this.stdout('');
 			this.stdout(_('The possible commands are:'));
 			this.stdout('');
@@ -79,7 +78,7 @@ class Command extends BaseCommand {
 			this.stdout(_('To maximise/minimise the console, press "TC".'));
 			this.stdout(_('To enter command line mode, press ":"'));
 			this.stdout(_('To exit command line mode, press ESCAPE'));
-			this.stdout(_('For the list of keyboard shortcuts and config options, type `help keymap`'));
+			this.stdout(_('For the complete list of available keyboard shortcuts, type `help shortcuts`'));
 		}
 
 		app().gui().showConsole();

CliClient/app/command-import-enex.js

@@ -0,0 +1,68 @@
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { Folder } = require('lib/models/folder.js');
+const { importEnex } = require('lib/import-enex');
+const { filename, basename } = require('lib/path-utils.js');
+const { cliUtils } = require('./cli-utils.js');
+
+class Command extends BaseCommand {
+
+	usage() {
+		return 'import-enex <file> [notebook]';
+	}
+
+	description() {
+		return _('Imports an Evernote notebook file (.enex file).');
+	}
+
+	options() {
+		return [
+			['-f, --force', _('Do not ask for confirmation.')],
+		];
+	}
+
+	async action(args) {
+		let filePath = args.file;
+		let folder = null;
+		let folderTitle = args['notebook'];
+		let force = args.options.force === true;
+
+		if (!folderTitle) folderTitle = filename(filePath);
+		folder = await Folder.loadByField('title', folderTitle);
+		const msg = folder ? _('File "%s" will be imported into existing notebook "%s". Continue?', basename(filePath), folderTitle) : _('New notebook "%s" will be created and file "%s" will be imported into it. Continue?', folderTitle, basename(filePath));
+		const ok = force ? true : await this.prompt(msg);
+		if (!ok) return;
+
+		let lastProgress = '';
+
+		let options = {
+			onProgress: (progressState) => {
+				let line = [];
+				line.push(_('Found: %d.', progressState.loaded));
+				line.push(_('Created: %d.', progressState.created));
+				if (progressState.updated) line.push(_('Updated: %d.', progressState.updated));
+				if (progressState.skipped) line.push(_('Skipped: %d.', progressState.skipped));
+				if (progressState.resourcesCreated) line.push(_('Resources: %d.', progressState.resourcesCreated));
+				if (progressState.notesTagged) line.push(_('Tagged: %d.', progressState.notesTagged));
+				lastProgress = line.join(' ');
+				cliUtils.redraw(lastProgress);
+			},
+			onError: (error) => {
+				let s = error.trace ? error.trace : error.toString();
+				this.stdout(s);
+			},
+		}
+
+		folder = !folder ? await Folder.save({ title: folderTitle }) : folder;
+		
+		app().gui().showConsole();
+		this.stdout(_('Importing notes...'));
+		await importEnex(folder.id, filePath, options);
+		cliUtils.redrawDone();
+		this.stdout(_('The notes have been imported: %s', lastProgress));
+	}
+
+}
+
+module.exports = Command;

CliClient/app/command-import.js

@@ -1,75 +0,0 @@
-const { BaseCommand } = require('./base-command.js');
-const InteropService = require('lib/services/InteropService.js');
-const BaseModel = require('lib/BaseModel.js');
-const Note = require('lib/models/Note.js');
-const { filename, basename, fileExtension } = require('lib/path-utils.js');
-const { importEnex } = require('lib/import-enex');
-const { cliUtils } = require('./cli-utils.js');
-const { reg } = require('lib/registry.js');
-const { app } = require('./app.js');
-const { _ } = require('lib/locale.js');
-const fs = require('fs-extra');
-
-class Command extends BaseCommand {
-	
-	usage() {
-		return 'import <path> [notebook]';
-	}
-
-	description() {
-		return _('Imports data into Joplin.');
-	}
-
-	options() {
-		const service = new InteropService();
-		const formats = service.modules().filter(m => m.type === 'importer').map(m => m.format);
-
-		return [
-			['--format <format>', _('Source format: %s', (['auto'].concat(formats)).join(', '))],
-			['-f, --force', _('Do not ask for confirmation.')],
-		];
-	}
-	
-	async action(args) {
-		let folder = await app().loadItem(BaseModel.TYPE_FOLDER, args.notebook);
-
-		if (args.notebook && !folder) throw new Error(_('Cannot find "%s".', args.notebook));
-
-		const importOptions = {};
-		importOptions.path = args.path;
-		importOptions.format = args.options.format ? args.options.format : 'auto';
-		importOptions.destinationFolderId = folder ? folder.id : null;
-
-		let lastProgress = '';
-
-		// onProgress/onError supported by Enex import only
-
-		importOptions.onProgress = (progressState) => {
-			let line = [];
-			line.push(_('Found: %d.', progressState.loaded));
-			line.push(_('Created: %d.', progressState.created));
-			if (progressState.updated) line.push(_('Updated: %d.', progressState.updated));
-			if (progressState.skipped) line.push(_('Skipped: %d.', progressState.skipped));
-			if (progressState.resourcesCreated) line.push(_('Resources: %d.', progressState.resourcesCreated));
-			if (progressState.notesTagged) line.push(_('Tagged: %d.', progressState.notesTagged));
-			lastProgress = line.join(' ');
-			cliUtils.redraw(lastProgress);
-		};
-
-		importOptions.onError = (error) => {
-			let s = error.trace ? error.trace : error.toString();
-			this.stdout(s);
-		};
-
-		app().gui().showConsole();
-		this.stdout(_('Importing notes...'));
-		const service = new InteropService();
-		const result = await service.import(importOptions);
-		result.warnings.map((w) => this.stdout(w));
-		cliUtils.redrawDone();
-		if (lastProgress) this.stdout(_('The notes have been imported: %s', lastProgress));
-	}
-
-}
-
-module.exports = Command;

CliClient/app/command-ls.js

@@ -1,10 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Setting = require('lib/models/Setting.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Setting } = require('lib/models/setting.js');
+const { Note } = require('lib/models/note.js');
 const { sprintf } = require('sprintf-js');
 const { time } = require('lib/time-utils.js');
 const { cliUtils } = require('./cli-utils.js');

CliClient/app/command-mkbook.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Folder = require('lib/models/Folder.js');
+const { Folder } = require('lib/models/folder.js');
 const { reg } = require('lib/registry.js');
 
 class Command extends BaseCommand {
@@ -14,6 +14,10 @@ class Command extends BaseCommand {
 		return _('Creates a new notebook.');
 	}
 
+	aliases() {
+		return ['mkdir'];
+	}
+
 	async action(args) {
 		let folder = await Folder.save({ title: args['new-notebook'] }, { userSideValidation: true });		
 		app().switchCurrentFolder(folder);

CliClient/app/command-mknote.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Note = require('lib/models/Note.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-mktodo.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Note = require('lib/models/Note.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-mv.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-ren.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 
@@ -20,7 +20,6 @@ class Command extends BaseCommand {
 		const name = args['name'];
 
 		const item = await app().loadItem('folderOrNote', pattern);
-		this.encryptionCheck(item);
 		if (!item) throw new Error(_('Cannot find "%s".', pattern));
 
 		const newItem = {

CliClient/app/command-rmbook.js

@@ -1,10 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const BaseModel = require('lib/BaseModel.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseModel } = require('lib/base-model.js');
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
@@ -29,7 +29,7 @@ class Command extends BaseCommand {
 
 		const folder = await app().loadItem(BaseModel.TYPE_FOLDER, pattern);
 		if (!folder) throw new Error(_('Cannot find "%s".', pattern));
-		const ok = force ? true : await this.prompt(_('Delete notebook? All notes within this notebook will also be deleted.'), { booleanAnswerDefault: 'n' });
+		const ok = force ? true : await this.prompt(_('Delete notebook "%s"?', folder.title), { booleanAnswerDefault: 'n' });
 		if (!ok) return;
 
 		await Folder.delete(folder.id);

CliClient/app/command-rmnote.js

@@ -1,10 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const BaseModel = require('lib/BaseModel.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseModel } = require('lib/base-model.js');
 const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {

CliClient/app/command-search.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 const { sprintf } = require('sprintf-js');
 const { time } = require('lib/time-utils.js');
 const { uuid } = require('lib/uuid.js');

CliClient/app/command-set.js

@@ -1,11 +1,10 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const { Database } = require('lib/database.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const BaseItem = require('lib/models/BaseItem.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseItem } = require('lib/models/base-item.js');
 
 class Command extends BaseCommand {
 
@@ -13,16 +12,16 @@ class Command extends BaseCommand {
 		return 'set <note> <name> [value]';
 	}
 
-	description() {
-		const fields = Note.fields();
-		const s = [];
-		for (let i = 0; i < fields.length; i++) {
-			const f = fields[i];
-			if (f.name === 'id') continue;
-			s.push(f.name + ' (' + Database.enumName('fieldType', f.type) + ')');
-		}
+	enabled() {
+		return false;
+	}
 
-		return _('Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s', s.join(', '));
+	description() {
+		return _('Sets the property <name> of the given <note> to the given [value].');
+	}
+
+	hidden() {
+		return true;
 	}
 
 	async action(args) {
@@ -35,8 +34,6 @@ class Command extends BaseCommand {
 		if (!notes.length) throw new Error(_('Cannot find "%s".', title));
 
 		for (let i = 0; i < notes.length; i++) {
-			this.encryptionCheck(notes[i]);
-
 			let newNote = {
 				id: notes[i].id,
 				type_: notes[i].type_,

CliClient/app/command-status.js

@@ -1,7 +1,7 @@
 const { BaseCommand } = require('./base-command.js');
 const { Database } = require('lib/database.js');
 const { app } = require('./app.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { _ } = require('lib/locale.js');
 const { ReportService } = require('lib/services/report.js');
 

CliClient/app/command-sync.js

@@ -2,15 +2,15 @@ const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
 const { OneDriveApiNodeUtils } = require('./onedrive-api-node-utils.js');
-const Setting = require('lib/models/Setting.js');
-const BaseItem = require('lib/models/BaseItem.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
 const { Synchronizer } = require('lib/synchronizer.js');
 const { reg } = require('lib/registry.js');
 const { cliUtils } = require('./cli-utils.js');
 const md5 = require('md5');
 const locker = require('proper-lockfile');
 const fs = require('fs-extra');
-const SyncTargetRegistry = require('lib/SyncTargetRegistry');
+const osTmpdir = require('os-tmpdir');
 
 class Command extends BaseCommand {
 
@@ -32,6 +32,7 @@ class Command extends BaseCommand {
 	options() {
 		return [
 			['--target <target>', _('Sync to provided target (defaults to sync.target config value)')],
+			['--random-failures', 'For debugging purposes. Do not use.'],
 		];
 	}
 
@@ -61,28 +62,14 @@ class Command extends BaseCommand {
 		});
 	}
 
-	async doAuth() {
+	async doAuth(syncTargetId) {
 		const syncTarget = reg.syncTarget(this.syncTargetId_);
-		const syncTargetMd = SyncTargetRegistry.idToMetadata(this.syncTargetId_);
-
-		if (this.syncTargetId_ === 3 || this.syncTargetId_ === 4) { // OneDrive
-			this.oneDriveApiUtils_ = new OneDriveApiNodeUtils(syncTarget.api());
-			const auth = await this.oneDriveApiUtils_.oauthDance({
-				log: (...s) => { return this.stdout(...s); }
-			});
-			this.oneDriveApiUtils_ = null;
-			
-			Setting.setValue('sync.' + this.syncTargetId_ + '.auth', auth ? JSON.stringify(auth) : null);
-			if (!auth) {
-				this.stdout(_('Authentication was not completed (did not receive an authentication token).'));
-				return false;
-			}
-
-			return true;
-		}
-
-		this.stdout(_('Not authentified with %s. Please provide any missing credentials.', syncTarget.label()));
-		return false;
+		this.oneDriveApiUtils_ = new OneDriveApiNodeUtils(syncTarget.api());
+		const auth = await this.oneDriveApiUtils_.oauthDance({
+			log: (...s) => { return this.stdout(...s); }
+		});
+		this.oneDriveApiUtils_ = null;
+		return auth;
 	}
 
 	cancelAuth() {
@@ -100,7 +87,7 @@ class Command extends BaseCommand {
 		this.releaseLockFn_ = null;
 
 		// Lock is unique per profile/database
-		const lockFilePath = require('os').tmpdir() + '/synclock_' + md5(escape(Setting.value('profileDir'))); // https://github.com/pvorb/node-md5/issues/41
+		const lockFilePath = osTmpdir() + '/synclock_' + md5(Setting.value('profileDir'));
 		if (!await fs.pathExists(lockFilePath)) await fs.writeFile(lockFilePath, 'synclock');
 
 		try {
@@ -134,8 +121,12 @@ class Command extends BaseCommand {
 				app().gui().showConsole();
 				app().gui().maximizeConsole();
 
-				const authDone = await this.doAuth();
-				if (!authDone) return cleanUp();
+				const auth = await this.doAuth(this.syncTargetId_);
+				Setting.setValue('sync.' + this.syncTargetId_ + '.auth', auth ? JSON.stringify(auth) : null);
+				if (!auth) {
+					this.stdout(_('Authentication was not completed (did not receive an authentication token).'));
+					return cleanUp();
+				}
 			}
 			
 			const sync = await syncTarget.synchronizer();
@@ -149,6 +140,7 @@ class Command extends BaseCommand {
 					cliUtils.redrawDone();
 					this.stdout(msg);
 				},
+				randomFailures: args.options['random-failures'] === true,
 			};
 
 			this.stdout(_('Synchronisation target: %s (%s)', Setting.enumOptionLabel('sync.target', this.syncTargetId_), this.syncTargetId_));

CliClient/app/command-tag.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
+const { Tag } = require('lib/models/tag.js');
+const { BaseModel } = require('lib/base-model.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-todo.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
@@ -25,8 +25,6 @@ class Command extends BaseCommand {
 		for (let i = 0; i < notes.length; i++) {
 			const note = notes[i];
 
-			this.encryptionCheck(note);
-
 			let toSave = {
 				id: note.id,
 			};

CliClient/app/command-undone.js

@@ -1,9 +1,9 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 const { time } = require('lib/time-utils.js');
 
 const CommandDone = require('./command-done.js');
@@ -19,7 +19,7 @@ class Command extends BaseCommand {
 	}
 
 	async action(args) {
-		await CommandDone.handleAction(this, args, false);
+		await CommandDone.handleAction(args, false);
 	}
 
 }

CliClient/app/command-use.js

@@ -1,8 +1,8 @@
 const { BaseCommand } = require('./base-command.js');
 const { app } = require('./app.js');
 const { _ } = require('lib/locale.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
 
 class Command extends BaseCommand {
 
@@ -18,8 +18,8 @@ class Command extends BaseCommand {
 		return { data: autocompleteFolders };
 	}
 
-	compatibleUis() {
-		return ['cli'];
+	enabled() {
+		return false;
 	}
 
 	async action(args) {

CliClient/app/command-version.js

@@ -1,5 +1,5 @@
 const { BaseCommand } = require('./base-command.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {

CliClient/app/fuzzing.js

@@ -2,7 +2,7 @@
 
 const { time } = require('lib/time-utils.js');
 const { Logger } = require('lib/logger.js');
-const Resource = require('lib/models/Resource.js');
+const { Resource } = require('lib/models/resource.js');
 const { dirname } = require('lib/path-utils.js');
 const { FsDriverNode } = require('./fs-driver-node.js');
 const lodash = require('lodash');

CliClient/app/gui/FolderListWidget.js

@@ -1,6 +1,6 @@
-const Folder = require('lib/models/Folder.js');
-const Tag = require('lib/models/Tag.js');
-const BaseModel = require('lib/BaseModel.js');
+const Folder = require('lib/models/folder.js').Folder;
+const Tag = require('lib/models/tag.js').Tag;
+const BaseModel = require('lib/base-model.js').BaseModel;
 const ListWidget = require('tkwidgets/ListWidget.js');
 const _ = require('lib/locale.js')._;
 
@@ -24,9 +24,9 @@ class FolderListWidget extends ListWidget {
 			if (item === '-') {
 				output.push('-'.repeat(this.innerWidth));
 			} else if (item.type_ === Folder.modelType()) {
-				output.push(Folder.displayTitle(item));
+				output.push(item.title);
 			} else if (item.type_ === Tag.modelType()) {
-				output.push('[' + Folder.displayTitle(item) + ']');
+				output.push('[' + item.title + ']');
 			} else if (item.type_ === BaseModel.TYPE_SEARCH) {
 				output.push(_('Search:'));
 				output.push(item.title);

CliClient/app/gui/NoteListWidget.js

@@ -1,4 +1,4 @@
-const Note = require('lib/models/Note.js');
+const Note = require('lib/models/note.js').Note;
 const ListWidget = require('tkwidgets/ListWidget.js');
 
 class NoteListWidget extends ListWidget {
@@ -10,7 +10,7 @@ class NoteListWidget extends ListWidget {
 		this.updateIndexFromSelectedNoteId_ = false;
 
 		this.itemRenderer = (note) => {
-			let label = Note.displayTitle(note); // + ' ' + note.id;
+			let label = note.title; // + ' ' + note.id;
 			if (note.is_todo) {
 				label = '[' + (note.todo_completed ? 'X' : ' ') + '] ' + label;
 			}

CliClient/app/gui/NoteMetadataWidget.js

@@ -1,4 +1,4 @@
-const Note = require('lib/models/Note.js');
+const Note = require('lib/models/note.js').Note;
 const TextWidget = require('tkwidgets/TextWidget.js');
 
 class NoteMetadataWidget extends TextWidget {

CliClient/app/gui/NoteWidget.js

@@ -1,6 +1,5 @@
-const Note = require('lib/models/Note.js');
+const Note = require('lib/models/note.js').Note;
 const TextWidget = require('tkwidgets/TextWidget.js');
-const { _ } = require('lib/locale.js');
 
 class NoteWidget extends TextWidget {
 
@@ -33,24 +32,11 @@ class NoteWidget extends TextWidget {
 		this.reloadNote();
 	}
 
-	welcomeText() {
-		return _('Welcome to Joplin!\n\nType `:help shortcuts` for the list of keyboard shortcuts, or just `:help` for usage information.\n\nFor example, to create a notebook press `mb`; to create a note press `mn`.');
-	}
-
 	reloadNote() {
-		if (!this.noteId_ && !this.notes.length) {
-			this.text = this.welcomeText();
-			this.scrollTop = 0;
-		} else if (this.noteId_) {
+		if (this.noteId_) {
 			this.doAsync('loadNote', async () => {
 				this.note_ = await Note.load(this.noteId_);
-				
-				if (this.note_ && this.note_.encryption_applied) {
-					this.text = _('One or more items are currently encrypted and you may need to supply a master password. To do so please type `e2ee decrypt`. If you have already supplied the password, the encrypted items are being decrypted in the background and will be available soon.');
-				} else {
-					this.text = this.note_ ? this.note_.title + "\n\n" + this.note_.body : '';
-				}
-
+				this.text = this.note_ ? this.note_.title + "\n\n" + this.note_.body : '';
 				if (this.lastLoadedNoteId_ !== this.noteId_) this.scrollTop = 0;
 				this.lastLoadedNoteId_ = this.noteId_;
 			});

CliClient/app/gui/StatusBarWidget.js

@@ -2,7 +2,6 @@ const BaseWidget = require('tkwidgets/BaseWidget.js');
 const chalk = require('chalk');
 const termutils = require('tkwidgets/framework/termutils.js');
 const stripAnsi = require('strip-ansi');
-const { handleAutocompletion } = require('../autocompletion.js');
 
 class StatusBarWidget extends BaseWidget {
 
@@ -42,7 +41,6 @@ class StatusBarWidget extends BaseWidget {
 		};
 
 		if ('cursorPosition' in options) this.promptState_.cursorPosition = options.cursorPosition;
-		if ('secure' in options) this.promptState_.secure = options.secure;
 
 		this.promptState_.promise = new Promise((resolve, reject) => {
 			this.promptState_.resolve = resolve;
@@ -106,19 +104,13 @@ class StatusBarWidget extends BaseWidget {
 
 			this.term.showCursor(true);
 
-			const isSecurePrompt = !!this.promptState_.secure;
-
 			let options = {
 				cancelable: true,
 				history: this.history,
 				default: this.promptState_.initialText,
-				autoComplete: handleAutocompletion,
-				autoCompleteHint : true,
-				autoCompleteMenu : true,
 			};
 
 			if ('cursorPosition' in this.promptState_) options.cursorPosition = this.promptState_.cursorPosition;
-			if (isSecurePrompt) options.echoChar = true;
 
 			this.inputEventEmitter_ = this.term.inputField(options, (error, input) => {
 				let resolveResult = null;
@@ -133,8 +125,7 @@ class StatusBarWidget extends BaseWidget {
 						resolveResult = input ? input.trim() : input;
 						// Add the command to history but only if it's longer than one character.
 						// Below that it's usually an answer like "y"/"n", etc.
-						const isConfigPassword = input.indexOf('config ') >= 0 && input.indexOf('password') >= 0;
-						if (!isSecurePrompt && input && input.length > 1 && !isConfigPassword) this.history_.push(input);
+						if (input && input.length > 1) this.history_.push(input);
 					}
 				}
 
@@ -168,4 +159,4 @@ class StatusBarWidget extends BaseWidget {
 
 }
 
-module.exports = StatusBarWidget;
+module.exports = StatusBarWidget;

CliClient/app/help-utils.js

@@ -1,6 +1,6 @@
 const fs = require('fs-extra');
 const { wrap } = require('lib/string-utils.js');
-const Setting = require('lib/models/Setting.js');
+const { Setting } = require('lib/models/setting.js');
 const { fileExtension, basename, dirname } = require('lib/path-utils.js');
 const { _, setLocale, languageCode } = require('lib/locale.js');
 
@@ -53,8 +53,9 @@ function renderCommandHelp(cmd, width = null) {
 				desc.push(label);
 			}
 
-			const description = Setting.keyDescription(md.key, 'cli');
-			if (description) desc.push(description);
+			if (md.description) {
+				desc.push(md.description());
+			}
 
 			desc.push(_('Type: %s.', md.isEnum ? _('Enum') : Setting.typeToString(md.type)));
 			if (md.isEnum) desc.push(_('Possible values: %s.', Setting.enumOptionsDoc(md.key, '%s (%s)')));

CliClient/app/main.js

@@ -1,36 +1,26 @@
 #!/usr/bin/env node
 
-// Make it possible to require("/lib/...") without specifying full path
+// Loading time: 20170803: 1.5s with no commands
+
 require('app-module-path').addPath(__dirname);
 
-const compareVersion = require('compare-version');
-const nodeVersion = process && process.versions && process.versions.node ? process.versions.node : '0.0.0';
-if (compareVersion(nodeVersion, '8.0.0') < 0) {
-	console.error('Joplin requires Node 8+. Detected version ' + nodeVersion);
-	process.exit(1);
-}
-
 const { app } = require('./app.js');
-const Folder = require('lib/models/Folder.js');
-const Resource = require('lib/models/Resource.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
-const NoteTag = require('lib/models/NoteTag.js');
-const MasterKey = require('lib/models/MasterKey');
-const Setting = require('lib/models/Setting.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Resource } = require('lib/models/resource.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { NoteTag } = require('lib/models/note-tag.js');
+const { Setting } = require('lib/models/setting.js');
 const { Logger } = require('lib/logger.js');
 const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { shimInit } = require('lib/shim-init-node.js');
 const { _ } = require('lib/locale.js');
-const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
-const EncryptionService = require('lib/services/EncryptionService');
 
 const fsDriver = new FsDriverNode();
 Logger.fsDriver_ = fsDriver;
 Resource.fsDriver_ = fsDriver;
-EncryptionService.fsDriver_ = fsDriver;
-FileApiDriverLocal.fsDriver_ = fsDriver;
 
 // That's not good, but it's to avoid circular dependency issues
 // in the BaseItem class.
@@ -39,7 +29,6 @@ BaseItem.loadClass('Folder', Folder);
 BaseItem.loadClass('Resource', Resource);
 BaseItem.loadClass('Tag', Tag);
 BaseItem.loadClass('NoteTag', NoteTag);
-BaseItem.loadClass('MasterKey', MasterKey);
 
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
@@ -66,34 +55,7 @@ process.stdout.on('error', function( err ) {
 	}
 });
 
-
-
-
-
-// async function main() {
-// 	const InteropService = require('lib/services/InteropService');
-// 	const service = new InteropService();
-// 	console.info(service.moduleByFormat('importer', 'enex'));
-// 	//await service.modules();
-// }
-
-// main().catch((error) => { console.error(error); });
-
-
-
-
-
-
-
-
 application.start(process.argv).catch((error) => {
-	if (error.code == 'flagError') {
-		console.error(error.message);
-		console.error(_('Type `joplin help` for usage information.'));
-	} else {
-		console.error(_('Fatal error:'));
-		console.error(error);
-	}
-
-	process.exit(1);
+	console.error(_('Fatal error:'));
+	console.error(error);
 });

CliClient/build.sh

@@ -4,6 +4,6 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BUILD_DIR="$ROOT_DIR/build"
 
 rsync -a --exclude "node_modules/" "$ROOT_DIR/app/" "$BUILD_DIR/"
-rsync -a --delete "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
+rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
 cp "$ROOT_DIR/package.json" "$BUILD_DIR"
 chmod 755 "$BUILD_DIR/main.js"

CliClient/locales/en_GB.po

@@ -15,12 +15,63 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "Give focus to next pane"
+msgstr ""
+
+msgid "Give focus to previous pane"
+msgstr ""
+
+msgid "Enter command line mode"
+msgstr ""
+
+msgid "Exit command line mode"
+msgstr ""
+
+msgid "Edit the selected note"
+msgstr ""
+
+msgid "Cancel the current command."
+msgstr ""
+
+msgid "Exit the application."
+msgstr ""
+
+msgid "Delete the currently selected note or notebook."
+msgstr ""
+
 msgid "To delete a tag, untag the associated notes."
 msgstr ""
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr ""
 
+msgid "Set a to-do as completed / not completed"
+msgstr ""
+
+msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "[t]oggle note [m]etadata."
+msgstr ""
+
+msgid "[M]ake a new [n]ote"
+msgstr ""
+
+msgid "[M]ake a new [t]odo"
+msgstr ""
+
+msgid "[M]ake a new note[b]ook"
+msgstr ""
+
+msgid "Copy ([Y]ank) the [n]ote to a notebook."
+msgstr ""
+
+msgid "Move the note to a notebook."
+msgstr ""
+
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr ""
 
@@ -49,17 +100,10 @@ msgstr ""
 msgid "Cancelling background synchronisation... Please wait."
 msgstr ""
 
-#, javascript-format
-msgid "No such command: %s"
-msgstr ""
-
 #, javascript-format
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr ""
 
-msgid "Cannot change encrypted item"
-msgstr ""
-
 #, javascript-format
 msgid "Missing required argument: %s"
 msgstr ""
@@ -117,35 +161,6 @@ msgstr ""
 msgid "Note is not a to-do: \"%s\""
 msgstr ""
 
-msgid ""
-"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status` and `target-status`."
-msgstr ""
-
-msgid "Enter master password:"
-msgstr ""
-
-msgid "Operation cancelled"
-msgstr ""
-
-msgid ""
-"Starting decryption... Please wait as it may take several minutes depending "
-"on how much there is to decrypt."
-msgstr ""
-
-msgid "Completed decryption."
-msgstr ""
-
-msgid "Enabled"
-msgstr ""
-
-msgid "Disabled"
-msgstr ""
-
-#, javascript-format
-msgid "Encryption is: %s"
-msgstr ""
-
 msgid "Edit note."
 msgstr ""
 
@@ -163,10 +178,6 @@ msgstr ""
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
 msgid "Note has been saved."
 msgstr ""
 
@@ -174,14 +185,10 @@ msgid "Exits the application."
 msgstr ""
 
 msgid ""
-"Exports Joplin data to the given path. By default, it will export the "
+"Exports Joplin data to the given directory. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
 
-#, javascript-format
-msgid "Destination format: %s"
-msgstr ""
-
 msgid "Exports only the given note."
 msgstr ""
 
@@ -194,16 +201,10 @@ msgstr ""
 msgid "Displays usage information."
 msgstr ""
 
-#, javascript-format
-msgid "For information on how to customise the shortcuts please visit %s"
-msgstr ""
-
 msgid "Shortcuts are not available in CLI mode."
 msgstr ""
 
-msgid ""
-"Type `help [command]` for more information about a command; or type `help "
-"all` for the complete usage information."
+msgid "Type `help [command]` for more information about a command."
 msgstr ""
 
 msgid "The possible commands are:"
@@ -233,19 +234,25 @@ msgid "To exit command line mode, press ESCAPE"
 msgstr ""
 
 msgid ""
-"For the list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr ""
 
-msgid "Imports data into Joplin."
-msgstr ""
-
-#, javascript-format
-msgid "Source format: %s"
+msgid "Imports an Evernote notebook file (.enex file)."
 msgstr ""
 
 msgid "Do not ask for confirmation."
 msgstr ""
 
+#, javascript-format
+msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"New notebook \"%s\" will be created and file \"%s\" will be imported into "
+"it. Continue?"
+msgstr ""
+
 #, javascript-format
 msgid "Found: %d."
 msgstr ""
@@ -332,7 +339,8 @@ msgstr ""
 msgid "Deletes the notebook without asking for confirmation."
 msgstr ""
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, javascript-format
+msgid "Delete notebook \"%s\"?"
 msgstr ""
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -351,12 +359,7 @@ msgstr ""
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
-#, javascript-format
-msgid ""
-"Sets the property <name> of the given <note> to the given [value]. Possible "
-"properties are:\n"
-"\n"
-"%s"
+msgid "Sets the property <name> of the given <note> to the given [value]."
 msgstr ""
 
 msgid "Displays summary about the notes and notebooks."
@@ -368,14 +371,6 @@ msgstr ""
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr ""
-
-#, javascript-format
-msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr ""
-
 msgid "Synchronisation is already in progress."
 msgstr ""
 
@@ -386,6 +381,10 @@ msgid ""
 "operation."
 msgstr ""
 
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr ""
@@ -449,9 +448,6 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
-msgid "Type `joplin help` for usage information."
-msgstr ""
-
 msgid "Fatal error:"
 msgstr ""
 
@@ -473,36 +469,9 @@ msgstr ""
 msgid "Search:"
 msgstr ""
 
-msgid ""
-"Welcome to Joplin!\n"
-"\n"
-"Type `:help shortcuts` for the list of keyboard shortcuts, or just `:help` "
-"for usage information.\n"
-"\n"
-"For example, to create a notebook press `mb`; to create a note press `mn`."
-msgstr ""
-
-msgid ""
-"One or more items are currently encrypted and you may need to supply a "
-"master password. To do so please type `e2ee decrypt`. If you have already "
-"supplied the password, the encrypted items are being decrypted in the "
-"background and will be available soon."
-msgstr ""
-
-#, javascript-format
-msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
 msgid "File"
 msgstr ""
 
-msgid "Directory"
-msgstr ""
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
 msgid "New note"
 msgstr ""
 
@@ -512,14 +481,10 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Import"
+msgid "Import Evernote notes"
 msgstr ""
 
-msgid "Export"
-msgstr ""
-
-#, javascript-format
-msgid "Hide %s"
+msgid "Evernote Export Files"
 msgstr ""
 
 msgid "Quit"
@@ -540,22 +505,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
-msgid "View"
-msgstr ""
-
-msgid "Toggle editor layout"
-msgstr ""
-
 msgid "Tools"
 msgstr ""
 
-msgid "Synchronisation status"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "General Options"
+msgid "Options"
 msgstr ""
 
 msgid "Help"
@@ -564,12 +517,6 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
-msgid "Make a donation"
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "About Joplin"
 msgstr ""
 
@@ -577,112 +524,12 @@ msgstr ""
 msgid "%s %s (%s, %s)"
 msgstr ""
 
-#, javascript-format
-msgid "Open %s"
-msgstr ""
-
-msgid "Exit"
-msgstr ""
-
 msgid "OK"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr ""
-
-msgid "An update is available, do you want to download it now?"
-msgstr ""
-
-msgid "Yes"
-msgstr ""
-
-msgid "No"
-msgstr ""
-
-msgid "Current version is up-to-date."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr ""
-
-#, javascript-format
-msgid "Notes and settings are stored in: %s"
-msgstr ""
-
-msgid "Save"
-msgstr ""
-
-msgid ""
-"Disabling encryption means *all* your notes and attachments are going to be "
-"re-synchronised and sent unencrypted to the sync target. Do you wish to "
-"continue?"
-msgstr ""
-
-msgid ""
-"Enabling encryption means *all* your notes and attachments are going to be "
-"re-synchronised and sent encrypted to the sync target. Do not lose the "
-"password as, for security purposes, this will be the *only* way to decrypt "
-"the data! To enable encryption, please enter your password below."
-msgstr ""
-
-msgid "Disable encryption"
-msgstr ""
-
-msgid "Enable encryption"
-msgstr ""
-
-msgid "Master Keys"
-msgstr ""
-
-msgid "Active"
-msgstr ""
-
-msgid "ID"
-msgstr ""
-
-msgid "Source"
-msgstr ""
-
-msgid "Created"
-msgstr ""
-
-msgid "Updated"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password OK"
-msgstr ""
-
-msgid ""
-"Note: Only one master key is going to be used for encryption (the one marked "
-"as \"active\"). Any of the keys might be used for decryption, depending on "
-"how the notes or notebooks were originally encrypted."
-msgstr ""
-
-msgid "Missing Master Keys"
-msgstr ""
-
-msgid ""
-"The master keys with these IDs are used to encrypt some of your items, "
-"however the application does not currently have access to them. It is likely "
-"they will eventually be downloaded via synchronisation."
-msgstr ""
-
-msgid "Status"
-msgstr ""
-
-msgid "Encryption is:"
-msgstr ""
-
 msgid "Back"
 msgstr ""
 
@@ -694,9 +541,15 @@ msgstr ""
 msgid "Please create a notebook first."
 msgstr ""
 
+msgid "Note title:"
+msgstr ""
+
 msgid "Please create a notebook first"
 msgstr ""
 
+msgid "To-do title:"
+msgstr ""
+
 msgid "Notebook title:"
 msgstr ""
 
@@ -712,24 +565,9 @@ msgstr ""
 msgid "Set alarm:"
 msgstr ""
 
-msgid "Search"
-msgstr ""
-
 msgid "Layout"
 msgstr ""
 
-msgid "Some items cannot be synchronised."
-msgstr ""
-
-msgid "View them now"
-msgstr ""
-
-msgid "Some items cannot be decrypted."
-msgstr ""
-
-msgid "Set the password"
-msgstr ""
-
 msgid "Add or remove tags"
 msgstr ""
 
@@ -745,16 +583,6 @@ msgstr ""
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr ""
 
-msgid ""
-"There is currently no notebook. Create one by clicking on \"New notebook\"."
-msgstr ""
-
-msgid "Open..."
-msgstr ""
-
-msgid "Save as..."
-msgstr ""
-
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -762,28 +590,9 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
 msgid "Set alarm"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-
-msgid "to-do"
-msgstr ""
-
-msgid "note"
-msgstr ""
-
-#, javascript-format
-msgid "Creating new %s..."
-msgstr ""
-
 msgid "Refresh"
 msgstr ""
 
@@ -793,13 +602,10 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Options"
+msgid "Import"
 msgstr ""
 
-msgid "Synchronisation Status"
-msgstr ""
-
-msgid "Encryption Options"
+msgid "Delete notebook?"
 msgstr ""
 
 msgid "Remove this tag from all the notes?"
@@ -817,10 +623,10 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Searches"
+msgid "Tags"
 msgstr ""
 
-msgid "Please select where the sync status should be exported to"
+msgid "Searches"
 msgstr ""
 
 #, javascript-format
@@ -834,18 +640,12 @@ msgstr ""
 msgid "File system"
 msgstr ""
 
-msgid "Nextcloud"
-msgstr ""
-
 msgid "OneDrive"
 msgstr ""
 
 msgid "OneDrive Dev (For testing only)"
 msgstr ""
 
-msgid "WebDAV"
-msgstr ""
-
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr ""
@@ -896,10 +696,6 @@ msgstr ""
 msgid "Deleted remote items: %d."
 msgstr ""
 
-#, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr ""
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr ""
@@ -915,12 +711,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
-msgid "Encrypted"
-msgstr ""
-
-msgid "Encrypted items cannot be modified"
-msgstr ""
-
 msgid "Conflicts"
 msgstr ""
 
@@ -946,6 +736,14 @@ msgstr ""
 msgid "Cannot move note to \"%s\" notebook"
 msgstr ""
 
+msgid "File system synchronisation target directory"
+msgstr ""
+
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+
 msgid "Text editor"
 msgstr ""
 
@@ -972,50 +770,18 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Uncompleted to-dos on top"
-msgstr ""
-
-msgid "Sort notes by"
-msgstr ""
-
-msgid "Reverse sort order"
+msgid "Show uncompleted todos on top of the lists"
 msgstr ""
 
 msgid "Save geo-location with notes"
 msgstr ""
 
-msgid "When creating a new to-do:"
-msgstr ""
-
-msgid "Focus title"
-msgstr ""
-
-msgid "Focus body"
-msgstr ""
-
-msgid "When creating a new note:"
-msgstr ""
-
-msgid "Show tray icon"
-msgstr ""
-
-msgid "Global zoom percentage"
-msgstr ""
-
-msgid "Editor font family"
-msgstr ""
-
-msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
-msgstr ""
-
-msgid "Automatically update the application"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr ""
 
+msgid "Disabled"
+msgstr ""
+
 #, javascript-format
 msgid "%d minutes"
 msgstr ""
@@ -1028,6 +794,9 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
+msgid "Automatically update the application"
+msgstr ""
+
 msgid "Show advanced options"
 msgstr ""
 
@@ -1035,85 +804,14 @@ msgid "Synchronisation target"
 msgstr ""
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
-msgstr ""
-
-msgid "Directory to synchronise with (absolute path)"
-msgstr ""
-
-msgid ""
-"The path to synchronise with when file system synchronisation is enabled. "
-"See `sync.target`."
-msgstr ""
-
-msgid "Nextcloud WebDAV URL"
-msgstr ""
-
-msgid "Nextcloud username"
-msgstr ""
-
-msgid "Nextcloud password"
-msgstr ""
-
-msgid "WebDAV URL"
-msgstr ""
-
-msgid "WebDAV username"
-msgstr ""
-
-msgid "WebDAV password"
+"The target to synchonise to. If synchronising with the file system, set "
+"`sync.2.path` to specify the target directory."
 msgstr ""
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
 
-msgid "Joplin Export File"
-msgstr ""
-
-msgid "Markdown"
-msgstr ""
-
-msgid "Joplin Export Directory"
-msgstr ""
-
-msgid "Evernote Export File"
-msgstr ""
-
-#, javascript-format
-msgid "Cannot load \"%s\" module for format \"%s\""
-msgstr ""
-
-#, javascript-format
-msgid "Please specify import format for %s"
-msgstr ""
-
-#, javascript-format
-msgid ""
-"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
-"decrypted and try again."
-msgstr ""
-
-msgid "There is no data to export."
-msgstr ""
-
-msgid "Please specify the notebook where the notes should be imported to."
-msgstr ""
-
-msgid "Items that cannot be synchronised"
-msgstr ""
-
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr ""
-
-msgid ""
-"These items will remain on the device but will not be uploaded to the sync "
-"target. In order to find these items, either search for the title or the ID "
-"(which is displayed in brackets above)."
-msgstr ""
-
 msgid "Sync status (synced items / total items)"
 msgstr ""
 
@@ -1156,10 +854,10 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-msgid "Export Debug Report"
+msgid "Status"
 msgstr ""
 
-msgid "Encryption Config"
+msgid "Export Debug Report"
 msgstr ""
 
 msgid "Configuration"
@@ -1172,9 +870,6 @@ msgstr ""
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr ""
 
-msgid "Press to set the decryption password."
-msgstr ""
-
 msgid "Select date"
 msgstr ""
 
@@ -1184,26 +879,6 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
-msgid "Joplin website"
-msgstr ""
-
-#, javascript-format
-msgid "Master Key %s"
-msgstr ""
-
-#, javascript-format
-msgid "Created: %s"
-msgstr ""
-
-msgid "Password:"
-msgstr ""
-
-msgid "Password cannot be empty"
-msgstr ""
-
-msgid "Enable"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr ""
@@ -1211,12 +886,6 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
-msgid "Show all"
-msgstr ""
-
-msgid "Errors only"
-msgstr ""
-
 msgid "This note has been modified:"
 msgstr ""
 

CliClient/locales/joplin.pot

@@ -15,12 +15,63 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "Give focus to next pane"
+msgstr ""
+
+msgid "Give focus to previous pane"
+msgstr ""
+
+msgid "Enter command line mode"
+msgstr ""
+
+msgid "Exit command line mode"
+msgstr ""
+
+msgid "Edit the selected note"
+msgstr ""
+
+msgid "Cancel the current command."
+msgstr ""
+
+msgid "Exit the application."
+msgstr ""
+
+msgid "Delete the currently selected note or notebook."
+msgstr ""
+
 msgid "To delete a tag, untag the associated notes."
 msgstr ""
 
 msgid "Please select the note or notebook to be deleted first."
 msgstr ""
 
+msgid "Set a to-do as completed / not completed"
+msgstr ""
+
+msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "[t]oggle note [m]etadata."
+msgstr ""
+
+msgid "[M]ake a new [n]ote"
+msgstr ""
+
+msgid "[M]ake a new [t]odo"
+msgstr ""
+
+msgid "[M]ake a new note[b]ook"
+msgstr ""
+
+msgid "Copy ([Y]ank) the [n]ote to a notebook."
+msgstr ""
+
+msgid "Move the note to a notebook."
+msgstr ""
+
 msgid "Press Ctrl+D or type \"exit\" to exit the application"
 msgstr ""
 
@@ -49,17 +100,10 @@ msgstr ""
 msgid "Cancelling background synchronisation... Please wait."
 msgstr ""
 
-#, javascript-format
-msgid "No such command: %s"
-msgstr ""
-
 #, javascript-format
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr ""
 
-msgid "Cannot change encrypted item"
-msgstr ""
-
 #, javascript-format
 msgid "Missing required argument: %s"
 msgstr ""
@@ -117,35 +161,6 @@ msgstr ""
 msgid "Note is not a to-do: \"%s\""
 msgstr ""
 
-msgid ""
-"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
-"`status` and `target-status`."
-msgstr ""
-
-msgid "Enter master password:"
-msgstr ""
-
-msgid "Operation cancelled"
-msgstr ""
-
-msgid ""
-"Starting decryption... Please wait as it may take several minutes depending "
-"on how much there is to decrypt."
-msgstr ""
-
-msgid "Completed decryption."
-msgstr ""
-
-msgid "Enabled"
-msgstr ""
-
-msgid "Disabled"
-msgstr ""
-
-#, javascript-format
-msgid "Encryption is: %s"
-msgstr ""
-
 msgid "Edit note."
 msgstr ""
 
@@ -163,10 +178,6 @@ msgstr ""
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 
-#, javascript-format
-msgid "Error opening note in editor: %s"
-msgstr ""
-
 msgid "Note has been saved."
 msgstr ""
 
@@ -174,14 +185,10 @@ msgid "Exits the application."
 msgstr ""
 
 msgid ""
-"Exports Joplin data to the given path. By default, it will export the "
+"Exports Joplin data to the given directory. By default, it will export the "
 "complete database including notebooks, notes, tags and resources."
 msgstr ""
 
-#, javascript-format
-msgid "Destination format: %s"
-msgstr ""
-
 msgid "Exports only the given note."
 msgstr ""
 
@@ -194,16 +201,10 @@ msgstr ""
 msgid "Displays usage information."
 msgstr ""
 
-#, javascript-format
-msgid "For information on how to customise the shortcuts please visit %s"
-msgstr ""
-
 msgid "Shortcuts are not available in CLI mode."
 msgstr ""
 
-msgid ""
-"Type `help [command]` for more information about a command; or type `help "
-"all` for the complete usage information."
+msgid "Type `help [command]` for more information about a command."
 msgstr ""
 
 msgid "The possible commands are:"
@@ -233,19 +234,25 @@ msgid "To exit command line mode, press ESCAPE"
 msgstr ""
 
 msgid ""
-"For the list of keyboard shortcuts and config options, type `help keymap`"
+"For the complete list of available keyboard shortcuts, type `help shortcuts`"
 msgstr ""
 
-msgid "Imports data into Joplin."
-msgstr ""
-
-#, javascript-format
-msgid "Source format: %s"
+msgid "Imports an Evernote notebook file (.enex file)."
 msgstr ""
 
 msgid "Do not ask for confirmation."
 msgstr ""
 
+#, javascript-format
+msgid "File \"%s\" will be imported into existing notebook \"%s\". Continue?"
+msgstr ""
+
+#, javascript-format
+msgid ""
+"New notebook \"%s\" will be created and file \"%s\" will be imported into "
+"it. Continue?"
+msgstr ""
+
 #, javascript-format
 msgid "Found: %d."
 msgstr ""
@@ -332,7 +339,8 @@ msgstr ""
 msgid "Deletes the notebook without asking for confirmation."
 msgstr ""
 
-msgid "Delete notebook? All notes within this notebook will also be deleted."
+#, javascript-format
+msgid "Delete notebook \"%s\"?"
 msgstr ""
 
 msgid "Deletes the notes matching <note-pattern>."
@@ -351,12 +359,7 @@ msgstr ""
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
-#, javascript-format
-msgid ""
-"Sets the property <name> of the given <note> to the given [value]. Possible "
-"properties are:\n"
-"\n"
-"%s"
+msgid "Sets the property <name> of the given <note> to the given [value]."
 msgstr ""
 
 msgid "Displays summary about the notes and notebooks."
@@ -368,14 +371,6 @@ msgstr ""
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 
-msgid ""
-"Authentication was not completed (did not receive an authentication token)."
-msgstr ""
-
-#, javascript-format
-msgid "Not authentified with %s. Please provide any missing credentials."
-msgstr ""
-
 msgid "Synchronisation is already in progress."
 msgstr ""
 
@@ -386,6 +381,10 @@ msgid ""
 "operation."
 msgstr ""
 
+msgid ""
+"Authentication was not completed (did not receive an authentication token)."
+msgstr ""
+
 #, javascript-format
 msgid "Synchronisation target: %s (%s)"
 msgstr ""
@@ -449,9 +448,6 @@ msgstr ""
 msgid "Possible keys/values:"
 msgstr ""
 
-msgid "Type `joplin help` for usage information."
-msgstr ""
-
 msgid "Fatal error:"
 msgstr ""
 
@@ -473,36 +469,9 @@ msgstr ""
 msgid "Search:"
 msgstr ""
 
-msgid ""
-"Welcome to Joplin!\n"
-"\n"
-"Type `:help shortcuts` for the list of keyboard shortcuts, or just `:help` "
-"for usage information.\n"
-"\n"
-"For example, to create a notebook press `mb`; to create a note press `mn`."
-msgstr ""
-
-msgid ""
-"One or more items are currently encrypted and you may need to supply a "
-"master password. To do so please type `e2ee decrypt`. If you have already "
-"supplied the password, the encrypted items are being decrypted in the "
-"background and will be available soon."
-msgstr ""
-
-#, javascript-format
-msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
 msgid "File"
 msgstr ""
 
-msgid "Directory"
-msgstr ""
-
-#, javascript-format
-msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
-msgstr ""
-
 msgid "New note"
 msgstr ""
 
@@ -512,14 +481,10 @@ msgstr ""
 msgid "New notebook"
 msgstr ""
 
-msgid "Import"
+msgid "Import Evernote notes"
 msgstr ""
 
-msgid "Export"
-msgstr ""
-
-#, javascript-format
-msgid "Hide %s"
+msgid "Evernote Export Files"
 msgstr ""
 
 msgid "Quit"
@@ -540,22 +505,10 @@ msgstr ""
 msgid "Search in all the notes"
 msgstr ""
 
-msgid "View"
-msgstr ""
-
-msgid "Toggle editor layout"
-msgstr ""
-
 msgid "Tools"
 msgstr ""
 
-msgid "Synchronisation status"
-msgstr ""
-
-msgid "Encryption options"
-msgstr ""
-
-msgid "General Options"
+msgid "Options"
 msgstr ""
 
 msgid "Help"
@@ -564,12 +517,6 @@ msgstr ""
 msgid "Website and documentation"
 msgstr ""
 
-msgid "Make a donation"
-msgstr ""
-
-msgid "Check for updates..."
-msgstr ""
-
 msgid "About Joplin"
 msgstr ""
 
@@ -577,112 +524,12 @@ msgstr ""
 msgid "%s %s (%s, %s)"
 msgstr ""
 
-#, javascript-format
-msgid "Open %s"
-msgstr ""
-
-msgid "Exit"
-msgstr ""
-
 msgid "OK"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"Release notes:\n"
-"\n"
-"%s"
-msgstr ""
-
-msgid "An update is available, do you want to download it now?"
-msgstr ""
-
-msgid "Yes"
-msgstr ""
-
-msgid "No"
-msgstr ""
-
-msgid "Current version is up-to-date."
-msgstr ""
-
-msgid "Check synchronisation configuration"
-msgstr ""
-
-#, javascript-format
-msgid "Notes and settings are stored in: %s"
-msgstr ""
-
-msgid "Save"
-msgstr ""
-
-msgid ""
-"Disabling encryption means *all* your notes and attachments are going to be "
-"re-synchronised and sent unencrypted to the sync target. Do you wish to "
-"continue?"
-msgstr ""
-
-msgid ""
-"Enabling encryption means *all* your notes and attachments are going to be "
-"re-synchronised and sent encrypted to the sync target. Do not lose the "
-"password as, for security purposes, this will be the *only* way to decrypt "
-"the data! To enable encryption, please enter your password below."
-msgstr ""
-
-msgid "Disable encryption"
-msgstr ""
-
-msgid "Enable encryption"
-msgstr ""
-
-msgid "Master Keys"
-msgstr ""
-
-msgid "Active"
-msgstr ""
-
-msgid "ID"
-msgstr ""
-
-msgid "Source"
-msgstr ""
-
-msgid "Created"
-msgstr ""
-
-msgid "Updated"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password OK"
-msgstr ""
-
-msgid ""
-"Note: Only one master key is going to be used for encryption (the one marked "
-"as \"active\"). Any of the keys might be used for decryption, depending on "
-"how the notes or notebooks were originally encrypted."
-msgstr ""
-
-msgid "Missing Master Keys"
-msgstr ""
-
-msgid ""
-"The master keys with these IDs are used to encrypt some of your items, "
-"however the application does not currently have access to them. It is likely "
-"they will eventually be downloaded via synchronisation."
-msgstr ""
-
-msgid "Status"
-msgstr ""
-
-msgid "Encryption is:"
-msgstr ""
-
 msgid "Back"
 msgstr ""
 
@@ -694,9 +541,15 @@ msgstr ""
 msgid "Please create a notebook first."
 msgstr ""
 
+msgid "Note title:"
+msgstr ""
+
 msgid "Please create a notebook first"
 msgstr ""
 
+msgid "To-do title:"
+msgstr ""
+
 msgid "Notebook title:"
 msgstr ""
 
@@ -712,24 +565,9 @@ msgstr ""
 msgid "Set alarm:"
 msgstr ""
 
-msgid "Search"
-msgstr ""
-
 msgid "Layout"
 msgstr ""
 
-msgid "Some items cannot be synchronised."
-msgstr ""
-
-msgid "View them now"
-msgstr ""
-
-msgid "Some items cannot be decrypted."
-msgstr ""
-
-msgid "Set the password"
-msgstr ""
-
 msgid "Add or remove tags"
 msgstr ""
 
@@ -745,16 +583,6 @@ msgstr ""
 msgid "No notes in here. Create one by clicking on \"New note\"."
 msgstr ""
 
-msgid ""
-"There is currently no notebook. Create one by clicking on \"New notebook\"."
-msgstr ""
-
-msgid "Open..."
-msgstr ""
-
-msgid "Save as..."
-msgstr ""
-
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
@@ -762,28 +590,9 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
 msgid "Set alarm"
 msgstr ""
 
-#, javascript-format
-msgid ""
-"This note has no content. Click on \"%s\" to toggle the editor and edit the "
-"note."
-msgstr ""
-
-msgid "to-do"
-msgstr ""
-
-msgid "note"
-msgstr ""
-
-#, javascript-format
-msgid "Creating new %s..."
-msgstr ""
-
 msgid "Refresh"
 msgstr ""
 
@@ -793,13 +602,10 @@ msgstr ""
 msgid "OneDrive Login"
 msgstr ""
 
-msgid "Options"
+msgid "Import"
 msgstr ""
 
-msgid "Synchronisation Status"
-msgstr ""
-
-msgid "Encryption Options"
+msgid "Delete notebook?"
 msgstr ""
 
 msgid "Remove this tag from all the notes?"
@@ -817,10 +623,10 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Searches"
+msgid "Tags"
 msgstr ""
 
-msgid "Please select where the sync status should be exported to"
+msgid "Searches"
 msgstr ""
 
 #, javascript-format
@@ -834,18 +640,12 @@ msgstr ""
 msgid "File system"
 msgstr ""
 
-msgid "Nextcloud"
-msgstr ""
-
 msgid "OneDrive"
 msgstr ""
 
 msgid "OneDrive Dev (For testing only)"
 msgstr ""
 
-msgid "WebDAV"
-msgstr ""
-
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr ""
@@ -896,10 +696,6 @@ msgstr ""
 msgid "Deleted remote items: %d."
 msgstr ""
 
-#, javascript-format
-msgid "Fetched items: %d/%d."
-msgstr ""
-
 #, javascript-format
 msgid "State: \"%s\"."
 msgstr ""
@@ -915,12 +711,6 @@ msgstr ""
 msgid "Synchronisation is already in progress. State: %s"
 msgstr ""
 
-msgid "Encrypted"
-msgstr ""
-
-msgid "Encrypted items cannot be modified"
-msgstr ""
-
 msgid "Conflicts"
 msgstr ""
 
@@ -946,6 +736,14 @@ msgstr ""
 msgid "Cannot move note to \"%s\" notebook"
 msgstr ""
 
+msgid "File system synchronisation target directory"
+msgstr ""
+
+msgid ""
+"The path to synchronise with when file system synchronisation is enabled. "
+"See `sync.target`."
+msgstr ""
+
 msgid "Text editor"
 msgstr ""
 
@@ -972,50 +770,18 @@ msgstr ""
 msgid "Dark"
 msgstr ""
 
-msgid "Uncompleted to-dos on top"
-msgstr ""
-
-msgid "Sort notes by"
-msgstr ""
-
-msgid "Reverse sort order"
+msgid "Show uncompleted todos on top of the lists"
 msgstr ""
 
 msgid "Save geo-location with notes"
 msgstr ""
 
-msgid "When creating a new to-do:"
-msgstr ""
-
-msgid "Focus title"
-msgstr ""
-
-msgid "Focus body"
-msgstr ""
-
-msgid "When creating a new note:"
-msgstr ""
-
-msgid "Show tray icon"
-msgstr ""
-
-msgid "Global zoom percentage"
-msgstr ""
-
-msgid "Editor font family"
-msgstr ""
-
-msgid ""
-"The font name will not be checked. If incorrect or empty, it will default to "
-"a generic monospace font."
-msgstr ""
-
-msgid "Automatically update the application"
-msgstr ""
-
 msgid "Synchronisation interval"
 msgstr ""
 
+msgid "Disabled"
+msgstr ""
+
 #, javascript-format
 msgid "%d minutes"
 msgstr ""
@@ -1028,6 +794,9 @@ msgstr ""
 msgid "%d hours"
 msgstr ""
 
+msgid "Automatically update the application"
+msgstr ""
+
 msgid "Show advanced options"
 msgstr ""
 
@@ -1035,85 +804,14 @@ msgid "Synchronisation target"
 msgstr ""
 
 msgid ""
-"The target to synchonise to. Each sync target may have additional parameters "
-"which are named as `sync.NUM.NAME` (all documented below)."
-msgstr ""
-
-msgid "Directory to synchronise with (absolute path)"
-msgstr ""
-
-msgid ""
-"The path to synchronise with when file system synchronisation is enabled. "
-"See `sync.target`."
-msgstr ""
-
-msgid "Nextcloud WebDAV URL"
-msgstr ""
-
-msgid "Nextcloud username"
-msgstr ""
-
-msgid "Nextcloud password"
-msgstr ""
-
-msgid "WebDAV URL"
-msgstr ""
-
-msgid "WebDAV username"
-msgstr ""
-
-msgid "WebDAV password"
+"The target to synchonise to. If synchronising with the file system, set "
+"`sync.2.path` to specify the target directory."
 msgstr ""
 
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
 
-msgid "Joplin Export File"
-msgstr ""
-
-msgid "Markdown"
-msgstr ""
-
-msgid "Joplin Export Directory"
-msgstr ""
-
-msgid "Evernote Export File"
-msgstr ""
-
-#, javascript-format
-msgid "Cannot load \"%s\" module for format \"%s\""
-msgstr ""
-
-#, javascript-format
-msgid "Please specify import format for %s"
-msgstr ""
-
-#, javascript-format
-msgid ""
-"This item is currently encrypted: %s \"%s\". Please wait for all items to be "
-"decrypted and try again."
-msgstr ""
-
-msgid "There is no data to export."
-msgstr ""
-
-msgid "Please specify the notebook where the notes should be imported to."
-msgstr ""
-
-msgid "Items that cannot be synchronised"
-msgstr ""
-
-#, javascript-format
-msgid "%s (%s): %s"
-msgstr ""
-
-msgid ""
-"These items will remain on the device but will not be uploaded to the sync "
-"target. In order to find these items, either search for the title or the ID "
-"(which is displayed in brackets above)."
-msgstr ""
-
 msgid "Sync status (synced items / total items)"
 msgstr ""
 
@@ -1156,10 +854,10 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-msgid "Export Debug Report"
+msgid "Status"
 msgstr ""
 
-msgid "Encryption Config"
+msgid "Export Debug Report"
 msgstr ""
 
 msgid "Configuration"
@@ -1172,9 +870,6 @@ msgstr ""
 msgid "Move %d notes to notebook \"%s\"?"
 msgstr ""
 
-msgid "Press to set the decryption password."
-msgstr ""
-
 msgid "Select date"
 msgstr ""
 
@@ -1184,26 +879,6 @@ msgstr ""
 msgid "Cancel synchronisation"
 msgstr ""
 
-msgid "Joplin website"
-msgstr ""
-
-#, javascript-format
-msgid "Master Key %s"
-msgstr ""
-
-#, javascript-format
-msgid "Created: %s"
-msgstr ""
-
-msgid "Password:"
-msgstr ""
-
-msgid "Password cannot be empty"
-msgstr ""
-
-msgid "Enable"
-msgstr ""
-
 #, javascript-format
 msgid "The notebook could not be saved: %s"
 msgstr ""
@@ -1211,12 +886,6 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
-msgid "Show all"
-msgstr ""
-
-msgid "Errors only"
-msgstr ""
-
 msgid "This note has been modified:"
 msgstr ""
 

CliClient/package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "joplin",
-  "version": "1.0.100",
+  "version": "0.10.77",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
       "requires": {
         "co": "4.6.0",
         "fast-deep-equal": "1.0.0",
@@ -64,11 +64,6 @@
         }
       }
     },
-    "async-mutex": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.3.tgz",
-      "integrity": "sha1-Cq0hEjaXlas/F+M3RFVtLs9UdWY="
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -90,11 +85,6 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
-    "base-64": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
-      "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
@@ -207,11 +197,6 @@
         "delayed-stream": "1.0.0"
       }
     },
-    "compare-version": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
-      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA="
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -426,23 +411,15 @@
       }
     },
     "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
       "requires": {
         "graceful-fs": "4.1.11",
-        "jsonfile": "4.0.0",
+        "jsonfile": "3.0.1",
         "universalify": "0.1.1"
       }
     },
-    "fs-minipass": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-      "requires": {
-        "minipass": "2.2.1"
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -460,7 +437,7 @@
         "ndarray": "1.0.18",
         "ndarray-pack": "1.2.1",
         "node-bitmap": "0.0.1",
-        "omggif": "1.0.9",
+        "omggif": "1.0.8",
         "parse-data-uri": "0.2.0",
         "pngjs": "2.3.1",
         "request": "2.83.0",
@@ -512,7 +489,7 @@
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "5.5.2",
+        "ajv": "5.3.0",
         "har-schema": "2.0.0"
       }
     },
@@ -751,9 +728,9 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
       "requires": {
         "graceful-fs": "4.1.11"
       }
@@ -866,9 +843,9 @@
       }
     },
     "minizlib": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
-      "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz",
+      "integrity": "sha512-sN4U9tIJtBRwKbwgFh9qJfrPIQ/GGTRr1MGqkgOeMTLy8/lM0FcWU//FqlnZ3Vb7gJ+Mxh3FOg1EklibdajbaQ==",
       "requires": {
         "minipass": "2.2.1"
       }
@@ -971,9 +948,9 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "omggif": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz",
-      "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8="
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.8.tgz",
+      "integrity": "sha1-F483sqsLPXtG7ToORr0HkLWNNTA="
     },
     "once": {
       "version": "1.4.0",
@@ -1068,11 +1045,6 @@
         "strict-uri-encode": "1.1.0"
       }
     },
-    "querystringify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
-      "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs="
-    },
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
@@ -1127,11 +1099,6 @@
         "uuid": "3.1.0"
       }
     },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
-    },
     "retry": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
@@ -1169,20 +1136,6 @@
         "semver": "5.4.1",
         "simple-get": "2.7.0",
         "tar": "3.2.1"
-      },
-      "dependencies": {
-        "tar": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-3.2.1.tgz",
-          "integrity": "sha512-ZSzds1E0IqutvMU8HxjMaU8eB7urw2fGwTq88ukDOVuUIh0656l7/P7LiVPxhO5kS4flcRJQk8USG+cghQbTUQ==",
-          "requires": {
-            "chownr": "1.0.1",
-            "minipass": "2.2.1",
-            "minizlib": "1.1.0",
-            "mkdirp": "0.5.1",
-            "yallist": "3.0.2"
-          }
-        }
       }
     },
     "simple-concat": {
@@ -1962,9 +1915,9 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
     "string-kit": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.4.tgz",
-      "integrity": "sha512-imrOojdsXlL6xzfERCxvc/iA9Zwpzbfs+qeP6VB0s0rQVnMc3Nwkyhge0e8Uoayph7PVAwPNmLpohox27G3fgA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.3.tgz",
+      "integrity": "sha512-G2T92klsuE+S9mqdKQyWurFweNQV5X+FRzSKTqYHRdaVUN/4dL6urbYJJ+xb9ep/4XWm+4RNT8j3acncNhFRBg==",
       "requires": {
         "xregexp": "3.2.0"
       }
@@ -2027,14 +1980,13 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "tar": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz",
-      "integrity": "sha512-gJlTiiErwo96K904FnoYWl+5+FBgS+FimU6GMh66XLdLa55al8+d4jeDfPoGwSNHdtWI5FJP6xurmVqhBuGJpQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-3.2.1.tgz",
+      "integrity": "sha512-ZSzds1E0IqutvMU8HxjMaU8eB7urw2fGwTq88ukDOVuUIh0656l7/P7LiVPxhO5kS4flcRJQk8USG+cghQbTUQ==",
       "requires": {
         "chownr": "1.0.1",
-        "fs-minipass": "1.2.5",
         "minipass": "2.2.1",
-        "minizlib": "1.1.0",
+        "minizlib": "1.0.4",
         "mkdirp": "0.5.1",
         "yallist": "3.0.2"
       }
@@ -2062,15 +2014,15 @@
       }
     },
     "terminal-kit": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.14.3.tgz",
-      "integrity": "sha512-ZHtuElnBhK0IXOYNvQ7eYgaArwEoOv7saQc4Q0Z9p02JeC7iajC20/odV77BKB3jw/Qthvf9mpASf8gNDYv7xQ==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.14.0.tgz",
+      "integrity": "sha512-ir0I2QtcBDSg2w0UvohlqdDpGlS3S2UYBG4NnYKnK/4VywgnbfxgdpXN3el0uCH3OeH6fG38luW7RmDM96FqUw==",
       "requires": {
         "async-kit": "2.2.3",
         "get-pixels": "3.3.0",
         "ndarray": "1.0.18",
         "nextgen-events": "0.10.2",
-        "string-kit": "0.6.4",
+        "string-kit": "0.6.3",
         "tree-kit": "0.5.26"
       }
     },
@@ -2080,16 +2032,16 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "tkwidgets": {
-      "version": "0.5.25",
-      "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.25.tgz",
-      "integrity": "sha512-f+12QbxNCLg9Jou5JoPJxATGLmzpDAQeM7QRTXvuqdEB/QvPD9+UlPUL7eYJP1QJv2zzT6EIWWbdpDkXPEtzCQ==",
+      "version": "0.5.20",
+      "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.20.tgz",
+      "integrity": "sha512-9wGsMrrFJvE/6TKUc0dEFFhwxvZLeNsYOxnpy1JCwyk/hYCEF70nuvk7VvJeG4TPaQBaGKPj6c7pCgdREvz4Jw==",
       "requires": {
         "chalk": "2.3.0",
         "emphasize": "1.5.0",
         "node-emoji": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5",
         "slice-ansi": "1.0.0",
         "string-width": "2.1.1",
-        "terminal-kit": "1.14.3",
+        "terminal-kit": "1.14.0",
         "wrap-ansi": "3.0.1"
       },
       "dependencies": {
@@ -2143,15 +2095,6 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
       "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
     },
-    "url-parse": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
-      "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==",
-      "requires": {
-        "querystringify": "1.0.0",
-        "requires-port": "1.0.0"
-      }
-    },
     "url-to-options": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
@@ -2196,20 +2139,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "xml2js": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-      "requires": {
-        "sax": "1.2.4",
-        "xmlbuilder": "9.0.4"
-      }
-    },
-    "xmlbuilder": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
-      "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
-    },
     "xregexp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.2.0.tgz",

CliClient/package.json

@@ -14,12 +14,11 @@
     "title": "Joplin CLI",
     "years": [
       2016,
-      2017,
-      2018
+      2017
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.100",
+  "version": "0.10.77",
   "bin": {
     "joplin": "./main.js"
   },
@@ -28,12 +27,9 @@
   },
   "dependencies": {
     "app-module-path": "^2.2.0",
-    "async-mutex": "^0.1.3",
-    "base-64": "^0.1.0",
-    "compare-version": "^0.1.2",
     "follow-redirects": "^1.2.4",
     "form-data": "^2.1.4",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "^3.0.1",
     "html-entities": "^1.2.1",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
@@ -44,6 +40,7 @@
     "node-emoji": "^1.8.1",
     "node-fetch": "^1.7.1",
     "node-persist": "^2.1.0",
+    "os-tmpdir": "^1.0.2",
     "promise": "^7.1.1",
     "proper-lockfile": "^2.0.1",
     "query-string": "4.3.4",
@@ -56,13 +53,10 @@
     "string-padding": "^1.0.2",
     "string-to-stream": "^1.1.0",
     "strip-ansi": "^4.0.0",
-    "tar": "^4.4.0",
     "tcp-port-used": "^0.1.2",
-    "tkwidgets": "^0.5.25",
-    "url-parse": "^1.2.0",
+    "tkwidgets": "^0.5.20",
     "uuid": "^3.0.1",
     "word-wrap": "^1.2.3",
-    "xml2js": "^0.4.19",
     "yargs-parser": "^7.0.0"
   },
   "devDependencies": {

CliClient/publish.sh

@@ -9,10 +9,4 @@ bash $SCRIPT_DIR/build.sh
 cp "$SCRIPT_DIR/package.json" build/
 cp "$SCRIPT_DIR/../README.md" build/
 cd "$SCRIPT_DIR/build"
-npm publish
-
-NEW_VERSION=$(cat package.json | jq -r .version)
-git add -A
-git commit -m "CLI v$NEW_VERSION"
-git tag "cli-v$NEW_VERSION"
-git push && git push --tags
+npm publish

CliClient/run.sh

@@ -4,4 +4,4 @@ CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 bash "$CLIENT_DIR/build.sh" && node "$CLIENT_DIR/build/main.js" --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@"
 
-# bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/.config/joplin --stack-trace-enabled --log-level debug "$@"
+#bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@"

CliClient/run_test.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BUILD_DIR="$ROOT_DIR/tests-build"
-TEST_FILE="$1"
 
 rsync -a --exclude "node_modules/" "$ROOT_DIR/tests/" "$BUILD_DIR/"
 rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
 rsync -a "$ROOT_DIR/build/locales/" "$BUILD_DIR/locales/"
 mkdir -p "$BUILD_DIR/data"
 
-if [[ $TEST_FILE == "" ]]; then
-	(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js tests-build/encryption.js tests-build/ArrayUtils.js tests-build/models_Setting.js tests-build/services_InteropService.js)
-else
-	(cd "$ROOT_DIR" && npm test tests-build/$TEST_FILE.js)
-fi
+(cd "$ROOT_DIR" && npm test tests-build/synchronizer.js)

CliClient/tests/ArrayUtils.js

@@ -1,47 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const ArrayUtils = require('lib/ArrayUtils.js');
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-describe('ArrayUtils', function() {
-
-	beforeEach(async (done) => {
-		done();
-	});
-
-	it('should remove array elements', async (done) => {
-		let a = ['un', 'deux', 'trois'];
-		a = ArrayUtils.removeElement(a, 'deux');
-
-		expect(a[0]).toBe('un');
-		expect(a[1]).toBe('trois');
-		expect(a.length).toBe(2);
-
-		a = ['un', 'deux', 'trois'];
-		a = ArrayUtils.removeElement(a, 'not in there');
-		expect(a.length).toBe(3);
-
-		done();
-	});
-
-	it('should find items using binary search', async (done) => {
-		let items = ['aaa', 'ccc', 'bbb'];
-		expect(ArrayUtils.binarySearch(items, 'bbb')).toBe(-1); // Array not sorted!
-		items.sort();
-		expect(ArrayUtils.binarySearch(items, 'bbb')).toBe(1);
-		expect(ArrayUtils.binarySearch(items, 'ccc')).toBe(2);
-		expect(ArrayUtils.binarySearch(items, 'oops')).toBe(-1);
-		expect(ArrayUtils.binarySearch(items, 'aaa')).toBe(0);
-
-		items = [];
-		expect(ArrayUtils.binarySearch(items, 'aaa')).toBe(-1);
-
-		done();
-	});
-
-});

CliClient/tests/encryption.js

@@ -1,180 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
-const { Database } = require('lib/database.js');
-const Setting = require('lib/models/Setting.js');
-const BaseItem = require('lib/models/BaseItem.js');
-const BaseModel = require('lib/BaseModel.js');
-const MasterKey = require('lib/models/MasterKey');
-const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
-const EncryptionService = require('lib/services/EncryptionService.js');
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000; // The first test is slow because the database needs to be built
-
-let service = null;
-
-describe('Encryption', function() {
-
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		//await setupDatabaseAndSynchronizer(2);
-		//await switchClient(1);
-		service =  new EncryptionService();
-		BaseItem.encryptionService_ = service;
-		Setting.setValue('encryption.enabled', true);
-		done();
-	});
-
-	it('should encode and decode header', async (done) => {
-		const header = {
-			encryptionMethod: EncryptionService.METHOD_SJCL,
-			masterKeyId: '01234568abcdefgh01234568abcdefgh',
-		};
-
-		const encodedHeader = service.encodeHeader_(header);
-		const decodedHeader = service.decodeHeader_(encodedHeader);
-		delete decodedHeader.length;
-
-		expect(objectsEqual(header, decodedHeader)).toBe(true);
-
-		done();
-	});
-
-	it('should generate and decrypt a master key', async (done) => {
-		const masterKey = await service.generateMasterKey('123456');
-		expect(!!masterKey.checksum).toBe(true);
-		expect(!!masterKey.content).toBe(true);
-
-		let hasThrown = false;
-		try {
-			await service.decryptMasterKey(masterKey, 'wrongpassword');
-		} catch (error) {
-			hasThrown = true;
-		}
-
-		expect(hasThrown).toBe(true);
-
-		const decryptedMasterKey = await service.decryptMasterKey(masterKey, '123456');
-		expect(decryptedMasterKey.length).toBe(512);
-
-		done();
-	});
-
-	it('should encrypt and decrypt with a master key', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		const cipherText = await service.encryptString('some secret');
-		const plainText = await service.decryptString(cipherText);
-
-		expect(plainText).toBe('some secret');
-
-		// Test that a long string, that is going to be split into multiple chunks, encrypt
-		// and decrypt properly too.
-		let veryLongSecret = '';
-		for (let i = 0; i < service.chunkSize() * 3; i++) veryLongSecret += Math.floor(Math.random() * 9);
-
-		const cipherText2 = await service.encryptString(veryLongSecret);
-		const plainText2 = await service.decryptString(cipherText2);
-
-		expect(plainText2 === veryLongSecret).toBe(true);
-
-		done();
-	});
-
-	it('should fail to decrypt if master key not present', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		const cipherText = await service.encryptString('some secret');
-
-		await service.unloadMasterKey(masterKey);
-
-		let hasThrown = await checkThrowAsync(async () => await service.decryptString(cipherText));
-
-		expect(hasThrown).toBe(true);
-
-		done();
-	});
-
-
-	it('should fail to decrypt if data tampered with', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		let cipherText = await service.encryptString('some secret');
-		cipherText += "ABCDEFGHIJ";
-
-		let hasThrown = await checkThrowAsync(async () => await service.decryptString(cipherText));
-
-		expect(hasThrown).toBe(true);
-
-		done();
-	});
-
-	it('should encrypt and decrypt notes and folders', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		let folder = await Folder.save({ title: 'folder' });
-		let note = await Note.save({ title: 'encrypted note', body: 'something', parent_id: folder.id });
-		let serialized = await Note.serializeForSync(note);
-		let deserialized = Note.filter(await Note.unserialize(serialized));
-
-		// Check that required properties are not encrypted
-		expect(deserialized.id).toBe(note.id);
-		expect(deserialized.parent_id).toBe(note.parent_id);
-		expect(deserialized.updated_time).toBe(note.updated_time);
-
-		// Check that at least title and body are encrypted
-		expect(!deserialized.title).toBe(true);
-		expect(!deserialized.body).toBe(true);
-
-		// Check that encrypted data is there
-		expect(!!deserialized.encryption_cipher_text).toBe(true);
-
-		encryptedNote = await Note.save(deserialized);
-		decryptedNote = await Note.decrypt(encryptedNote);
-
-		expect(decryptedNote.title).toBe(note.title);
-		expect(decryptedNote.body).toBe(note.body);
-		expect(decryptedNote.id).toBe(note.id);
-		expect(decryptedNote.parent_id).toBe(note.parent_id);
-
-		done();
-	});
-
-	it('should encrypt and decrypt files', async (done) => {
-		let masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-		await service.loadMasterKey(masterKey, '123456', true);
-
-		const sourcePath = __dirname + '/../tests/support/photo.jpg';
-		const encryptedPath = __dirname + '/data/photo.crypted';
-		const decryptedPath = __dirname + '/data/photo.jpg';
-
-		await service.encryptFile(sourcePath, encryptedPath);
-		await service.decryptFile(encryptedPath, decryptedPath);
-
-		expect(fileContentEqual(sourcePath, encryptedPath)).toBe(false);
-		expect(fileContentEqual(sourcePath, decryptedPath)).toBe(true);
-
-		done();
-	});
-
-});

CliClient/tests/models_Setting.js

@@ -1,32 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const Setting = require('lib/models/Setting.js');
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-describe('models_Setting', function() {
-
-	beforeEach(async (done) => {
-		done();
-	});
-
-	it('should return only sub-values', asyncTest(async () => {
-		const settings = {
-			'sync.5.path': 'http://example.com',
-			'sync.5.username': 'testing',
-		}
-
-		let output = Setting.subValues('sync.5', settings);
-		expect(output['path']).toBe('http://example.com');
-		expect(output['username']).toBe('testing');
-
-		output = Setting.subValues('sync.4', settings);
-		expect('path' in output).toBe(false);
-		expect('username' in output).toBe(false);
-	}));
-
-});

CliClient/tests/services_InteropService.js

@@ -1,252 +0,0 @@
-require('app-module-path').addPath(__dirname);
-
-const { time } = require('lib/time-utils.js');
-const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
-const InteropService = require('lib/services/InteropService.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Tag = require('lib/models/Tag.js');
-const NoteTag = require('lib/models/NoteTag.js');
-const Resource = require('lib/models/Resource.js');
-const fs = require('fs-extra');
-const ArrayUtils = require('lib/ArrayUtils');
-const ObjectUtils = require('lib/ObjectUtils');
-const { shim } = require('lib/shim.js');
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-function exportDir() {
-	return __dirname + '/export';
-}
-
-function fieldsEqual(model1, model2, fieldNames) {
-	for (let i = 0; i < fieldNames.length; i++) {
-		const f = fieldNames[i];
-		expect(model1[f]).toBe(model2[f], 'For key ' + f);
-	}
-}
-
-describe('services_InteropService', function() {
-
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		await switchClient(1);
-
-		const dir = exportDir();
-		await fs.remove(dir);
-		await fs.mkdirp(dir);
-		done();
-	});
-
-	it('should export and import folders', asyncTest(async () => {
-		const service = new InteropService();
-		let folder1 = await Folder.save({ title: "folder1" });
-		folder1 = await Folder.load(folder1.id);
-		const filePath = exportDir() + '/test.jex';
-
-		await service.export({ path: filePath });
-
-		await Folder.delete(folder1.id);
-
-		await service.import({ path: filePath });
-
-		// Check that a new folder, with a new ID, has been created
-
-		expect(await Folder.count()).toBe(1);
-		let folder2 = (await Folder.all())[0];
-		expect(folder2.id).not.toBe(folder1.id);
-		expect(folder2.title).toBe(folder1.title);
-
-		await service.import({ path: filePath });
-
-		// As there was already a folder with the same title, check that the new one has been renamed
-
-		await Folder.delete(folder2.id);
-		let folder3 = (await Folder.all())[0];
-		expect(await Folder.count()).toBe(1);
-		expect(folder3.title).not.toBe(folder2.title);
-
-		let fieldNames = Folder.fieldNames();
-		fieldNames = ArrayUtils.removeElement(fieldNames, 'id');
-		fieldNames = ArrayUtils.removeElement(fieldNames, 'title');
-
-		fieldsEqual(folder3, folder1, fieldNames);
-	}));
-
-	it('should export and import folders and notes', asyncTest(async () => {
-		const service = new InteropService();
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		note1 = await Note.load(note1.id);
-		const filePath = exportDir() + '/test.jex';
-
-		await service.export({ path: filePath });
-
-		await Folder.delete(folder1.id);
-		await Note.delete(note1.id);
-
-		await service.import({ path: filePath });
-
-		expect(await Note.count()).toBe(1);
-		let note2 = (await Note.all())[0];
-		let folder2 = (await Folder.all())[0];
-
-		expect(note1.parent_id).not.toBe(note2.parent_id);
-		expect(note1.id).not.toBe(note2.id);
-		expect(note2.parent_id).toBe(folder2.id);
-
-		let fieldNames = Note.fieldNames();
-		fieldNames = ArrayUtils.removeElement(fieldNames, 'id');
-		fieldNames = ArrayUtils.removeElement(fieldNames, 'parent_id');
-
-		fieldsEqual(note1, note2, fieldNames);
-
-		await service.import({ path: filePath });
-
-		note2 = (await Note.all())[0];
-		let note3 = (await Note.all())[1];
-
-		expect(note2.id).not.toBe(note3.id);
-		expect(note2.parent_id).not.toBe(note3.parent_id);
-
-		fieldsEqual(note2, note3, fieldNames);
-	}));
-
-	it('should export and import notes to specific folder', asyncTest(async () => {
-		const service = new InteropService();
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		note1 = await Note.load(note1.id);
-		const filePath = exportDir() + '/test.jex';
-
-		await service.export({ path: filePath });
-
-		await Note.delete(note1.id);
-
-		await service.import({ path: filePath, destinationFolderId: folder1.id });
-
-		expect(await Note.count()).toBe(1);
-		expect(await Folder.count()).toBe(1);
-
-		expect(await checkThrowAsync(async () => await service.import({ path: filePath, destinationFolderId: 'oops' }))).toBe(true);
-	}));
-
-	it('should export and import tags', asyncTest(async () => {
-		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		let tag1 = await Tag.save({ title: 'mon tag' });
-		tag1 = await Tag.load(tag1.id);
-		await Tag.addNote(tag1.id, note1.id);
-
-		await service.export({ path: filePath });
-
-		await Folder.delete(folder1.id);
-		await Note.delete(note1.id);
-		await Tag.delete(tag1.id);
-
-		await service.import({ path: filePath });
-
-		expect(await Tag.count()).toBe(1);
-		let tag2 = (await Tag.all())[0];
-		let note2 = (await Note.all())[0];
-		expect(tag1.id).not.toBe(tag2.id);
-
-		let fieldNames = Note.fieldNames();
-		fieldNames = ArrayUtils.removeElement(fieldNames, 'id');
-		fieldsEqual(tag1, tag2, fieldNames);
-
-		let noteIds = await Tag.noteIds(tag2.id);
-		expect(noteIds.length).toBe(1);
-		expect(noteIds[0]).toBe(note2.id);
-
-		await service.import({ path: filePath });
-
-		// If importing again, no new tag should be created as one with
-		// the same name already existed. The newly imported note should
-		// however go under that already existing tag.
-		expect(await Tag.count()).toBe(1);
-		noteIds = await Tag.noteIds(tag2.id);
-		expect(noteIds.length).toBe(2);
-	}));
-
-	it('should export and import resources', asyncTest(async () => {
-		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
-		note1 = await Note.load(note1.id);
-		let resourceIds = Note.linkedResourceIds(note1.body);
-		let resource1 = await Resource.load(resourceIds[0]);
-
-		await service.export({ path: filePath });
-		
-		await Note.delete(note1.id);
-
-		await service.import({ path: filePath });
-
-		expect(await Resource.count()).toBe(2);
-
-		let note2 = (await Note.all())[0];
-		expect(note2.body).not.toBe(note1.body);
-		resourceIds = Note.linkedResourceIds(note2.body);
-		expect(resourceIds.length).toBe(1);
-		let resource2 = await Resource.load(resourceIds[0]);
-		expect(resource2.id).not.toBe(resource1.id);
-
-		let fieldNames = Note.fieldNames();
-		fieldNames = ArrayUtils.removeElement(fieldNames, 'id');
-		fieldsEqual(resource1, resource2, fieldNames);
-
-		const resourcePath1 = Resource.fullPath(resource1);
-		const resourcePath2 = Resource.fullPath(resource2);
-
-		expect(resourcePath1).not.toBe(resourcePath2);
-		expect(fileContentEqual(resourcePath1, resourcePath2)).toBe(true);
-	}));
-
-	it('should export and import single notes', asyncTest(async () => {
-		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-
-		await service.export({ path: filePath, sourceNoteIds: [note1.id] });
-		
-		await Note.delete(note1.id);
-		await Folder.delete(folder1.id);
-
-		await service.import({ path: filePath });
-
-		expect(await Note.count()).toBe(1);
-		expect(await Folder.count()).toBe(1);
-
-		let folder2 = (await Folder.all())[0];
-		expect(folder2.title).toBe('test');
-	}));
-
-	it('should export and import single folders', asyncTest(async () => {
-		const service = new InteropService();
-		const filePath = exportDir() + '/test.jex';
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-
-		await service.export({ path: filePath, sourceFolderIds: [folder1.id] });
-		
-		await Note.delete(note1.id);
-		await Folder.delete(folder1.id);
-
-		await service.import({ path: filePath });
-
-		expect(await Note.count()).toBe(1);
-		expect(await Folder.count()).toBe(1);
-
-		let folder2 = (await Folder.all())[0];
-		expect(folder2.title).toBe('folder1');
-	}));
-
-});

CliClient/tests/synchronizer.js

@@ -1,25 +1,21 @@
 require('app-module-path').addPath(__dirname);
 
 const { time } = require('lib/time-utils.js');
-const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('test-utils.js');
-const { shim } = require('lib/shim.js');
-const fs = require('fs-extra');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Resource = require('lib/models/Resource.js');
-const Tag = require('lib/models/Tag.js');
+const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId } = require('test-utils.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
 const { Database } = require('lib/database.js');
-const Setting = require('lib/models/Setting.js');
-const MasterKey = require('lib/models/MasterKey');
-const BaseItem = require('lib/models/BaseItem.js');
-const BaseModel = require('lib/BaseModel.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { BaseModel } = require('lib/base-model.js');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000 + 30000; // The first test is slow because the database needs to be built
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000; // The first test is slow because the database needs to be built
 
 async function allItems() {
 	let folders = await Folder.all();
@@ -27,40 +23,7 @@ async function allItems() {
 	return folders.concat(notes);
 }
 
-async function allSyncTargetItemsEncrypted() {
-	const list = await fileApi().list();
-	const files = list.items;
-
-	//console.info(Setting.value('resourceDir'));
-
-	let totalCount = 0;
-	let encryptedCount = 0;
-	for (let i = 0; i < files.length; i++) {
-		const file = files[i];
-		const remoteContentString = await fileApi().get(file.path);
-		const remoteContent = await BaseItem.unserialize(remoteContentString);
-		const ItemClass = BaseItem.itemClass(remoteContent);
-
-		if (!ItemClass.encryptionSupported()) continue;
-
-		totalCount++;
-
-		if (remoteContent.type_ === BaseModel.TYPE_RESOURCE) {
-			const content = await fileApi().get('.resource/' + remoteContent.id);
-			totalCount++;
-			if (content.substr(0, 5) === 'JED01') output = encryptedCount++;
-		}
-
-		if (!!remoteContent.encryption_applied) encryptedCount++;
-	}
-
-	if (!totalCount) throw new Error('No encryptable item on sync target');
-
-	return totalCount === encryptedCount;
-}
-
 async function localItemsSameAsRemote(locals, expect) {
-	let error = null;
 	try {
 		let files = await fileApi().list();
 		files = files.items;
@@ -75,40 +38,31 @@ async function localItemsSameAsRemote(locals, expect) {
 			expect(!!remote).toBe(true);
 			if (!remote) continue;
 
-			// if (syncTargetId() == SyncTargetRegistry.nameToId('filesystem')) {
-			// 	expect(remote.updated_time).toBe(Math.floor(dbItem.updated_time / 1000) * 1000);
-			// } else {
-			// 	expect(remote.updated_time).toBe(dbItem.updated_time);
-			// }
+			if (syncTargetId() == SyncTargetRegistry.nameToId('filesystem')) {
+				expect(remote.updated_time).toBe(Math.floor(dbItem.updated_time / 1000) * 1000);
+			} else {
+				expect(remote.updated_time).toBe(dbItem.updated_time);
+			}
 
 			let remoteContent = await fileApi().get(path);
-
 			remoteContent = dbItem.type_ == BaseModel.TYPE_NOTE ? await Note.unserialize(remoteContent) : await Folder.unserialize(remoteContent);
 			expect(remoteContent.title).toBe(dbItem.title);
 		}
-	} catch (e) {
-		error = e;
+	} catch (error) {
+		console.error(error);
 	}
-
-	expect(error).toBe(null);
 }
 
-let insideBeforeEach = false;
-
 describe('Synchronizer', function() {
 
-	beforeEach(async (done) => {
-		insideBeforeEach = true;
-
+	beforeEach( async (done) => {
 		await setupDatabaseAndSynchronizer(1);
 		await setupDatabaseAndSynchronizer(2);
 		await switchClient(1);
 		done();
-
-		insideBeforeEach = false;
 	});
 
-	it('should create remote items', asyncTest(async () => {
+	it('should create remote items', async (done) => {
 		let folder = await Folder.save({ title: "folder1" });
 		await Note.save({ title: "un", parent_id: folder.id });
 
@@ -117,9 +71,11 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		await localItemsSameAsRemote(all, expect);
-	}));
 
-	it('should update remote items', asyncTest(async () => {
+		done();
+	});
+
+	it('should update remote item', async (done) => {
 		let folder = await Folder.save({ title: "folder1" });
 		let note = await Note.save({ title: "un", parent_id: folder.id });
 		await synchronizer().start();
@@ -130,9 +86,11 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		await localItemsSameAsRemote(all, expect);
-	}));
 
-	it('should create local items', asyncTest(async () => {
+		done();
+	});
+
+	it('should create local items', async (done) => {
 		let folder = await Folder.save({ title: "folder1" });
 		await Note.save({ title: "un", parent_id: folder.id });
 		await synchronizer().start();
@@ -144,9 +102,11 @@ describe('Synchronizer', function() {
 		let all = await allItems();
 
 		await localItemsSameAsRemote(all, expect);
-	}));
 
-	it('should update local items', asyncTest(async () => {
+		done();
+	});
+
+	it('should update local items', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -171,9 +131,11 @@ describe('Synchronizer', function() {
 		let all = await allItems();
 
 		await localItemsSameAsRemote(all, expect);
-	}));
 
-	it('should resolve note conflicts', asyncTest(async () => {
+		done();
+	});
+
+	it('should resolve note conflicts', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -212,9 +174,11 @@ describe('Synchronizer', function() {
 			if (!noteUpdatedFromRemote.hasOwnProperty(n)) continue;
 			expect(noteUpdatedFromRemote[n]).toBe(note2[n], 'Property: ' + n);
 		}
-	}));
 
-	it('should resolve folders conflicts', asyncTest(async () => {
+		done();
+	});
+
+	it('should resolve folders conflicts', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -245,9 +209,11 @@ describe('Synchronizer', function() {
 
 		let folder1_final = await Folder.load(folder1.id);
 		expect(folder1_final.title).toBe(folder1_modRemote.title);
-	}));
 
-	it('should delete remote notes', asyncTest(async () => {
+		done();
+	});
+
+	it('should delete remote notes', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -270,9 +236,11 @@ describe('Synchronizer', function() {
 
 		let deletedItems = await BaseItem.deletedItems(syncTargetId());
 		expect(deletedItems.length).toBe(0);
-	}));
 
-	it('should not created deleted_items entries for items deleted via sync', asyncTest(async () => {
+		done();
+	});
+
+	it('should delete local notes', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -280,44 +248,21 @@ describe('Synchronizer', function() {
 		await switchClient(2);
 
 		await synchronizer().start();
-		await Folder.delete(folder1.id);
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await synchronizer().start();
-		let deletedItems = await BaseItem.deletedItems(syncTargetId());
-		expect(deletedItems.length).toBe(0);
-	}));
-
-	it('should delete local notes', asyncTest(async () => {
-		// For these tests we pass the context around for each user. This is to make sure that the "deletedItemsProcessed"
-		// property of the basicDelta() function is cleared properly at the end of a sync operation. If it is not cleared
-		// it means items will no longer be deleted locally via sync.
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
-		let note2 = await Note.save({ title: "deux", parent_id: folder1.id });
-		let context1 = await synchronizer().start();
-
-		await switchClient(2);
-
-		let context2 = await synchronizer().start();
 		await Note.delete(note1.id);
-		context2 = await synchronizer().start({ context: context2 });
+		await synchronizer().start();
 
 		await switchClient(1);
 
-		context1 = await synchronizer().start({ context: context1 });
+		await synchronizer().start();
 		let items = await allItems();
-		expect(items.length).toBe(2);
+		expect(items.length).toBe(1);
 		let deletedItems = await BaseItem.deletedItems(syncTargetId());
 		expect(deletedItems.length).toBe(0);
-		await Note.delete(note2.id);
-		context1 = await synchronizer().start({ context: context1 });
-	}));
+		
+		done();
+	});
 
-	it('should delete remote folder', asyncTest(async () => {
+	it('should delete remote folder', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let folder2 = await Folder.save({ title: "folder2" });
 		await synchronizer().start();
@@ -333,10 +278,12 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		let all = await allItems();
-		await localItemsSameAsRemote(all, expect);
-	}));
+		localItemsSameAsRemote(all, expect);
+		
+		done();
+	});
 
-	it('should delete local folder', asyncTest(async () => {
+	it('should delete local folder', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let folder2 = await Folder.save({ title: "folder2" });
 		await synchronizer().start();
@@ -356,10 +303,12 @@ describe('Synchronizer', function() {
 		await synchronizer().start();
 
 		let items = await allItems();
-		await localItemsSameAsRemote(items, expect);
-	}));
+		localItemsSameAsRemote(items, expect);
+		
+		done();
+	});
 
-	it('should resolve conflict if remote folder has been deleted, but note has been added to folder locally', asyncTest(async () => {
+	it('should resolve conflict if remote folder has been deleted, but note has been added to folder locally', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		await synchronizer().start();
 
@@ -377,9 +326,11 @@ describe('Synchronizer', function() {
 		expect(items.length).toBe(1);
 		expect(items[0].title).toBe('note1');
 		expect(items[0].is_conflict).toBe(1);
-			}));
+		
+		done();
+	});
 
-	it('should resolve conflict if note has been deleted remotely and locally', asyncTest(async () => {
+	it('should resolve conflict if note has been deleted remotely and locally', async (done) => {
 		let folder = await Folder.save({ title: "folder" });
 		let note = await Note.save({ title: "note", parent_id: folder.title });
 		await synchronizer().start();
@@ -399,10 +350,12 @@ describe('Synchronizer', function() {
 		expect(items.length).toBe(1);
 		expect(items[0].title).toBe('folder');
 
-		await localItemsSameAsRemote(items, expect);
-	}));
+		localItemsSameAsRemote(items, expect);
+		
+		done();
+	});
 
-	it('should cross delete all folders', asyncTest(async () => {
+	it('should cross delete all folders', async (done) => {
 		// If client1 and 2 have two folders, client 1 deletes item 1 and client
 		// 2 deletes item 2, they should both end up with no items after sync.
 
@@ -438,9 +391,11 @@ describe('Synchronizer', function() {
 
 		expect(items1.length).toBe(0);
 		expect(items1.length).toBe(items2.length);
-			}));
+		
+		done();
+	});
 
-	it('should handle conflict when remote note is deleted then local note is modified', asyncTest(async () => {
+	it('should handle conflict when remote note is deleted then local note is modified', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
 		await synchronizer().start();
@@ -470,9 +425,11 @@ describe('Synchronizer', function() {
 		let unconflictedNotes = await Note.unconflictedNotes();
 
 		expect(unconflictedNotes.length).toBe(0);
-	}));
+		
+		done();
+	});
 
-	it('should handle conflict when remote folder is deleted then local folder is renamed', asyncTest(async () => {
+	it('should handle conflict when remote folder is deleted then local folder is renamed', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let folder2 = await Folder.save({ title: "folder2" });
 		let note1 = await Note.save({ title: "un", parent_id: folder1.id });
@@ -500,9 +457,11 @@ describe('Synchronizer', function() {
 		let items = await allItems();
 
 		expect(items.length).toBe(1);
-	}));
+		
+		done();
+	});
 
-	it('should allow duplicate folder titles', asyncTest(async () => {
+	it('should allow duplicate folder titles', async (done) => {
 		let localF1 = await Folder.save({ title: "folder" });
 
 		await switchClient(2);
@@ -534,15 +493,11 @@ describe('Synchronizer', function() {
 		remoteF2 = await Folder.load(remoteF2.id);
 
 		expect(remoteF2.title == localF2.title).toBe(true);
-	}));
 
-	async function shoudSyncTagTest(withEncryption) {
-		let masterKey = null;
-		if (withEncryption) {
-			Setting.setValue('encryption.enabled', true);
-			masterKey = await loadEncryptionMasterKey();
-		}
+		done();
+	});
 
+	it('should sync tags', async (done) => {
 		let f1 = await Folder.save({ title: "folder" });
 		let n1 = await Note.save({ title: "mynote" });
 		let n2 = await Note.save({ title: "mynote2" });
@@ -552,12 +507,6 @@ describe('Synchronizer', function() {
 		await switchClient(2);
 
 		await synchronizer().start();
-		if (withEncryption) {
-			const masterKey_2 = await MasterKey.load(masterKey.id);
-			await encryptionService().loadMasterKey(masterKey_2, '123456', true);
-			let t = await Tag.load(tag.id);
-			await Tag.decrypt(t);
-		}
 		let remoteTag = await Tag.loadByTitle(tag.title);
 		expect(!!remoteTag).toBe(true);
 		expect(remoteTag.id).toBe(tag.id);
@@ -583,17 +532,11 @@ describe('Synchronizer', function() {
 		noteIds = await Tag.noteIds(tag.id);
 		expect(noteIds.length).toBe(1);
 		expect(remoteNoteIds[0]).toBe(noteIds[0]);
-	}
 
-	it('should sync tags', asyncTest(async () => {
-		await shoudSyncTagTest(false);
-	}));
+		done();
+	});
 
-	it('should sync encrypted tags', asyncTest(async () => {
-		await shoudSyncTagTest(true);
-	}));
-
-	it('should not sync notes with conflicts', asyncTest(async () => {
+	it('should not sync notes with conflicts', async (done) => {
 		let f1 = await Folder.save({ title: "folder" });
 		let n1 = await Note.save({ title: "mynote", parent_id: f1.id, is_conflict: 1 });
 		await synchronizer().start();
@@ -605,9 +548,11 @@ describe('Synchronizer', function() {
 		let folders = await Folder.all()
 		expect(notes.length).toBe(0);
 		expect(folders.length).toBe(1);
-	}));
 
-	it('should not try to delete on remote conflicted notes that have been deleted', asyncTest(async () => {
+		done();
+	});
+
+	it('should not try to delete on remote conflicted notes that have been deleted', async (done) => {
 		let f1 = await Folder.save({ title: "folder" });
 		let n1 = await Note.save({ title: "mynote", parent_id: f1.id });
 		await synchronizer().start();
@@ -620,13 +565,17 @@ describe('Synchronizer', function() {
 		const deletedItems = await BaseItem.deletedItems(syncTargetId());
 
 		expect(deletedItems.length).toBe(0);
-	}));
-	
-	async function ignorableNoteConflictTest(withEncryption) {
-		if (withEncryption) {
-			Setting.setValue('encryption.enabled', true);
-			await loadEncryptionMasterKey();
-		}
+
+		done();
+	});
+
+	it('should not consider it is a conflict if neither the title nor body of the note have changed', async (done) => {
+		// That was previously a common conflict:
+		// - Client 1 mark todo as "done", and sync
+		// - Client 2 doesn't sync, mark todo as "done" todo. Then sync.
+		// In theory it is a conflict because the todo_completed dates are different
+		// but in practice it doesn't matter, we can just take the date when the
+		// todo was marked as "done" the first time.
 
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", is_todo: 1, parent_id: folder1.id });
@@ -635,10 +584,6 @@ describe('Synchronizer', function() {
 		await switchClient(2);
 
 		await synchronizer().start();
-		if (withEncryption) {
-			await loadEncryptionMasterKey(null, true);
-			await decryptionWorker().start();
-		}
 		let note2 = await Note.load(note1.id);
 		note2.todo_completed = time.unixMs()-1;
 		await Note.save(note2);
@@ -653,382 +598,35 @@ describe('Synchronizer', function() {
 		note2conf = await Note.load(note1.id);
 		await synchronizer().start();
 
-		if (!withEncryption) {
-			// That was previously a common conflict:
-			// - Client 1 mark todo as "done", and sync
-			// - Client 2 doesn't sync, mark todo as "done" todo. Then sync.
-			// In theory it is a conflict because the todo_completed dates are different
-			// but in practice it doesn't matter, we can just take the date when the
-			// todo was marked as "done" the first time.
+		let conflictedNotes = await Note.conflictedNotes();
+		expect(conflictedNotes.length).toBe(0);
 
-			let conflictedNotes = await Note.conflictedNotes();
-			expect(conflictedNotes.length).toBe(0);
+		let notes = await Note.all();
+		expect(notes.length).toBe(1);
+		expect(notes[0].id).toBe(note1.id);
+		expect(notes[0].todo_completed).toBe(note2.todo_completed);
 
-			let notes = await Note.all();
-			expect(notes.length).toBe(1);
-			expect(notes[0].id).toBe(note1.id);
-			expect(notes[0].todo_completed).toBe(note2.todo_completed);		
-		} else {
-			// If the notes are encrypted however it's not possible to do this kind of
-			// smart conflict resolving since we don't know the content, so in that
-			// case it's handled as a regular conflict.
+		done();
+	});
 
-			let conflictedNotes = await Note.conflictedNotes();
-			expect(conflictedNotes.length).toBe(1);
-
-			let notes = await Note.all();
-			expect(notes.length).toBe(2);
-		}
-	}
-
-	it('should not consider it is a conflict if neither the title nor body of the note have changed', asyncTest(async () => {
-		await ignorableNoteConflictTest(false);
-	}));
-
-	it('should always handle conflict if local or remote are encrypted', asyncTest(async () => {
-		await ignorableNoteConflictTest(true);
-	}));
-
-	it('items should be downloaded again when user cancels in the middle of delta operation', asyncTest(async () => {
+	it('items should be downloaded again when user cancels in the middle of delta operation', async (done) => {
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: "un", is_todo: 1, parent_id: folder1.id });
 		await synchronizer().start();
 
 		await switchClient(2);
 
-		synchronizer().testingHooks_ = ['cancelDeltaLoop2'];		
+		synchronizer().debugFlags_ = ['cancelDeltaLoop2'];		
 		let context = await synchronizer().start();
 		let notes = await Note.all();
 		expect(notes.length).toBe(0);
 
-		synchronizer().testingHooks_ = [];
+		synchronizer().debugFlags_ = [];
 		await synchronizer().start({ context: context });
 		notes = await Note.all();
 		expect(notes.length).toBe(1);
-	}));
 
-	it('should skip items that cannot be synced', asyncTest(async () => {
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: "un", is_todo: 1, parent_id: folder1.id });
-		const noteId = note1.id;
-		await synchronizer().start();
-		let disabledItems = await BaseItem.syncDisabledItems(syncTargetId());
-		expect(disabledItems.length).toBe(0);
-		await Note.save({ id: noteId, title: "un mod", });
-		synchronizer().testingHooks_ = ['rejectedByTarget'];
-		await synchronizer().start();
-		synchronizer().testingHooks_ = [];
-		await synchronizer().start(); // Another sync to check that this item is now excluded from sync
+		done();
+	});
 
-		await switchClient(2);
-
-		await synchronizer().start();
-		let notes = await Note.all();
-		expect(notes.length).toBe(1);
-		expect(notes[0].title).toBe('un');
-
-		await switchClient(1);
-
-		disabledItems = await BaseItem.syncDisabledItems(syncTargetId());
-		expect(disabledItems.length).toBe(1);
-	}));
-
-	it('notes and folders should get encrypted when encryption is enabled', asyncTest(async () => {
-		Setting.setValue('encryption.enabled', true);
-		const masterKey = await loadEncryptionMasterKey();
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: "un", body: 'to be encrypted', parent_id: folder1.id });
-		await synchronizer().start();
-		// After synchronisation, remote items should be encrypted but local ones remain plain text
-		note1 = await Note.load(note1.id);
-		expect(note1.title).toBe('un');
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		let folder1_2 = await Folder.load(folder1.id);
-		let note1_2 = await Note.load(note1.id);
-		let masterKey_2 = await MasterKey.load(masterKey.id);
-		// On this side however it should be received encrypted
-		expect(!note1_2.title).toBe(true);
-		expect(!folder1_2.title).toBe(true);
-		expect(!!note1_2.encryption_cipher_text).toBe(true);
-		expect(!!folder1_2.encryption_cipher_text).toBe(true);
-		// Master key is already encrypted so it does not get re-encrypted during sync
-		expect(masterKey_2.content).toBe(masterKey.content);
-		expect(masterKey_2.checksum).toBe(masterKey.checksum);
-		// Now load the master key we got from client 1 and try to decrypt
-		await encryptionService().loadMasterKey(masterKey_2, '123456', true);
-		// Get the decrypted items back
-		await Folder.decrypt(folder1_2);
-		await Note.decrypt(note1_2);
-		folder1_2 = await Folder.load(folder1.id);
-		note1_2 = await Note.load(note1.id);
-		// Check that properties match the original items. Also check
-		// the encryption did not affect the updated_time timestamp.
-		expect(note1_2.title).toBe(note1.title);
-		expect(note1_2.body).toBe(note1.body);
-		expect(note1_2.updated_time).toBe(note1.updated_time);
-		expect(!note1_2.encryption_cipher_text).toBe(true);
-		expect(folder1_2.title).toBe(folder1.title);
-		expect(folder1_2.updated_time).toBe(folder1.updated_time);
-		expect(!folder1_2.encryption_cipher_text).toBe(true);
-	}));
-
-	it('should enable encryption automatically when downloading new master key (and none was previously available)',asyncTest(async () => {
-		// Enable encryption on client 1 and sync an item
-		Setting.setValue('encryption.enabled', true);
-		await loadEncryptionMasterKey();
-		let folder1 = await Folder.save({ title: "folder1" });
-		await synchronizer().start();
-
-		await switchClient(2);
-
-		// Synchronising should enable encryption since we're going to get a master key
-		expect(Setting.value('encryption.enabled')).toBe(false);
-		await synchronizer().start();
-		expect(Setting.value('encryption.enabled')).toBe(true);
-
-		// Check that we got the master key from client 1
-		const masterKey = (await MasterKey.all())[0];
-		expect(!!masterKey).toBe(true);
-
-		// Since client 2 hasn't supplied a password yet, no master key is currently loaded
-		expect(encryptionService().loadedMasterKeyIds().length).toBe(0);
-
-		// If we sync now, nothing should be sent to target since we don't have a password.
-		// Technically it's incorrect to set the property of an encrypted variable but it allows confirming
-		// that encryption doesn't work if user hasn't supplied a password.
-		await BaseItem.forceSync(folder1.id);
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await synchronizer().start();
-		folder1 = await Folder.load(folder1.id);
-		expect(folder1.title).toBe('folder1'); // Still at old value
-
-		await switchClient(2);
-
-		// Now client 2 set the master key password
-		Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-
-		// Now that master key should be loaded
-		expect(encryptionService().loadedMasterKeyIds()[0]).toBe(masterKey.id);
-
-		// Decrypt all the data. Now change the title and sync again - this time the changes should be transmitted
-		await decryptionWorker().start();
-		folder1_2 = await Folder.save({ id: folder1.id, title: "change test" });
-
-		// If we sync now, this time client 1 should get the changes we did earlier
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await synchronizer().start();
-		// Decrypt the data we just got
-		await decryptionWorker().start();
-		folder1 = await Folder.load(folder1.id);
-		expect(folder1.title).toBe('change test'); // Got title from client 2
-	}));
-
-	it('should encrypt existing notes too when enabling E2EE', asyncTest(async () => {
-		// First create a folder, without encryption enabled, and sync it
-		let folder1 = await Folder.save({ title: "folder1" });
-		await synchronizer().start();
-		let files = await fileApi().list()
-		let content = await fileApi().get(files.items[0].path);
-		expect(content.indexOf('folder1') >= 0).toBe(true)
-
-		// Then enable encryption and sync again
-		let masterKey = await encryptionService().generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-		await encryptionService().enableEncryption(masterKey, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-		await synchronizer().start();
-		
-		// Even though the folder has not been changed it should have been synced again so that
-		// an encrypted version of it replaces the decrypted version.
-		files = await fileApi().list()
-		expect(files.items.length).toBe(2);
-		// By checking that the folder title is not present, we can confirm that the item has indeed been encrypted
-		// One of the two items is the master key
-		content = await fileApi().get(files.items[0].path);
-		expect(content.indexOf('folder1') < 0).toBe(true);
-		content = await fileApi().get(files.items[1].path);
-		expect(content.indexOf('folder1') < 0).toBe(true);
-	}));
-
-	it('should sync resources', asyncTest(async () => {
-		while (insideBeforeEach) await time.msleep(500);
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
-		let resource1 = (await Resource.all())[0];
-		let resourcePath1 = Resource.fullPath(resource1);
-		await synchronizer().start();
-		expect((await fileApi().list()).items.length).toBe(3);
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		let allResources = await Resource.all();
-		expect(allResources.length).toBe(1);
-		let resource1_2 = allResources[0];
-		let resourcePath1_2 = Resource.fullPath(resource1_2);
-
-		expect(resource1_2.id).toBe(resource1.id);
-		expect(fileContentEqual(resourcePath1, resourcePath1_2)).toBe(true);
-	}));
-
-	it('should encryt resources', asyncTest(async () => {
-		Setting.setValue('encryption.enabled', true);
-		const masterKey = await loadEncryptionMasterKey();
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
-		let resource1 = (await Resource.all())[0];
-		let resourcePath1 = Resource.fullPath(resource1);
-		await synchronizer().start();
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-
-		let resource1_2 = (await Resource.all())[0];
-		resource1_2 = await Resource.decrypt(resource1_2);
-		let resourcePath1_2 = Resource.fullPath(resource1_2);
-
-		expect(fileContentEqual(resourcePath1, resourcePath1_2)).toBe(true);
-	}));
-
-	it('should upload decrypted items to sync target after encryption disabled', asyncTest(async () => {
-		Setting.setValue('encryption.enabled', true);
-		const masterKey = await loadEncryptionMasterKey();
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		await synchronizer().start();
-
-		let allEncrypted = await allSyncTargetItemsEncrypted();
-		expect(allEncrypted).toBe(true);
-
-		await encryptionService().disableEncryption();
-
-		await synchronizer().start();
-		allEncrypted = await allSyncTargetItemsEncrypted();
-		expect(allEncrypted).toBe(false);
-	}));
-
-	it('should not upload any item if encryption was enabled, and items have not been decrypted, and then encryption disabled', asyncTest(async () => {
-		// For some reason I can't explain, this test is sometimes executed before beforeEach is finished
-		// which means it's going to fail in unexpected way. So the loop below wait for beforeEach to be done.
-		while (insideBeforeEach) await time.msleep(100);
-
-		Setting.setValue('encryption.enabled', true);
-		const masterKey = await loadEncryptionMasterKey();
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		await synchronizer().start();
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		expect(Setting.value('encryption.enabled')).toBe(true);
-
-		// If we try to disable encryption now, it should throw an error because some items are
-		// currently encrypted. They must be decrypted first so that they can be sent as
-		// plain text to the sync target.
-		//let hasThrown = await checkThrowAsync(async () => await encryptionService().disableEncryption());
-		//expect(hasThrown).toBe(true);
-
-		// Now supply the password, and decrypt the items
-		Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
-		await encryptionService().loadMasterKeysFromSettings();	
-		await decryptionWorker().start();
-
-		// Try to disable encryption again
-		hasThrown = await checkThrowAsync(async () => await encryptionService().disableEncryption());
-		expect(hasThrown).toBe(false);
-
-		// If we sync now the target should receive the decrypted items
-		await synchronizer().start();
-		allEncrypted = await allSyncTargetItemsEncrypted();
-		expect(allEncrypted).toBe(false);
-	}));
-
-	it('should encrypt remote resources after encryption has been enabled', asyncTest(async () => {
-		while (insideBeforeEach) await time.msleep(100);
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
-		let resource1 = (await Resource.all())[0];
-		await synchronizer().start();
-
-		expect(await allSyncTargetItemsEncrypted()).toBe(false);
-
-		const masterKey = await loadEncryptionMasterKey();
-		await encryptionService().enableEncryption(masterKey, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-
-		await synchronizer().start();
-
-		expect(await allSyncTargetItemsEncrypted()).toBe(true);
-	}));
-
-	it('should upload encrypted resource, but it should not mark the blob as encrypted locally', asyncTest(async () => {
-		while (insideBeforeEach) await time.msleep(100);
-
-		let folder1 = await Folder.save({ title: "folder1" });
-		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
-		await shim.attachFileToNote(note1, __dirname + '/../tests/support/photo.jpg');
-		const masterKey = await loadEncryptionMasterKey();
-		await encryptionService().enableEncryption(masterKey, '123456');
-		await encryptionService().loadMasterKeysFromSettings();
-		await synchronizer().start();
-
-		let resource1 = (await Resource.all())[0];
-		expect(resource1.encryption_blob_encrypted).toBe(0);
-	}));
-
-	it('should create remote items with UTF-8 content', asyncTest(async () => {
-		let folder = await Folder.save({ title: "Fahrräder" });
-		await Note.save({ title: "Fahrräder", body: "Fahrräder", parent_id: folder.id });
-		let all = await allItems();
-
-		await synchronizer().start();
-
-		await localItemsSameAsRemote(all, expect);
-	}));
-
-	it("should update remote items but not pull remote changes", asyncTest(async () => {
-		let folder = await Folder.save({ title: "folder1" });
-		let note = await Note.save({ title: "un", parent_id: folder.id });
-		await synchronizer().start();
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		await Note.save({ title: "deux", parent_id: folder.id });
-		await synchronizer().start();
-
-		await switchClient(1);
-
-		await Note.save({ title: "un UPDATE", id: note.id });
-		await synchronizer().start({ syncSteps: ["update_remote"] });
-		let all = await allItems();
-		expect(all.length).toBe(2);
-
-		await switchClient(2);
-
-		await synchronizer().start();
-		let note2 = await Note.load(note.id);
-		expect(note2.title).toBe("un UPDATE");
-	}));
-
-});
+});

CliClient/tests/test-utils.js

@@ -1,47 +1,34 @@
 const fs = require('fs-extra');
 const { JoplinDatabase } = require('lib/joplin-database.js');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
-const BaseModel = require('lib/BaseModel.js');
-const Folder = require('lib/models/Folder.js');
-const Note = require('lib/models/Note.js');
-const Resource = require('lib/models/Resource.js');
-const Tag = require('lib/models/Tag.js');
-const NoteTag = require('lib/models/NoteTag.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Resource } = require('lib/models/resource.js');
+const { Tag } = require('lib/models/tag.js');
+const { NoteTag } = require('lib/models/note-tag.js');
 const { Logger } = require('lib/logger.js');
-const Setting = require('lib/models/Setting.js');
-const MasterKey = require('lib/models/MasterKey');
-const BaseItem = require('lib/models/BaseItem.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
 const { Synchronizer } = require('lib/synchronizer.js');
 const { FileApi } = require('lib/file-api.js');
 const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js');
 const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
-const { FileApiDriverWebDav } = require('lib/file-api-driver-webdav.js');
 const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { time } = require('lib/time-utils.js');
-const { shimInit } = require('lib/shim-init-node.js');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
 const SyncTargetMemory = require('lib/SyncTargetMemory.js');
 const SyncTargetFilesystem = require('lib/SyncTargetFilesystem.js');
 const SyncTargetOneDrive = require('lib/SyncTargetOneDrive.js');
-const SyncTargetNextcloud = require('lib/SyncTargetNextcloud.js');
-const EncryptionService = require('lib/services/EncryptionService.js');
-const DecryptionWorker = require('lib/services/DecryptionWorker.js');
-const WebDavApi = require('lib/WebDavApi');
 
 let databases_ = [];
 let synchronizers_ = [];
-let encryptionServices_ = [];
-let decryptionWorkers_ = [];
 let fileApi_ = null;
 let currentClient_ = 1;
 
-shimInit();
-
 const fsDriver = new FsDriverNode();
 Logger.fsDriver_ = fsDriver;
 Resource.fsDriver_ = fsDriver;
-EncryptionService.fsDriver_ = fsDriver;
-FileApiDriverLocal.fsDriver_ = fsDriver;
 
 const logDir = __dirname + '/../tests/logs';
 fs.mkdirpSync(logDir, 0o755);
@@ -49,34 +36,25 @@ fs.mkdirpSync(logDir, 0o755);
 SyncTargetRegistry.addClass(SyncTargetMemory);
 SyncTargetRegistry.addClass(SyncTargetFilesystem);
 SyncTargetRegistry.addClass(SyncTargetOneDrive);
-SyncTargetRegistry.addClass(SyncTargetNextcloud);
 
-// const syncTargetId_ = SyncTargetRegistry.nameToId("nextcloud");
-const syncTargetId_ = SyncTargetRegistry.nameToId("memory");
-//const syncTargetId_ = SyncTargetRegistry.nameToId('filesystem');
+const syncTargetId_ = SyncTargetRegistry.nameToId('memory');
 const syncDir = __dirname + '/../tests/sync';
 
-const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1001 : 100;//400;
-
-console.info('Testing with sync target: ' + SyncTargetRegistry.idToName(syncTargetId_));
+const sleepTime = syncTargetId_ == SyncTargetRegistry.nameToId('filesystem') ? 1001 : 400;
 
 const logger = new Logger();
-logger.addTarget('console');
 logger.addTarget('file', { path: logDir + '/log.txt' });
-logger.setLevel(Logger.LEVEL_WARN); // Set to INFO to display sync process in console
+logger.setLevel(Logger.LEVEL_DEBUG);
 
 BaseItem.loadClass('Note', Note);
 BaseItem.loadClass('Folder', Folder);
 BaseItem.loadClass('Resource', Resource);
 BaseItem.loadClass('Tag', Tag);
 BaseItem.loadClass('NoteTag', NoteTag);
-BaseItem.loadClass('MasterKey', MasterKey);
 
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
 
-Setting.autoSaveEnabled = false;
-
 function syncTargetId() {
 	return syncTargetId_;
 }
@@ -100,15 +78,10 @@ async function switchClient(id) {
 	BaseItem.db_ = databases_[id];
 	Setting.db_ = databases_[id];
 
-	BaseItem.encryptionService_ = encryptionServices_[id];
-	Resource.encryptionService_ = encryptionServices_[id];
-
-	Setting.setConstant('resourceDir', resourceDir(id));
-
 	return Setting.load();
 }
 
-async function clearDatabase(id = null) {
+function clearDatabase(id = null) {
 	if (id === null) id = currentClient_;
 
 	let queries = [
@@ -117,46 +90,35 @@ async function clearDatabase(id = null) {
 		'DELETE FROM resources',
 		'DELETE FROM tags',
 		'DELETE FROM note_tags',
-		'DELETE FROM master_keys',
-		'DELETE FROM settings',
 		
 		'DELETE FROM deleted_items',
 		'DELETE FROM sync_items',
 	];
 
-	await databases_[id].transactionExecBatch(queries);
+	return databases_[id].transactionExecBatch(queries);
 }
 
-async function setupDatabase(id = null) {
+function setupDatabase(id = null) {
 	if (id === null) id = currentClient_;
 
-	Setting.cancelScheduleSave();
-	Setting.cache_ = null;
-
 	if (databases_[id]) {
-		await clearDatabase(id);
-		await Setting.load();
-		return;
+		return clearDatabase(id).then(() => {
+			return Setting.load();
+		});
 	}
 
 	const filePath = __dirname + '/data/test-' + id + '.sqlite';
-
-	try {
-		await fs.unlink(filePath);
-	} catch (error) {
+	return fs.unlink(filePath).catch(() => {
 		// Don't care if the file doesn't exist
-	};
-
-	databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
-	await databases_[id].open({ name: filePath });
-
-	BaseModel.db_ = databases_[id];
-	await Setting.load();
-}
-
-function resourceDir(id = null) {
-	if (id === null) id = currentClient_;
-	return __dirname + '/data/resources-' + id;
+	}).then(() => {
+		databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
+		// databases_[id].setLogger(logger);
+		// console.info(filePath);
+		return databases_[id].open({ name: filePath }).then(() => {
+			BaseModel.db_ = databases_[id];
+			return setupDatabase(id);
+		});
+	});
 }
 
 async function setupDatabaseAndSynchronizer(id = null) {
@@ -164,26 +126,20 @@ async function setupDatabaseAndSynchronizer(id = null) {
 
 	await setupDatabase(id);
 
-	EncryptionService.instance_ = null;
-	DecryptionWorker.instance_ = null;
-
-	await fs.remove(resourceDir(id));
-	await fs.mkdirp(resourceDir(id), 0o755);
-
 	if (!synchronizers_[id]) {
 		const SyncTargetClass = SyncTargetRegistry.classById(syncTargetId_);
 		const syncTarget = new SyncTargetClass(db(id));
 		syncTarget.setFileApi(fileApi());
 		syncTarget.setLogger(logger);
 		synchronizers_[id] = await syncTarget.synchronizer();
-		synchronizers_[id].autoStartDecryptionWorker_ = false; // For testing we disable this since it would make the tests non-deterministic
 	}
 
-	encryptionServices_[id] = new EncryptionService();
-	decryptionWorkers_[id] = new DecryptionWorker();
-	decryptionWorkers_[id].setEncryptionService(encryptionServices_[id]);
-
-	await fileApi().clearRoot();
+	if (syncTargetId_ == SyncTargetRegistry.nameToId('filesystem')) {
+		fs.removeSync(syncDir)
+		fs.mkdirpSync(syncDir, 0o755);
+	} else {
+		await fileApi().format();
+	}
 }
 
 function db(id = null) {
@@ -196,35 +152,6 @@ function synchronizer(id = null) {
 	return synchronizers_[id];
 }
 
-function encryptionService(id = null) {
-	if (id === null) id = currentClient_;
-	return encryptionServices_[id];
-}
-
-function decryptionWorker(id = null) {
-	if (id === null) id = currentClient_;
-	return decryptionWorkers_[id];
-}
-
-async function loadEncryptionMasterKey(id = null, useExisting = false) {
-	const service = encryptionService(id);
-
-	let masterKey = null;
-
-	if (!useExisting) { // Create it
-		masterKey = await service.generateMasterKey('123456');
-		masterKey = await MasterKey.save(masterKey);
-	} else { // Use the one already available
-		materKey = await MasterKey.all();
-		if (!materKey.length) throw new Error('No mater key available');
-		masterKey = materKey[0];
-	}
-
-	await service.loadMasterKey(masterKey, '123456', true);
-
-	return masterKey;
-}
-
 function fileApi() {
 	if (fileApi_) return fileApi_;
 
@@ -234,17 +161,7 @@ function fileApi() {
 		fileApi_ = new FileApi(syncDir, new FileApiDriverLocal());
 	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('memory')) {
 		fileApi_ = new FileApi('/root', new FileApiDriverMemory());
-	} else if (syncTargetId_ == SyncTargetRegistry.nameToId('nextcloud')) {
-		const options = {
-			baseUrl: () => 'http://nextcloud.local/remote.php/dav/files/admin/JoplinTest',
-			username: () => 'admin',
-			password: () => '123456',
-		};
-
-		const api = new WebDavApi(options);
-		fileApi_ = new FileApi('', new FileApiDriverWebDav(api));
 	}
-
 	// } else if (syncTargetId == Setting.SYNC_TARGET_ONEDRIVE) {
 	// 	let auth = require('./onedrive-auth.json');
 	// 	if (!auth) {
@@ -264,47 +181,7 @@ function fileApi() {
 
 	fileApi_.setLogger(logger);
 	fileApi_.setSyncTargetId(syncTargetId_);
-	fileApi_.requestRepeatCount_ = 0;
 	return fileApi_;
 }
 
-function objectsEqual(o1, o2) {
-	if (Object.getOwnPropertyNames(o1).length !== Object.getOwnPropertyNames(o2).length) return false;
-	for (let n in o1) {
-		if (!o1.hasOwnProperty(n)) continue;
-		if (o1[n] !== o2[n]) return false;
-	}
-	return true;
-}
-
-async function checkThrowAsync(asyncFn) {
-	let hasThrown = false;
-	try {
-		await asyncFn();
-	} catch (error) {
-		hasThrown = true;
-	}
-	return hasThrown;
-}
-
-function fileContentEqual(path1, path2) {
-	const fs = require('fs-extra');
-	const content1 = fs.readFileSync(path1, 'base64');
-	const content2 = fs.readFileSync(path2, 'base64');
-	return content1 === content2;
-}
-
-// Wrap an async test in a try/catch block so that done() is always called
-// and display a proper error message instead of "unhandled promise error"
-function asyncTest(callback) {
-	return async function(done) {
-		try {
-			await callback();
-		} catch (error) {
-			console.error(error);
-		}
-		done();
-	}
-}
-
-module.exports = { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest };
+module.exports = { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId };