From d1be6b1566cff5e39206a8a53abf745d80d2afca Mon Sep 17 00:00:00 2001 From: benweet Date: Sun, 21 Jul 2013 15:38:53 +0100 Subject: [PATCH] Google Drive realtime sync --- css/default.css | 5 ++ img/icons.png | Bin 4289 -> 5551 bytes index.html | 21 +++-- js/extensions/buttonSync.js | 37 +++----- js/extensions/dialogManageSynchronization.js | 3 +- js/extensions/documentSelector.js | 6 +- js/extensions/documentTitle.js | 6 +- js/helpers/googleHelper.js | 6 +- .../dialogManageSynchronizationLocation.html | 4 +- js/providers/gdriveProvider.js | 81 +++++++++++++++--- js/synchronizer.js | 9 +- 11 files changed, 121 insertions(+), 57 deletions(-) diff --git a/css/default.css b/css/default.css index ca58473e..f648e252 100644 --- a/css/default.css +++ b/css/default.css @@ -478,6 +478,11 @@ div.dropdown-menu textarea { background-position: -19px 0; } +.icon-gdrive.realtime { + width: 18px; + background-position: -180px 0; +} + .icon-dropbox { background-image: url("../img/icons.png") !important; width: 16px; diff --git a/img/icons.png b/img/icons.png index d7fe732b825f467ac16fba8cd8e1ffb46ca4e156..a656096d5a56e99b94ccdaf704ef0076ccb69b73 100644 GIT binary patch delta 5519 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 delta 4247 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 diff --git a/index.html b/index.html index 3d1b45ad..a59c584a 100644 --- a/index.html +++ b/index.html @@ -291,10 +291,10 @@

Export to Google Drive

-
This will upload the current +
This will save the current document to your Google Drive account and keep it synchronized.

- Here, you can specify a folder ID (optional): + Please specify a folder ID (optional):



+
+ NOTE: +
    +
  • If no folder ID is supplied, the file will be created in + your root folder.
    • +
  • You can move or rename the file afterwards within Google + Drive.
    • +
+

NOTE:
    -
  • If no folder ID is supplied, the file will be created in - your root folder.
    • -
  • You can move or rename the file afterwards within Google - Drive.
  • Real time collaborative documents can't be open outside - StackEdit
    • + StackEdit.
  • Real time collaborative documents can't have multiple synchronized locations.
@@ -336,7 +341,7 @@

Export to Dropbox

-
This will upload the current +
This will save the current document to your Dropbox account and keep it synchronized.

Please specify a file path for "": diff --git a/js/extensions/buttonSync.js b/js/extensions/buttonSync.js index 77b9c8ab..db642e80 100644 --- a/js/extensions/buttonSync.js +++ b/js/extensions/buttonSync.js @@ -21,16 +21,20 @@ define([ newConfig.syncPeriod = utils.getInputIntValue("#input-sync-period", event, 0); }; + var synchronizer = undefined; + buttonSync.onSynchronizerCreated = function(synchronizerParameter) { + synchronizer = synchronizerParameter; + }; + var button = undefined; var syncRunning = false; - var uploadPending = false; var isOffline = false; // Enable/disable the button var updateButtonState = function() { if(button === undefined) { return; } - if(syncRunning === true || uploadPending === false || isOffline) { + if(syncRunning === true || synchronizer.hasSync() === false || isOffline) { button.addClass("disabled"); } else { @@ -38,11 +42,6 @@ define([ } }; - var synchronizer = undefined; - buttonSync.onSynchronizerCreated = function(synchronizerParameter) { - synchronizer = synchronizerParameter; - }; - // Run sync periodically var lastSync = 0; buttonSync.onPeriodicRun = function() { @@ -64,15 +63,14 @@ define([ }; buttonSync.onReady = updateButtonState; + buttonSync.onFileCreated = updateButtonState; + buttonSync.onFileDeleted = updateButtonState; + buttonSync.onSyncImportSuccess = updateButtonState; + buttonSync.onSyncExportSuccess = updateButtonState; + buttonSync.onSyncRemoved = updateButtonState; buttonSync.onSyncRunning = function(isRunning) { syncRunning = isRunning; - uploadPending = true; - updateButtonState(); - }; - - buttonSync.onSyncSuccess = function() { - uploadPending = false; updateButtonState(); }; @@ -81,19 +79,6 @@ define([ updateButtonState(); }; - // Check that a file has synchronized locations and no real time synchronized location - var checkSynchronization = function(fileDesc) { - if(_.size(fileDesc.syncLocations) !== 0 && !_.some(fileDesc.syncLocations, function(syncAttributes) { - return syncAttributes.isRealtime; - })) { - uploadPending = true; - updateButtonState(); - } - }; - - buttonSync.onContentChanged = checkSynchronization; - buttonSync.onTitleChanged = checkSynchronization; - return buttonSync; }); \ No newline at end of file diff --git a/js/extensions/dialogManageSynchronization.js b/js/extensions/dialogManageSynchronization.js index 025b9baa..ff31a9a0 100644 --- a/js/extensions/dialogManageSynchronization.js +++ b/js/extensions/dialogManageSynchronization.js @@ -38,7 +38,8 @@ define([ var syncDesc = syncAttributes.id || syncAttributes.path; var lineElement = $(_.template(dialogManageSynchronizationLocationHTML, { provider: syncAttributes.provider, - syncDesc: syncDesc + syncDesc: syncDesc, + isRealtime: syncAttributes.isRealtime })); lineElement.append($(removeButtonTemplate).click(function() { synchronizer.tryStopRealtimeSync(); diff --git a/js/extensions/documentSelector.js b/js/extensions/documentSelector.js index 1bccad5b..aa4e21d1 100644 --- a/js/extensions/documentSelector.js +++ b/js/extensions/documentSelector.js @@ -47,7 +47,11 @@ define([ _.chain(attributesList).sortBy(function(attributes) { return attributes.provider.providerId; }).each(function(attributes) { - result.push(''); + var classes = 'icon-' + attributes.provider.providerId; + if(attributes.isRealtime === true) { + classes += " realtime"; + } + result.push(''); }); result.push(" "); result.push(fileDesc.title); diff --git a/js/extensions/documentTitle.js b/js/extensions/documentTitle.js index c742dc29..d20aeeb5 100644 --- a/js/extensions/documentTitle.js +++ b/js/extensions/documentTitle.js @@ -26,7 +26,11 @@ define([ _.chain(attributesList).sortBy(function(attributes) { return attributes.provider.providerId; }).each(function(attributes) { - result.push(''); + var classes = 'icon-' + attributes.provider.providerId; + if(attributes.isRealtime === true) { + classes += " realtime"; + } + result.push(''); }); result.push(" "); result.push(fileDesc.title); diff --git a/js/helpers/googleHelper.js b/js/helpers/googleHelper.js index 36ec2bd2..4c870941 100644 --- a/js/helpers/googleHelper.js +++ b/js/helpers/googleHelper.js @@ -478,9 +478,9 @@ define([ code: err.type }, task); }); - task.onSuccess(function() { - callback(undefined, doc); - }); + }); + task.onSuccess(function() { + callback(undefined, doc); }); task.onError(function(error) { callback(error); diff --git a/js/html/dialogManageSynchronizationLocation.html b/js/html/dialogManageSynchronizationLocation.html index 281b25b2..2fe592db 100644 --- a/js/html/dialogManageSynchronizationLocation.html +++ b/js/html/dialogManageSynchronizationLocation.html @@ -1,5 +1,5 @@

- +
diff --git a/js/providers/gdriveProvider.js b/js/providers/gdriveProvider.js index c0c236c7..eb422296 100644 --- a/js/providers/gdriveProvider.js +++ b/js/providers/gdriveProvider.js @@ -156,9 +156,7 @@ define([ _.each(changes, function(change) { var syncIndex = createSyncIndex(change.fileId); var syncAttributes = fileMgr.getSyncAttributes(syncIndex); - // If file is not synchronized or it's a real time synchronized location - if(syncAttributes === undefined || syncAttributes.isRealtime === true) { - // Skip it + if(syncAttributes === undefined) { return; } // Store syncAttributes to avoid 2 times searching @@ -193,6 +191,9 @@ define([ extensionMgr.onError('"' + localTitle + '" has been removed from Google Drive.'); fileDesc.removeSyncLocation(syncAttributes); extensionMgr.onSyncRemoved(fileDesc, syncAttributes); + if(syncAttributes.isRealtime === true && fileMgr.currentFile === fileDesc) { + gdriveProvider.stopRealtimeSync(); + } return; } var localTitleChanged = syncAttributes.titleCRC != utils.crc32(localTitle); @@ -206,7 +207,7 @@ define([ var remoteContentChanged = syncAttributes.contentCRC != remoteContentCRC; var fileContentChanged = localContent != file.content; // Conflict detection - if((fileTitleChanged === true && localTitleChanged === true && remoteTitleChanged === true) || (fileContentChanged === true && localContentChanged === true && remoteContentChanged === true)) { + if((fileTitleChanged === true && localTitleChanged === true && remoteTitleChanged === true) || (!syncAttributes.isRealtime && fileContentChanged === true && localContentChanged === true && remoteContentChanged === true)) { fileMgr.createFile(localTitle + " (backup)", localContent); extensionMgr.onMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.'); } @@ -217,7 +218,7 @@ define([ extensionMgr.onMessage('"' + localTitle + '" has been renamed to "' + file.title + '" on Google Drive.'); } // If file content changed - if(fileContentChanged && remoteContentChanged === true) { + if(!syncAttributes.isRealtime && fileContentChanged && remoteContentChanged === true) { fileDesc.content = file.content; extensionMgr.onContentChanged(fileDesc); extensionMgr.onMessage('"' + file.title + '" has been updated from Google Drive.'); @@ -227,7 +228,9 @@ define([ } // Update syncAttributes syncAttributes.etag = file.etag; - syncAttributes.contentCRC = remoteContentCRC; + if(!syncAttributes.isRealtime) { + syncAttributes.contentCRC = remoteContentCRC; + } syncAttributes.titleCRC = remoteTitleCRC; utils.storeAttributes(syncAttributes); }); @@ -269,9 +272,9 @@ define([ var realtimeBinding = undefined; var undoExecute = undefined; var redoExecute = undefined; - gdriveProvider.startRealtimeSync = function(content, syncAttributes, callback) { + gdriveProvider.startRealtimeSync = function(localTitle, localContent, syncAttributes, callback) { logger.log("Starting Google Drive realtime synchronization"); - googleHelper.loadRealtime(syncAttributes.id, content, function(err, doc) { + googleHelper.loadRealtime(syncAttributes.id, localContent, function(err, doc) { if(err || !doc) { callback(err); return; @@ -279,13 +282,63 @@ define([ realtimeDocument = doc; var model = realtimeDocument.getModel(); var string = model.getRoot().get('content'); + + // Saves model content checksum + function updateContentState() { + syncAttributes.contentCRC = utils.crc32(string.getText()); + utils.storeAttributes(syncAttributes); + } + + var debouncedRefreshPreview = _.debounce(editor.refreshPreview, 100); + // Called when a modification has been detected + function contentChangeListener(e) { + console.log(e); + // If modification comes down from a collaborator + if(e.isLocal === false) { + logger.log("Google Drive realtime document updated from server"); + updateContentState(); + debouncedRefreshPreview(); + } + } + // Listen to text changed events + string.addEventListener(gapi.drive.realtime.EventType.TEXT_INSERTED, contentChangeListener); + string.addEventListener(gapi.drive.realtime.EventType.TEXT_DELETED, contentChangeListener); + realtimeDocument.addEventListener(gapi.drive.realtime.EventType.DOCUMENT_SAVE_STATE_CHANGED, function(e) { + console.log(e); + // Save success event + if(e.isPending === false && e.isSaving === false) { + logger.log("Google Drive realtime document successfully saved on server"); + updateContentState(); + } + }); + + // Try to merge offline modifications + var localContentChanged = syncAttributes.contentCRC != utils.crc32(localContent); + var remoteContent = string.getText(); + var remoteContentCRC = utils.crc32(remoteContent); + var remoteContentChanged = syncAttributes.contentCRC != remoteContentCRC; + var fileContentChanged = localContent != remoteContent; + if(fileContentChanged === true && localContentChanged === true) { + if(remoteContentChanged === true) { + // Conflict detected + fileMgr.createFile(localTitle + " (backup)", localContent); + extensionMgr.onMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.'); + } + else { + // Add local modifications if no collaborators change + string.setText(localContent); + } + } + + // Binds model with textarea realtimeBinding = gapi.drive.realtime.databinding.bindString(string, $("#wmd-input")[0]); - // Listen to text changed events - var debouncedRefreshPreview = _.debounce(editor.refreshPreview, 100); - string.addEventListener(gapi.drive.realtime.EventType.TEXT_INSERTED, debouncedRefreshPreview); - string.addEventListener(gapi.drive.realtime.EventType.TEXT_DELETED, debouncedRefreshPreview); - debouncedRefreshPreview(); + // Update content state according to collaborators changes + if(remoteContentChanged === true) { + logger.log("Google Drive realtime document updated from server"); + updateContentState(); + debouncedRefreshPreview(); + } // Save undo/redo buttons actions undoExecute = editor.uiManager.buttons.undo.execute; @@ -299,7 +352,7 @@ define([ model.canRedo && model.redo(); }; - // Add event handler for UndoRedoStateChanged events. + // Add event handler for model's UndoRedoStateChanged events function setUndoRedoState() { editor.uiManager.setButtonState(editor.uiManager.buttons.undo, model.canUndo); editor.uiManager.setButtonState(editor.uiManager.buttons.redo, model.canRedo); diff --git a/js/synchronizer.js b/js/synchronizer.js index e16628ab..64f1fa65 100644 --- a/js/synchronizer.js +++ b/js/synchronizer.js @@ -45,6 +45,13 @@ define([ } }); }); + + // Returns true if at least one file has synchronized location + synchronizer.hasSync = function() { + return _.some(providerMap, function(provider) { + return fileMgr.hasSync(provider); + }); + }; /*************************************************************************** * Standard synchronization @@ -234,7 +241,7 @@ define([ function tryStartRealtimeSync() { if(realtimeFileDesc !== undefined && isOnline === true) { core.lockUI(true); - realtimeSyncAttributes.provider.startRealtimeSync(realtimeFileDesc.content, realtimeSyncAttributes, function() { + realtimeSyncAttributes.provider.startRealtimeSync(realtimeFileDesc.title, realtimeFileDesc.content, realtimeSyncAttributes, function() { core.lockUI(false); }); }