Trying to add plugin support for mobile app

It updates fuzzy translations for Korean.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>

.eslintignore

@@ -105,7 +105,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js

.gitignore

@@ -99,7 +99,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js

.ignore

@@ -48,7 +48,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js

CliClient/locales-build/index.js

@@ -38,33 +38,33 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":79};
+stats['ar'] = {"percentDone":78};
 stats['eu'] = {"percentDone":33};
 stats['bs_BA'] = {"percentDone":82};
 stats['bg_BG'] = {"percentDone":65};
 stats['ca'] = {"percentDone":95};
 stats['hr_HR'] = {"percentDone":27};
-stats['cs_CZ'] = {"percentDone":99};
-stats['da_DK'] = {"percentDone":73};
+stats['cs_CZ'] = {"percentDone":98};
+stats['da_DK'] = {"percentDone":72};
 stats['de_DE'] = {"percentDone":97};
 stats['et_EE'] = {"percentDone":65};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":99};
+stats['es_ES'] = {"percentDone":98};
 stats['eo'] = {"percentDone":37};
 stats['fr_FR'] = {"percentDone":98};
 stats['gl_ES'] = {"percentDone":42};
 stats['id_ID'] = {"percentDone":92};
 stats['it_IT'] = {"percentDone":98};
-stats['nl_BE'] = {"percentDone":33};
 stats['nl_NL'] = {"percentDone":94};
+stats['nl_BE'] = {"percentDone":33};
 stats['nb_NO'] = {"percentDone":87};
 stats['fa'] = {"percentDone":82};
 stats['pl_PL'] = {"percentDone":97};
 stats['pt_PT'] = {"percentDone":98};
-stats['pt_BR'] = {"percentDone":95};
+stats['pt_BR'] = {"percentDone":96};
 stats['ro'] = {"percentDone":77};
-stats['sl_SI'] = {"percentDone":42};
+stats['sl_SI'] = {"percentDone":41};
 stats['sv'] = {"percentDone":70};
 stats['th_TH'] = {"percentDone":52};
 stats['vi'] = {"percentDone":84};
@@ -74,6 +74,6 @@ stats['ru_RU'] = {"percentDone":94};
 stats['sr_RS'] = {"percentDone":70};
 stats['zh_CN'] = {"percentDone":95};
 stats['zh_TW'] = {"percentDone":94};
-stats['ja_JP'] = {"percentDone":97};
+stats['ja_JP'] = {"percentDone":99};
 stats['ko'] = {"percentDone":99};
 module.exports = { locales: locales, stats: stats };

CliClient/package-lock.json

@@ -23,9 +23,9 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
     },
     "abab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
     },
     "abbrev": {
       "version": "1.1.1",
@@ -33,9 +33,9 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "acorn": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-      "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
     },
     "acorn-globals": {
       "version": "4.3.4",
@@ -47,9 +47,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
+          "version": "6.4.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
         }
       }
     },
@@ -2964,9 +2964,9 @@
       "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
     },
     "highlight.js": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz",
