self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Desktop: Stop watching external edits when closing editor (#1981)

Browse Source 
* Stop watching external edits

* move onClose to options

* Wrap openExternal in promise

* More specific error with locale

* Removed localization of external edit error
This commit is contained in:
Caleb John 2019-10-17 14:40:27 -06:00 committed by Laurent Cozic
parent 9436075fdf
commit 0eb51e6bb0
1 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,24 +195,8 @@ class ExternalEditWatcher {
}; };
} }
async spawnCommand(path, args, options) { async spawn(path, args, options) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// App bundles need to be opened using the `open` command.
// Additional args can be specified after --args, and the
// -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 => { const wrapError = error => {
if (!error) return error; if (!error) return error;
@ -237,12 +221,61 @@ class ExternalEditWatcher {
clearInterval(iid); clearInterval(iid);
reject(wrapError(error)); reject(wrapError(error));
}); });
if (options.onClose) {
subProcess.on('close', options.onClose);
}
} catch (error) { } catch (error) {
throw wrapError(error); throw wrapError(error);
} }
}); });
} }
async spawnDefault(file, onClose) {
// windows
let path = '';
if (shim.isWindows()) {
path = 'start';
} else if (shim.isMac()) {
path = 'open';
} else if (shim.isLinux() || shim.isFreeBSD()) {
path = 'xdg-open';
} else {
// Fallback on the electron open method
return new Promise((resolve, reject) => {
if (bridge().openExternal(`file://${file}`)) {
resolve();
} else {
reject(new Error(`Could not open file: ${file}`));
}
});
}
return this.spawn(path, [file], { onClose: onClose });
}
async spawnCommand(path, args, options) {
// App bundles need to be opened using the `open` command.
// Additional args can be specified after --args, and the
// -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';
}
return this.spawn(path, args, options);
}
async openAndWatch(note) { async openAndWatch(note) {
if (!note || !note.id) { if (!note || !note.id) {
this.logger().warn('ExternalEditWatcher: Cannot open note: ', note); this.logger().warn('ExternalEditWatcher: Cannot open note: ', note);
@ -252,12 +285,16 @@ class ExternalEditWatcher {
const filePath = await this.writeNoteToFile_(note); const filePath = await this.writeNoteToFile_(note);
this.watch(filePath); this.watch(filePath);
const onClose = () => {
this.stopWatching(note.id);
};
const cmd = this.textEditorCommand(); const cmd = this.textEditorCommand();
if (!cmd) { if (!cmd) {
bridge().openExternal(`file://${filePath}`); await this.spawnDefault(filePath, onClose);
} else { } else {
cmd.args.push(filePath); cmd.args.push(filePath);
await this.spawnCommand(cmd.path, cmd.args, { detached: true }); await this.spawnCommand(cmd.path, cmd.args, { detached: true, onClose: onClose });
} }
this.dispatch({ this.dispatch({