caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed content merge

Browse Source
This commit is contained in:
benweet 2018-04-08 11:18:56 +01:00
parent 6d59514835
commit fb13a52157
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/services/syncSvc.js
View File

@ -12,6 +12,7 @@ import tempFileSvc from './tempFileSvc';
const inactivityThreshold = 3 * 1000; // 3 sec const inactivityThreshold = 3 * 1000; // 3 sec
const restartSyncAfter = 30 * 1000; // 30 sec const restartSyncAfter = 30 * 1000; // 30 sec
const minAutoSyncEvery = 60 * 1000; // 60 sec const minAutoSyncEvery = 60 * 1000; // 60 sec
const maxContentHistory = 20;
let actionProvider; let actionProvider;
let workspaceProvider; let workspaceProvider;
@ -132,8 +133,9 @@ function applyChanges(changes) {
} }
} }
const LAST_SENT = 0; const LAST_SEEN = 0;
const LAST_MERGED = 1; const LAST_MERGED = 1;
const LAST_SENT = 2;
/** /**
* Create a sync location by uploading the current file content. * Create a sync location by uploading the current file content.
@ -159,6 +161,7 @@ function createSyncLocation(syncLocation) {
store.state.syncedContent.itemMap[`${fileId}/syncedContent`]); store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
const newSyncHistoryItem = []; const newSyncHistoryItem = [];
newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem; newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
newSyncHistoryItem[LAST_SEEN] = content.hash;
newSyncHistoryItem[LAST_SENT] = content.hash; newSyncHistoryItem[LAST_SENT] = content.hash;
newSyncedContent.historyData[content.hash] = content; newSyncedContent.historyData[content.hash] = content;
@ -301,9 +304,12 @@ function syncFile(fileId, syncContext = new SyncContext()) {
// Server content is either out of sync or its history is incomplete, do upload // Server content is either out of sync or its history is incomplete, do upload
skipUpload = false; skipUpload = false;
} }
if (syncHistoryItem && syncHistoryItem[0] !== mergedContent.hash) { if (syncHistoryItem
&& syncHistoryItem[LAST_SENT] != null
&& syncHistoryItem[LAST_SENT] !== mergedContent.hash
) {
// Clean up by removing the hash we've previously added // Clean up by removing the hash we've previously added
const idx = mergedContentHistory.indexOf(syncHistoryItem[LAST_SENT]); const idx = mergedContentHistory.lastIndexOf(syncHistoryItem[LAST_SENT]);
if (idx !== -1) { if (idx !== -1) {
mergedContentHistory.splice(idx, 1); mergedContentHistory.splice(idx, 1);
} }
@ -314,13 +320,16 @@ function syncFile(fileId, syncContext = new SyncContext()) {
const newSyncedContent = utils.deepCopy(syncedContent); const newSyncedContent = utils.deepCopy(syncedContent);
const newSyncHistoryItem = newSyncedContent.syncHistory[syncLocation.id] || []; const newSyncHistoryItem = newSyncedContent.syncHistory[syncLocation.id] || [];
newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem; newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
if (serverContent && (serverContent.hash === newSyncHistoryItem[LAST_SENT] || if (serverContent &&
serverContent.history.indexOf(newSyncHistoryItem[LAST_SENT]) !== -1) (serverContent.hash === newSyncHistoryItem[LAST_SEEN] ||
serverContent.history.indexOf(newSyncHistoryItem[LAST_SEEN]) !== -1)
) { ) {
// The server has accepted the content we previously sent // That's the 2nd time we've seen this content, trust it for future merges
newSyncHistoryItem[LAST_MERGED] = newSyncHistoryItem[LAST_SENT]; newSyncHistoryItem[LAST_MERGED] = newSyncHistoryItem[LAST_SEEN];
} }
newSyncHistoryItem[LAST_SENT] = mergedContent.hash; newSyncHistoryItem[LAST_MERGED] = newSyncHistoryItem[LAST_MERGED] || null;
newSyncHistoryItem[LAST_SEEN] = mergedContent.hash;
newSyncHistoryItem[LAST_SENT] = skipUpload ? null : mergedContent.hash;
newSyncedContent.historyData[mergedContent.hash] = mergedContent; newSyncedContent.historyData[mergedContent.hash] = mergedContent;
// Clean synced content from unused revisions // Clean synced content from unused revisions
@ -346,7 +355,7 @@ function syncFile(fileId, syncContext = new SyncContext()) {
// Upload merged content // Upload merged content
return provider.uploadContent(token, { return provider.uploadContent(token, {
...mergedContent, ...mergedContent,
history: mergedContentHistory, history: mergedContentHistory.slice(0, maxContentHistory),
}, syncLocation, ifNotTooLate) }, syncLocation, ifNotTooLate)
.then((syncLocationToStore) => { .then((syncLocationToStore) => {
// Replace sync location if modified // Replace sync location if modified