self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-03 08:35:29 +02:00
Code Issues Releases Activity

Add delay before saving resource

Browse Source
This commit is contained in:
Laurent Cozic 2020-05-30 17:10:25 +01:00
parent 53eba3f062
commit 7e59c40091
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ReactNativeClient/lib/services/ResourceEditWatcher.ts
View File

@ -6,11 +6,13 @@ const EventEmitter = require('events');
const chokidar = require('chokidar');
const { bridge } = require('electron').remote.require('./bridge');
const { _ } = require('lib/locale');
import AsyncActionQueue from '../AsyncActionQueue';
interface WatchedItem {
[key: string]: {
resourceId: string,
updatedTime: number,
asyncSaveQueue: AsyncActionQueue,
}
}
@ -63,6 +65,14 @@ export default class ResourceEditWatcher {
private watch(fileToWatch:string) {
if (!this.chokidar_) return;
const makeSaveAction = (resourceId:string, path:string) => {
return async () => {
this.logger().info(`ResourceEditWatcher: Saving resource ${resourceId}`);
await shim.updateResourceBlob(resourceId, path);
this.eventEmitter_.emit('resourceChange', { id: resourceId });
};
};
if (!this.watcher_) {
this.watcher_ = this.chokidar_.watch(fileToWatch);
this.watcher_.on('all', async (event:any, path:string) => {
@ -77,6 +87,7 @@ export default class ResourceEditWatcher {
// this.watcher_.unwatch(path);
} else if (event === 'change') {
const watchedItem = this.watchedItems_[path];
const resourceId = watchedItem.resourceId;
const stat = await shim.fsDriver().stat(path);
const updatedTime = stat.mtime.getTime();
@ -85,6 +96,7 @@ export default class ResourceEditWatcher {
// 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().
this.logger().debug(`ResourceEditWatcher: No timestamp change - skip: ${resourceId}`);
return;
}
@ -93,18 +105,14 @@ export default class ResourceEditWatcher {
return;
}
const resourceId = watchedItem.resourceId;
this.logger().debug(`ResourceEditWatcher: Queuing save action: ${resourceId}`);
await shim.updateResourceBlob(resourceId, path);
watchedItem.asyncSaveQueue.push(makeSaveAction(resourceId, path));
this.watchedItems_[path] = {
resourceId: resourceId,
...watchedItem,
updatedTime: updatedTime,
};
this.eventEmitter_.emit('resourceChange', { id: resourceId });
// TODO: handle race conditions
} else if (event === 'error') {
this.logger().error('ResourceEditWatcher: error');
}
@ -139,6 +147,7 @@ export default class ResourceEditWatcher {
this.watchedItems_[editFilePath] = {
resourceId: resourceId,
updatedTime: stat.mtime.getTime(),
asyncSaveQueue: new AsyncActionQueue(1000),
};
this.watch(editFilePath);