Added demo and improved parsing of markdown URLs

.gitignore

@@ -32,4 +32,5 @@ INFO.md
 sync_staging.sh
 *.swp
 _vieux/
-README.md
+README.md
+_mydocs

CliClient/app/app-gui.js

@@ -347,9 +347,9 @@ class AppGui {
 			description: null,
 			action: () => {
 				const w = this.widget('mainWindow').focusedWidget;
-				if (w.name == 'folderList') {
+				if (w.name === 'folderList') {
 					this.widget('noteList').focus();
-				} else if (w.name == 'noteList') {
+				} else if (w.name === 'noteList' || w.name === 'noteText') {
 					this.processCommand('edit $n');
 				}
 			},
@@ -612,6 +612,15 @@ class AppGui {
 		const resourceIdRegex = /^:\/[a-f0-9]+$/i
 		const noteLinks = {};
 
+		const hasProtocol = function(s, protocols) {
+			if (!s) return false;
+			s = s.trim().toLowerCase();
+			for (let i = 0; i < protocols.length; i++) {
+				if (s.indexOf(protocols[i] + '://') === 0) return true;
+			}
+			return false;
+		}
+
 		// By default, before the server is started, only the regular
 		// URLs appear in blue.
 		noteTextWidget.markdownRendererOptions = {
@@ -620,7 +629,7 @@ class AppGui {
 
 				if (resourceIdRegex.test(url)) {
 					return url;
-				} else if (url.indexOf('http://') === 0 || url.indexOf('https://') === 0) {
+				} else if (hasProtocol(url, ['http', 'https'])) {
 					return linkStyle(url);
 				} else {
 					return url;
@@ -662,11 +671,15 @@ class AppGui {
 						type: 'resource',
 						id: url.substr(2),
 					};					
-				} else {
+				} else if (hasProtocol(url, ['http', 'https', 'file', 'ftp'])) {
 					noteLinks[index] = {
 						type: 'url',
 						url: url,
 					};
+				} else if (url.indexOf('#') === 0) {
+					return ''; // Anchors aren't supported for now
+				} else {
+					return url;
 				}
 
 				return linkStyle(this.resourceServer_.baseUrl() + '/' + index);

CliClient/app/command-ren.js

@@ -33,18 +33,6 @@ class Command extends BaseCommand {
 		} else {
 			await Note.save(newItem);
 		}
-
-
-		
-		// const folder = await Folder.loadByField('title', destination);
-		// if (!folder) throw new Error(_('Cannot find "%s".', destination));
-
-		// const notes = await app().loadItems(BaseModel.TYPE_NOTE, pattern);
-		// if (!notes.length) throw new Error(_('Cannot find "%s".', pattern));
-
-		// for (let i = 0; i < notes.length; i++) {
-		// 	await Note.moveToFolder(notes[i].id, folder.id);
-		// }
 	}
 
 }

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "0.10.57",
+  "version": "0.10.58",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

CliClient/package.json

@@ -18,7 +18,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "0.10.57",
+  "version": "0.10.58",
   "bin": {
     "joplin": "./main.js"
   },

CliClient/run.sh

@@ -3,4 +3,4 @@ set -e
 CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 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 "$@"
-#bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --stack-trace-enabled --log-level debug "$@"
+#bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --stack-trace-enabled --log-level debug "$@"

CliClientDemo/.gitignore

@@ -0,0 +1 @@
+node_modules

CliClientDemo/index.js

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const spawn = require('child_process').spawn;
+const os = require('os');
+const fs = require('fs-extra');
+
+const joplinPath = __dirname + '/node_modules/.bin/joplin';
+const profileDir = os.homedir() + '/.config/demo-joplin';
+const dbFilename = 'database.sqlite';
+
+fs.ensureDirSync(profileDir);
+if (!fs.pathExistsSync(profileDir + '/' + dbFilename)) {
+	fs.copySync(__dirname + '/' + dbFilename, profileDir + '/' + dbFilename);
+}
+
+const opt = {
+	cwd: __dirname,
+	env: (function() {
+		process.env.NODE_PATH = '.';
+		return process.env;
+	}()),
+	stdio: [process.stdin, process.stdout, process.stderr]
+};
+
+const app = spawn(joplinPath, ['--profile', profileDir], opt);
+
+app.on('close', (code) => {
+	process.exit(code);
+});

CliClientDemo/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "demo-joplin",
+  "version": "1.0.3",
+  "description": "Demo for Joplin CLI",
+  "bin": {
+    "demo-joplin": "./index.js"
+  },
+  "bugs": {
+    "url": "https://github.com/laurent22/joplin/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/laurent22/joplin"
+  },
+  "engines": {
+    "node": ">=8.7.0"
+  },
+  "copyright": {
+    "title": "Joplin CLI",
+    "years": [
+      2016,
+      2017
+    ],
+    "owner": "Laurent Cozic"
+  },
+  "dependencies": {
+    "fs-extra": "^4.0.2",
+    "joplin": "^0.10.58"
+  },
+  "author": "Laurent Cozic",
+  "license": "MIT"
+}

CliClientDemo/publish.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+npm version patch
+npm publish