mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-30 10:36:35 +02:00
cb3e1cf1e9
commit2fb6cee901
Merge:4e303be85f
db509955f6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:24:07 2020 +0100 Merge branch 'dev' into rn_63 commit4e303be85f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:14:39 2020 +0100 Clean up commite3a37ec2d6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:57:55 2020 +0100 Use different script for pre-commit and manual start commitbd236648fc
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:56:45 2020 +0100 Removed RN eslint config commite7feda41c9
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:27:08 2020 +0100 Revert "Disable git hook for now" This reverts commit89263ac742
. commitcfd63fe46f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 13:02:32 2020 +0100 Ask permission to use geo-location commit66059939a3
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 12:26:20 2020 +0100 Fixed WebView race condition commit1e0d2b7b86
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:56:21 2020 +0100 Fixed webview issues commitf537d22d7f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:08:29 2020 +0100 Improve resource file watching commiteec32cf70a
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 18:40:13 2020 +0100 Removed cache package dependency and implemented one more suitable for React Native commitefa346fea4
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:57:21 2020 +0100 iOS: Added fonts to Info.plist although it was working without it commit572b647bc0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:56:49 2020 +0100 Specify content-type header for OneDrive to prevent network error commitbcedf6c7f0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:45:01 2020 +0100 iOS: Disable long press menu since it is already built-in commit7359dd61d1
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:37:40 2020 +0100 Removed unused react-native-device-info commit2d63ab36d3
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:35:54 2020 +0100 iOS: Fixed taking a picture commit8e2875a91c
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:11:13 2020 +0100 iOS: Restored camera roll functionality commit75f5edf2ad
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:13 2020 +0100 iOS: Fixed build settings commitb220c98419
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:03 2020 +0100 iOS: Got images to work with WebKit commitc34b43e841
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:24:52 2020 +0100 iOS: Restore more settings commit32997611e6
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:15:14 2020 +0100 iOS: Added back icons and other properties commitb5811d7f7c
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 23:53:14 2020 +0100 Got iOS build to work commitdc6d7c00e0
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:40:06 2020 +0100 Imported old settings in gradle build commitdff59f5603
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:20:00 2020 +0100 Restored sharing commit0bdb449e72
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 17:25:40 2020 +0100 Updated NoteBodyViewer commit0c0d228815
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 16:54:42 2020 +0100 Fixed networking commit6ff45ce485
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 13:11:00 2020 +0100 Fixed document picker commitcc889182b6
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 12:56:27 2020 +0100 Added back support for alarms commit040261abfa
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 22:04:49 2020 +0100 Fixed Clipboard and remove image-picker package commit1077ad8f16
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:54:52 2020 +0100 Fixed Select Alarm dialog and PoorManIntervals class commit8296676fd5
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:32:52 2020 +0100 Fixed icons and warnings commit3b0e3f6f43
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 17:02:59 2020 +0100 Got app to build again commit89263ac742
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:41:17 2020 +0100 Disable git hook for now commitd6da162f67
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:39:12 2020 +0100 Restored back all RN packages commit7f8ce3732c
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:13:12 2020 +0100 Restored base packages commitea59726eb3
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:05:17 2020 +0100 Started over from scratch
281 lines
9.4 KiB
TypeScript
281 lines
9.4 KiB
TypeScript
import AsyncActionQueue from '../../AsyncActionQueue';
|
|
import shim from 'lib/shim';
|
|
import { _ } from 'lib/locale';
|
|
const Logger = require('lib/Logger').default;
|
|
const Setting = require('lib/models/Setting').default;
|
|
const Resource = require('lib/models/Resource');
|
|
const EventEmitter = require('events');
|
|
const chokidar = require('chokidar');
|
|
const bridge = require('electron').remote.require('./bridge').default;
|
|
|
|
interface WatchedItem {
|
|
resourceId: string,
|
|
lastFileUpdatedTime: number,
|
|
lastResourceUpdatedTime: number,
|
|
path:string,
|
|
asyncSaveQueue: AsyncActionQueue,
|
|
size: number,
|
|
}
|
|
|
|
interface WatchedItems {
|
|
[key:string]: WatchedItem,
|
|
}
|
|
|
|
export default class ResourceEditWatcher {
|
|
|
|
private static instance_:ResourceEditWatcher;
|
|
|
|
private logger_:any;
|
|
private dispatch:Function;
|
|
private watcher_:any;
|
|
private chokidar_:any;
|
|
private watchedItems_:WatchedItems = {};
|
|
private eventEmitter_:any;
|
|
private tempDir_:string = '';
|
|
|
|
constructor() {
|
|
this.logger_ = new Logger();
|
|
this.dispatch = () => {};
|
|
this.watcher_ = null;
|
|
this.chokidar_ = chokidar;
|
|
this.eventEmitter_ = new EventEmitter();
|
|
}
|
|
|
|
initialize(logger:any, dispatch:Function) {
|
|
this.logger_ = logger;
|
|
this.dispatch = dispatch;
|
|
}
|
|
|
|
static instance() {
|
|
if (this.instance_) return this.instance_;
|
|
this.instance_ = new ResourceEditWatcher();
|
|
return this.instance_;
|
|
}
|
|
|
|
private async tempDir() {
|
|
if (!this.tempDir_) {
|
|
this.tempDir_ = `${Setting.value('tempDir')}/edited_resources`;
|
|
await shim.fsDriver().mkdir(this.tempDir_);
|
|
}
|
|
|
|
return this.tempDir_;
|
|
}
|
|
|
|
logger() {
|
|
return this.logger_;
|
|
}
|
|
|
|
on(eventName:string, callback:Function) {
|
|
return this.eventEmitter_.on(eventName, callback);
|
|
}
|
|
|
|
off(eventName:string, callback:Function) {
|
|
return this.eventEmitter_.removeListener(eventName, callback);
|
|
}
|
|
|
|
private watch(fileToWatch:string) {
|
|
if (!this.chokidar_) return;
|
|
|
|
const makeSaveAction = (resourceId:string, path:string) => {
|
|
return async () => {
|
|
this.logger().info(`ResourceEditWatcher: Saving resource ${resourceId}`);
|
|
const resource = await Resource.load(resourceId);
|
|
const watchedItem = this.watchedItemByResourceId(resourceId);
|
|
|
|
if (resource.updated_time !== watchedItem.lastResourceUpdatedTime) {
|
|
this.logger().info(`ResourceEditWatcher: Conflict was detected (resource was modified from somewhere else, possibly via sync). Conflict note will be created: ${resourceId}`);
|
|
// The resource has been modified from elsewhere, for example via sync
|
|
// so copy the current version to the Conflict notebook, and overwrite
|
|
// the resource content.
|
|
await Resource.createConflictResourceNote(resource);
|
|
}
|
|
|
|
const savedResource = await Resource.updateResourceBlobContent(resourceId, path);
|
|
watchedItem.lastResourceUpdatedTime = savedResource.updated_time;
|
|
this.eventEmitter_.emit('resourceChange', { id: resourceId });
|
|
};
|
|
};
|
|
|
|
const handleChangeEvent = async (path:string) => {
|
|
this.logger().debug(`ResourceEditWatcher: handleChangeEvent: ${path}`);
|
|
|
|
const watchedItem = this.watchedItemByPath(path);
|
|
|
|
if (!watchedItem) {
|
|
// The parent directory of the edited resource often gets a change event too
|
|
// and ends up here. Print a warning, but most likely it's nothing important.
|
|
this.logger().debug(`ResourceEditWatcher: could not find resource ID from path: ${path}`);
|
|
return;
|
|
}
|
|
|
|
const resourceId = watchedItem.resourceId;
|
|
const stat = await shim.fsDriver().stat(path);
|
|
const editedFileUpdatedTime = stat.mtime.getTime();
|
|
|
|
// To check if the item has really changed we look at the updated time and size, which
|
|
// in most cases is sufficient. It could be a problem if the editing tool is making a change
|
|
// that neither changes the timestamp nor the file size. The alternative would be to compare
|
|
// the files byte for byte but that could be slow and the file might have changed again by
|
|
// the time we finished comparing.
|
|
if (watchedItem.lastFileUpdatedTime === editedFileUpdatedTime && watchedItem.size === stat.size) {
|
|
// chokidar is buggy and emits "change" events even when nothing has changed
|
|
// so double-check the modified time and skip processing if there's no change.
|
|
// In particular it emits two such events just after the file has been copied
|
|
// in openAndWatch().
|
|
//
|
|
// We also need this because some events are handled twice - once in the "all" event
|
|
// handle and once in the "raw" event handler, due to a bug in chokidar. So having
|
|
// this check means we don't unecessarily save the resource twice when the file is
|
|
// modified by the user.
|
|
this.logger().debug(`ResourceEditWatcher: No timestamp and file size change - skip: ${resourceId}`);
|
|
return;
|
|
}
|
|
|
|
this.logger().debug(`ResourceEditWatcher: Queuing save action: ${resourceId}`);
|
|
watchedItem.asyncSaveQueue.push(makeSaveAction(resourceId, path));
|
|
watchedItem.lastFileUpdatedTime = editedFileUpdatedTime;
|
|
watchedItem.size = stat.size;
|
|
};
|
|
|
|
if (!this.watcher_) {
|
|
this.watcher_ = this.chokidar_.watch(fileToWatch);
|
|
this.watcher_.on('all', async (event:any, path:string) => {
|
|
this.logger().info(`ResourceEditWatcher: Event: ${event}: ${path}`);
|
|
|
|
if (event === 'unlink') {
|
|
// File are unwatched in the stopWatching functions below. When we receive an unlink event
|
|
// here it might be that the file is quickly moved to a different location and replaced by
|
|
// another file with the same name, as it happens with emacs. So because of this
|
|
// we keep watching anyway.
|
|
// See: https://github.com/laurent22/joplin/issues/710#issuecomment-420997167
|
|
// this.watcher_.unwatch(path);
|
|
} else if (event === 'change') {
|
|
handleChangeEvent(path);
|
|
} else if (event === 'error') {
|
|
this.logger().error('ResourceEditWatcher: error');
|
|
}
|
|
});
|
|
|
|
// Hack to support external watcher on some linux applications (gedit, gvim, etc)
|
|
// taken from https://github.com/paulmillr/chokidar/issues/591
|
|
//
|
|
// 2020-07-22: It also applies when editing Excel files, which copy the new file
|
|
// then rename, so handling the "change" event alone is not enough as sometimes
|
|
// that event is not event triggered.
|
|
// https://github.com/laurent22/joplin/issues/3407
|
|
//
|
|
// @ts-ignore Leave unused path variable
|
|
this.watcher_.on('raw', async (event:string, path:string, options:any) => {
|
|
this.logger().debug(`ResourceEditWatcher: Raw event: ${event}: ${options.watchedPath}`);
|
|
if (event === 'rename') {
|
|
this.watcher_.unwatch(options.watchedPath);
|
|
this.watcher_.add(options.watchedPath);
|
|
handleChangeEvent(options.watchedPath);
|
|
}
|
|
});
|
|
} else {
|
|
this.watcher_.add(fileToWatch);
|
|
}
|
|
|
|
return this.watcher_;
|
|
}
|
|
|
|
public async openAndWatch(resourceId:string) {
|
|
let watchedItem = this.watchedItemByResourceId(resourceId);
|
|
|
|
if (!watchedItem) {
|
|
// Immediately create and push the item to prevent race conditions
|
|
|
|
watchedItem = {
|
|
resourceId: resourceId,
|
|
lastFileUpdatedTime: 0,
|
|
lastResourceUpdatedTime: 0,
|
|
asyncSaveQueue: new AsyncActionQueue(1000),
|
|
path: '',
|
|
size: -1,
|
|
};
|
|
|
|
this.watchedItems_[resourceId] = watchedItem;
|
|
|
|
const resource = await Resource.load(resourceId);
|
|
if (!(await Resource.isReady(resource))) throw new Error(_('This attachment is not downloaded or not decrypted yet'));
|
|
const sourceFilePath = Resource.fullPath(resource);
|
|
const tempDir = await this.tempDir();
|
|
const editFilePath = await shim.fsDriver().findUniqueFilename(`${tempDir}/${Resource.friendlySafeFilename(resource)}`);
|
|
await shim.fsDriver().copy(sourceFilePath, editFilePath);
|
|
const stat = await shim.fsDriver().stat(editFilePath);
|
|
|
|
watchedItem.path = editFilePath;
|
|
watchedItem.lastFileUpdatedTime = stat.mtime.getTime();
|
|
watchedItem.lastResourceUpdatedTime = resource.updated_time;
|
|
watchedItem.size = stat.size;
|
|
|
|
this.watch(editFilePath);
|
|
|
|
this.dispatch({
|
|
type: 'RESOURCE_EDIT_WATCHER_SET',
|
|
id: resource.id,
|
|
title: resource.title,
|
|
});
|
|
}
|
|
|
|
bridge().openItem(watchedItem.path);
|
|
|
|
this.logger().info(`ResourceEditWatcher: Started watching ${watchedItem.path}`);
|
|
}
|
|
|
|
async stopWatching(resourceId:string) {
|
|
if (!resourceId) return;
|
|
|
|
const item = this.watchedItemByResourceId(resourceId);
|
|
if (!item) {
|
|
this.logger().error(`ResourceEditWatcher: Trying to stop watching non-watched resource ${resourceId}`);
|
|
return;
|
|
}
|
|
|
|
await item.asyncSaveQueue.waitForAllDone();
|
|
|
|
try {
|
|
if (this.watcher_) this.watcher_.unwatch(item.path);
|
|
await shim.fsDriver().remove(item.path);
|
|
} catch (error) {
|
|
this.logger().warn(`ResourceEditWatcher: There was an error unwatching resource ${resourceId}. Joplin will ignore the file regardless.`, error);
|
|
}
|
|
|
|
delete this.watchedItems_[resourceId];
|
|
|
|
this.dispatch({
|
|
type: 'RESOURCE_EDIT_WATCHER_REMOVE',
|
|
id: resourceId,
|
|
});
|
|
|
|
this.logger().info(`ResourceEditWatcher: Stopped watching ${item.path}`);
|
|
}
|
|
|
|
public async stopWatchingAll() {
|
|
const promises = [];
|
|
for (const resourceId in this.watchedItems_) {
|
|
const item = this.watchedItems_[resourceId];
|
|
promises.push(this.stopWatching(item.resourceId));
|
|
}
|
|
await Promise.all(promises);
|
|
|
|
this.dispatch({
|
|
type: 'RESOURCE_EDIT_WATCHER_CLEAR',
|
|
});
|
|
}
|
|
|
|
private watchedItemByResourceId(resourceId:string):WatchedItem {
|
|
return this.watchedItems_[resourceId];
|
|
}
|
|
|
|
private watchedItemByPath(path:string):WatchedItem {
|
|
for (const resourceId in this.watchedItems_) {
|
|
const item = this.watchedItems_[resourceId];
|
|
if (item.path === path) return item;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
}
|