-      "integrity": "sha512-b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.1.tgz",
+      "integrity": "sha512-A+sckVPIb9zQTUydC9lpRX1qRFO/N0OKEh0NwIr65ckvWA/oMY8v9P3+kGRK3w2ULSh9E8v5MszXafodQ6039g=="
     },
     "homedir-polyfill": {
       "version": "1.0.3",
@@ -3655,9 +3655,9 @@
       "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
     },
     "joplin-turndown": {
-      "version": "4.0.29",
-      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.29.tgz",
-      "integrity": "sha512-rVGu8u4TpSRETo59/jiVW9iaXnpdxxpBHjb7nyCflkDfWhg1Kska4uagBQGw7cD2yxw7mB2YUIB/fAgtlIzcDQ==",
+      "version": "4.0.30",
+      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.30.tgz",
+      "integrity": "sha512-OrGdNTsjI6/cbx/es9Hl0YI3YTql4SopduFcYCnWTZgqT0SJqILnF2JQxSNnbPnkSDIIRdNOG4+iNzlY6bS1nw==",
       "requires": {
         "css": "^2.2.4",
         "html-entities": "^1.2.1",
@@ -5573,13 +5573,6 @@
       "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
       "requires": {
         "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
-        }
       }
     },
     "request-promise-native": {

CliClient/package.json

@@ -52,14 +52,14 @@
     "font-awesome-filetypes": "^2.1.0",
     "form-data": "^2.1.4",
     "fs-extra": "^5.0.0",
-    "highlight.js": "10.1.1",
+    "highlight.js": "^10.2.1",
     "html-entities": "^1.2.1",
     "html-minifier": "^3.5.15",
     "htmlparser2": "^4.1.0",
     "image-data-uri": "^2.0.0",
     "image-type": "^3.0.0",
     "immer": "^7.0.14",
-    "joplin-turndown": "^4.0.29",
+    "joplin-turndown": "^4.0.30",
     "joplin-turndown-plugin-gfm": "^1.0.12",
     "json-stringify-safe": "^5.0.1",
     "jssha": "^2.3.0",

CliClient/tests/enex_to_html/attachment.html

@@ -1,5 +1,5 @@
 <en-note>
-  <div><a href="joplin://21ca2b948f222a38802940ec7e2e5de3" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">attachment-1</a></div>
+  <div><a href=":/21ca2b948f222a38802940ec7e2e5de3" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">attachment-1</a></div>
   <div>
     <br>
   </div>

CliClient/tests/html_to_md/anchor_with_brackets.html

@@ -0,0 +1 @@
+<a href="https://images.macrumors.com/filters:quality(90)/article.html"/>testing</a>

CliClient/tests/html_to_md/anchor_with_brackets.md

@@ -0,0 +1 @@
+[testing](https://images.macrumors.com/filters:quality%2890%29/article.html)

CliClient/tests/html_to_md/image_with_brackets.html

@@ -0,0 +1 @@
+<img src="https://images.macrumors.com/filters:quality(90)/article/test.jpg?high"/>

CliClient/tests/html_to_md/image_with_brackets.md

@@ -0,0 +1 @@
+![](https://images.macrumors.com/filters:quality%2890%29/article/test.jpg?high)

CliClient/tests/html_to_md/image_with_title1.html

@@ -0,0 +1 @@
+<img src="https://example.com/test.jpg" title="hello"/>

CliClient/tests/html_to_md/image_with_title1.md

@@ -0,0 +1 @@
+![](https://example.com/test.jpg "hello")

CliClient/tests/html_to_md/image_with_title2.html

@@ -0,0 +1 @@
+<img src="https://example.com/test.jpg" title='hello &amp; "(ouch)"'/>

CliClient/tests/html_to_md/image_with_title2.md

@@ -0,0 +1 @@
+![](https://example.com/test.jpg "hello & "(ouch)"")

CliClient/tests/models_BaseItem.js

@@ -104,4 +104,14 @@ describe('models_BaseItem', function() {
 
 		expect(noteAfter).toEqual(noteBefore);
 	}));
+
+	it('should serialize and unserialize properties that contain new lines', asyncTest(async () => {
+		const note = await Note.save({ title: 'note', source_url: '\nhttps://joplinapp.org/\n' });
+
+		const noteBefore = await Note.load(note.id);
+		const serialized = await Note.serialize(noteBefore);
+		const noteAfter = await Note.unserialize(serialized);
+
+		expect(noteAfter).toEqual(noteBefore);
+	}));
 });

Clipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self'; object-src 'self'",

Clipper/popup/package.json

@@ -55,7 +55,7 @@
   },
   "scripts": {
     "start": "node scripts/start.js",
-    "build": "SKIP_PREFLIGHT_CHECK=true node scripts/build.js",
+    "build": "node scripts/build.js SKIP_PREFLIGHT_CHECK",
     "test": "node scripts/test.js --env=jsdom",
     "watch": "cra-build-watch",
     "postinstall": "node postinstall.js && npm run build"

Clipper/popup/scripts/build.js

@@ -1,5 +1,9 @@
 'use strict';
 
+if (process.argv && process.argv.indexOf('SKIP_PREFLIGHT_CHECK') >= 0) {
+	process.env.SKIP_PREFLIGHT_CHECK = 'true';
+}
+
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'production';
 process.env.NODE_ENV = 'production';

Clipper/popup/src/bridge.js

@@ -148,10 +148,10 @@ class Bridge {
 					this.dispatch({ type: 'CLIPPER_SERVER_SET', foundState: 'found', port: state.port });
 
 					const folders = await this.folderTree();
-					this.dispatch({ type: 'FOLDERS_SET', folders: folders });
+					this.dispatch({ type: 'FOLDERS_SET', folders: folders.items ? folders.items : folders });
 
 					const tags = await this.clipperApiExec('GET', 'tags');
-					this.dispatch({ type: 'TAGS_SET', tags: tags });
+					this.dispatch({ type: 'TAGS_SET', tags: tags.items ? tags.items : tags });
 
 					bridge().restoreState();
 					return;
@@ -245,7 +245,7 @@ class Bridge {
 	}
 
 	async folderTree() {
-		return this.clipperApiExec('GET', 'folders');
+		return this.clipperApiExec('GET', 'folders', { as_tree: 1 });
 	}
 
 	async storageSet(keys) {

ElectronClient/app.ts

@@ -46,6 +46,7 @@ const commands = [
 	require('./gui/MainScreen/commands/moveToFolder'),
 	require('./gui/MainScreen/commands/newNote'),
 	require('./gui/MainScreen/commands/newFolder'),
+	require('./gui/MainScreen/commands/newSubFolder'),
 	require('./gui/MainScreen/commands/newTodo'),
 	require('./gui/MainScreen/commands/print'),
 	require('./gui/MainScreen/commands/renameFolder'),
@@ -61,6 +62,9 @@ const commands = [
 	require('./gui/MainScreen/commands/toggleSideBar'),
 	require('./gui/MainScreen/commands/toggleVisiblePanes'),
 	require('./gui/MainScreen/commands/toggleEditors'),
+	require('./gui/MainScreen/commands/openNote'),
+	require('./gui/MainScreen/commands/openFolder'),
+	require('./gui/MainScreen/commands/openTag'),
 	require('./gui/NoteEditor/commands/focusElementNoteBody'),
 	require('./gui/NoteEditor/commands/focusElementNoteTitle'),
 	require('./gui/NoteEditor/commands/showLocalSearch'),

ElectronClient/gui/KeymapConfig/KeymapConfigScreen.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useState } from 'react';
 
-import KeymapService, { KeymapItem } from '../../lib/services/KeymapService';
+import KeymapService, { KeymapItem } from 'lib/services/KeymapService';
 import { ShortcutRecorder } from './ShortcutRecorder';
 import getLabel from './utils/getLabel';
 import useKeymap from './utils/useKeymap';
@@ -106,7 +106,7 @@ export const KeymapConfigScreen = ({ themeId }: KeymapConfigScreenProps) => {
 
 	const renderError = (error: Error) => {
 		return (
-			<div style={styles.warning}>
+			<div style={{ ...styles.warning, position: 'absolute', top: 0 }}>
 				<p style={styles.text}>
 					<span>
 						{error.message}

ElectronClient/gui/KeymapConfig/ShortcutRecorder.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useState, useEffect, KeyboardEvent } from 'react';
 
-import KeymapService from '../../lib/services/KeymapService';
+import KeymapService from 'lib/services/KeymapService';
 import styles_ from './styles';
 
 import { _ } from 'lib/locale';
@@ -41,7 +41,7 @@ export const ShortcutRecorder = ({ onSave, onReset, onCancel, onError, initialAc
 		}
 	}, [accelerator]);
 
-	const handleKeydown = (event: KeyboardEvent<HTMLDivElement>) => {
+	const handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
 		event.preventDefault();
 		const newAccelerator = keymapService.domToElectronAccelerator(event);
 
@@ -64,7 +64,7 @@ export const ShortcutRecorder = ({ onSave, onReset, onCancel, onError, initialAc
 			<input
 				value={accelerator}
 				placeholder={_('Press the shortcut')}
-				onKeyDown={handleKeydown}
+				onKeyDown={handleKeyDown}
 				style={styles.recorderInput}
 				title={_('Press the shortcut and then press ENTER. Or, press BACKSPACE to clear the shortcut.')}
 				readOnly

ElectronClient/gui/KeymapConfig/utils/useKeymap.ts

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import KeymapService, { KeymapItem } from '../../../lib/services/KeymapService';
+import KeymapService, { KeymapItem } from 'lib/services/KeymapService';
 
 const keymapService = KeymapService.instance();
 
@@ -70,7 +70,8 @@ const useKeymap = (): [
 				await keymapService.saveCustomKeymap();
 				setKeymapError(null);
 			} catch (err) {
-				setKeymapError(err);
+				const error = new Error(`Could not save file: ${err.message}`);
+				setKeymapError(error);
 			}
 		}