open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add: include progress in sync status

Browse Source
This commit is contained in:
eight 2019-10-03 18:10:11 +08:00
parent 3196c621c5
commit a590d894a9
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
background/sync.js
View File

@ -10,6 +10,7 @@ const sync = (() => {
const status = { const status = {
state: 'disconnected', state: 'disconnected',
syncing: false, syncing: false,
syncTarget: null,
currentDriveName: null currentDriveName: null
}; };
let currentDrive; let currentDrive;
@ -29,6 +30,7 @@ const sync = (() => {
styles.forEach(i => ctrl.put(i._id, i._rev)); styles.forEach(i => ctrl.put(i._id, i._rev));
}); });
}, },
onProgress,
compareRevision(a, b) { compareRevision(a, b) {
return styleManager.compareRevision(a, b); return styleManager.compareRevision(a, b);
}, },
@ -71,6 +73,18 @@ const sync = (() => {
getStatus: () => status getStatus: () => status
}; };
function onProgress(type, change) {
if (type === 'syncStart') {
status.syncing = true;
} else if (type === 'syncEnd') {
status.syncing = false;
status.syncTarget = null;
} else {
status.syncTarget = [type, change];
}
emitStatusChange();
}
function schedule() { function schedule() {
chrome.alarms.create('syncNow', { chrome.alarms.create('syncNow', {
delayInMinutes: SYNC_DELAY, delayInMinutes: SYNC_DELAY,
@ -100,18 +114,7 @@ const sync = (() => {
} }
function syncNow() { function syncNow() {
if (status.syncing) { return ctrl.syncNow().catch(handle401Error);
return Promise.reject(new Error('still syncing'));
}
status.syncing = true;
emitChange();
return withFinally(
ctrl.syncNow().catch(handle401Error),
() => {
status.syncing = false;
emitChange();
}
);
} }
function handle401Error(err) { function handle401Error(err) {
@ -124,7 +127,7 @@ const sync = (() => {
throw err; throw err;
} }
function emitChange() { function emitStatusChange() {
msg.broadcastExtension({method: 'syncStatusUpdate', status}); msg.broadcastExtension({method: 'syncStatusUpdate', status});
} }
@ -137,7 +140,7 @@ const sync = (() => {
prefs.set('sync.enabled', name); prefs.set('sync.enabled', name);
status.state = 'connecting'; status.state = 'connecting';
status.currentDriveName = currentDrive.name; status.currentDriveName = currentDrive.name;
emitChange(); emitStatusChange();
return withFinally( return withFinally(
ctrl.start() ctrl.start()
.catch(err => { .catch(err => {
@ -151,7 +154,7 @@ const sync = (() => {
() => { () => {
chrome.alarms.create('syncNow', {periodInMinutes: SYNC_INTERVAL}); chrome.alarms.create('syncNow', {periodInMinutes: SYNC_INTERVAL});
status.state = 'connected'; status.state = 'connected';
emitChange(); emitStatusChange();
} }
); );
} }
@ -172,7 +175,7 @@ const sync = (() => {
} }
chrome.alarms.clear('syncNow'); chrome.alarms.clear('syncNow');
status.state = 'disconnecting'; status.state = 'disconnecting';
emitChange(); emitStatusChange();
return withFinally( return withFinally(
ctrl.stop() ctrl.stop()
.then(() => tokenManager.revokeToken(currentDrive.name)) .then(() => tokenManager.revokeToken(currentDrive.name))
@ -182,7 +185,7 @@ const sync = (() => {
prefs.set('sync.enabled', 'none'); prefs.set('sync.enabled', 'none');
status.state = 'disconnected'; status.state = 'disconnected';
status.currentDriveName = null; status.currentDriveName = null;
emitChange(); emitStatusChange();
} }
); );
} }