commit 490bd19f0de0a86bafdfbdceb52120687c4ee82d
parent d1945d79b4d2d582482c7ecb28183390cc465630
Author: Dan Stillman <dstillman@zotero.org>
Date: Wed, 13 May 2009 07:59:41 +0000
Skip WebDAV file downloads if server hasn't been updated since last local sync -- this should greatly reduce WebDAV load for people with lots of missing attachment files
Diffstat:
1 file changed, 120 insertions(+), 27 deletions(-)
diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
@@ -248,6 +248,26 @@ Zotero.Sync.Storage = new function () {
Zotero.Sync.Storage.checkForUpdatedFiles();
+ var successFileCheckCallback = function (lastSyncTime) {
+ var downloadFiles = true;
+ if (lastSyncTime) {
+ var sql = "SELECT version FROM version WHERE schema='storage'";
+ var version = Zotero.DB.valueQuery(sql);
+ if (version == lastSyncTime) {
+ Zotero.debug("Last storage sync time hasn't changed -- skipping file download step");
+ downloadFiles = false;
+ }
+ }
+
+ var activeDown = downloadFiles ? Zotero.Sync.Storage.downloadFiles() : false;
+ var activeUp = Zotero.Sync.Storage.uploadFiles();
+ if (!activeDown && !activeUp) {
+ _syncInProgress = false;
+ Zotero.Sync.Runner.reset();
+ Zotero.Sync.Runner.next();
+ }
+ };
+
// If authorization header isn't cached, cache it before proceeding,
// since during testing Firefox 3.0.1 was being a bit amnesic with auth
// info for subsequent requests -- surely a better way to fix this
@@ -258,24 +278,12 @@ Zotero.Sync.Storage = new function () {
_cachedCredentials.authHeader = authHeader;
}
- var activeDown = Zotero.Sync.Storage.downloadFiles();
- var activeUp = Zotero.Sync.Storage.uploadFiles();
- if (!activeDown && !activeUp) {
- _syncInProgress = false;
- Zotero.Sync.Runner.reset();
- Zotero.Sync.Runner.next();
- }
+ _getSuccessFileTimestamp(successFileCheckCallback);
});
return;
}
- var activeDown = Zotero.Sync.Storage.downloadFiles();
- var activeUp = Zotero.Sync.Storage.uploadFiles();
- if (!activeDown && !activeUp) {
- _syncInProgress = false;
- Zotero.Sync.Runner.reset();
- Zotero.Sync.Runner.next();
- }
+ _getSuccessFileTimestamp(successFileCheckCallback);
}
@@ -614,6 +622,12 @@ Zotero.Sync.Storage = new function () {
_syncInProgress = true;
}
+ var downloadFileIDs = _getFilesToDownload();
+ if (!downloadFileIDs) {
+ Zotero.debug("No files to download");
+ return false;
+ }
+
// Check for active operations?
var queue = Zotero.Sync.Storage.QueueManager.get('download');
if (queue.isRunning()) {
@@ -622,12 +636,6 @@ Zotero.Sync.Storage = new function () {
}
queue.reset();
- var downloadFileIDs = _getFilesToDownload();
- if (!downloadFileIDs) {
- Zotero.debug("No files to download");
- return false;
- }
-
for each(var itemID in downloadFileIDs) {
var item = Zotero.Items.get(itemID);
if (Zotero.Sync.Storage.getSyncState(itemID) !=
@@ -745,6 +753,12 @@ Zotero.Sync.Storage = new function () {
_syncInProgress = true;
}
+ var uploadFileIDs = _getFilesToUpload();
+ if (!uploadFileIDs) {
+ Zotero.debug("No files to upload");
+ return false;
+ }
+
// Check for active operations?
var queue = Zotero.Sync.Storage.QueueManager.get('upload');
if (queue.isRunning()) {
@@ -753,12 +767,6 @@ Zotero.Sync.Storage = new function () {
}
queue.reset();
- var uploadFileIDs = _getFilesToUpload();
- if (!uploadFileIDs) {
- Zotero.debug("No files to upload");
- return false;
- }
-
Zotero.debug(uploadFileIDs.length + " file(s) to upload");
for each(var itemID in uploadFileIDs) {
@@ -1000,6 +1008,9 @@ Zotero.Sync.Storage = new function () {
var sql = "UPDATE itemAttachments SET syncState=?";
Zotero.DB.query(sql, [syncState]);
+
+ var sql = "DELETE FROM version WHERE schema='storage'";
+ Zotero.DB.query(sql);
}
@@ -1972,11 +1983,19 @@ Zotero.Sync.Storage = new function () {
}
- this.finish = function (cancelled) {
+ this.finish = function (cancelled, skipSuccessFile) {
if (!_syncInProgress) {
throw ("Sync not in progress in Zotero.Sync.Storage.finish()");
}
+ // Upload success file when done
+ if (!cancelled && !this.resyncOnFinish && !skipSuccessFile) {
+ _uploadSuccessFile(function () {
+ Zotero.Sync.Storage.finish(false, true);
+ });
+ return;
+ }
+
Zotero.debug("Storage sync is complete");
_syncInProgress = false;
@@ -1998,6 +2017,80 @@ Zotero.Sync.Storage = new function () {
}
+ function _getSuccessFileTimestamp(callback) {
+ try {
+ var uri = Zotero.Sync.Storage.rootURI;
+ var successFileURI = uri.clone();
+ successFileURI.spec += "lastsync";
+ Zotero.Utilities.HTTP.doGet(successFileURI, function (req) {
+ var ts = undefined;
+ try {
+ Zotero.debug(req.responseText);
+ Zotero.debug(req.status);
+ var lastModified = req.getResponseHeader("Last-modified");
+ var date = new Date(lastModified);
+ Zotero.debug("Last successful storage sync was " + date);
+ var ts = Zotero.Date.toUnixTimestamp(date);
+ }
+ finally {
+ callback(ts);
+ }
+ });
+ return;
+ }
+ catch (e) {
+ Zotero.debug(e);
+ Components.utils.reportError(e);
+ callback();
+ return;
+ }
+ }
+
+
+ function _uploadSuccessFile(callback) {
+ try {
+ var uri = Zotero.Sync.Storage.rootURI;
+ var successFileURI = uri.clone();
+ successFileURI.spec += "lastsync";
+ Zotero.Utilities.HTTP.WebDAV.doPut(successFileURI, "", function (req) {
+ Zotero.debug(req.responseText);
+ Zotero.debug(req.status);
+
+ switch (req.status) {
+ case 200:
+ case 201:
+ case 204:
+ _getSuccessFileTimestamp(function (ts) {
+ if (ts) {
+ var sql = "REPLACE INTO version VALUES ('storage', ?)";
+ Zotero.DB.query(sql, { int: ts });
+ }
+ if (callback) {
+ callback();
+ }
+ });
+ return;
+ }
+
+ var msg = "Unexpected error code " + req.status + " uploading storage success file";
+ Zotero.debug(msg, 2);
+ Components.utils.reportError(msg);
+ if (callback) {
+ callback();
+ }
+ });
+ }
+ catch (e) {
+ Zotero.debug(e);
+ Components.utils.reportError(e);
+ if (callback) {
+ callback();
+ }
+ return;
+ }
+ }
+
+
/**
* Get the storage URI for an item
*
