self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-13 22:12:50 +02:00
Code Issues Releases Activity

Desktop: Allow using macOS App bundle as external editor, and improved error handling

Browse Source
This commit is contained in:
Laurent Cozic
2019-02-05 22:00:25 +00:00
parent 0e122c9dc5
commit e62d91dda8
1 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
ReactNativeClient/lib/services/ExternalEditWatcher.js
View File

@@ -5,6 +5,7 @@ const { shim } = require('lib/shim');
const chokidar = require('chokidar'); const chokidar = require('chokidar');
const EventEmitter = require('events'); const EventEmitter = require('events');
const { splitCommandString } = require('lib/string-utils'); const { splitCommandString } = require('lib/string-utils');
const { fileExtension } = require('lib/path-utils');
const spawn = require('child_process').spawn; const spawn = require('child_process').spawn;
class ExternalEditWatcher { class ExternalEditWatcher {
@@ -149,20 +150,50 @@ class ExternalEditWatcher {
async spawnCommand(path, args, options) { async spawnCommand(path, args, options) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const subProcess = spawn(path, args, options);
const iid = setInterval(() => { // App bundles need to be opened using the `open` command.
if (subProcess && subProcess.pid) { // Additional args can be specified after --args, and the
this.logger().debug('Started editor with PID ' + subProcess.pid); // -n flag is needed to ensure that the app is always launched
// with the arguments. Without it, if the app is already opened,
// it will just bring it to the foreground without opening the file.
// So the full command is:
//
// open -n /path/to/editor.app --args -app-flag -bla /path/to/file.md
//
if (shim.isMac() && fileExtension(path) === 'app') {
args = args.slice();
args.splice(0, 0, '--args');
args.splice(0, 0, path);
args.splice(0, 0, '-n');
path = 'open';
}
const wrapError = (error) => {
if (!error) return error;
let msg = error.message ? [error.message] : [];
msg.push('Command was: "' + path + '" ' + args.join(' '));
error.message = msg.join('\n\n');
return error;
}
try {
const subProcess = spawn(path, args, options);
const iid = setInterval(() => {
if (subProcess && subProcess.pid) {
this.logger().debug('Started editor with PID ' + subProcess.pid);
clearInterval(iid);
resolve();
}
}, 100);
subProcess.on('error', (error) => {
clearInterval(iid); clearInterval(iid);
resolve(); reject(wrapError(error));
} });
}, 100); } catch (error) {
throw wrapError(error);
subProcess.on('error', (error) => { }
clearInterval(iid);
reject(error);
});
}); });
} }