mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

- Fix "Unexpected status code 404" in WebDAV downloadFile()

Browse source 
- Display a nicer message on a 403 upload error after verification
- Fix _deleteStorageFiles() for WebDAV
This commit is contained in:
Dan Stillman 2009-09-23 07:51:01 +00:00
parent e239b69d76
commit 6d9bd979ef
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
chrome/content/zotero/xpcom/storage/webdav.js
View file

@ -326,7 +326,18 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.downloadFile = function (request) {
request.onProgress(a, b, c) request.onProgress(a, b, c)
}, },
onStop: function (request, status, response, data) { onStop: function (request, status, response, data) {
if (status != 200) { if (status == 404) {
var msg = "Remote ZIP file not found for item " + item.key;
Zotero.debug(msg, 2);
Components.utils.reportError(msg);
// Delete the orphaned prop file
self._deleteStorageFiles([item.key + ".prop"], null, self);
data.request.finish();
return;
}
else if (status != 200) {
self.onError("Unexpected status code " + status self.onError("Unexpected status code " + status
+ " for request " + data.request.name + " in Zotero.Sync.Storage.Session.WebDAV.downloadFile()"); + " for request " + data.request.name + " in Zotero.Sync.Storage.Session.WebDAV.downloadFile()");
return; return;
@ -512,6 +523,11 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._onUploadComplete = function (httpR
case 204: case 204:
break; break;
case 403:
this.onError("File upload failed. Please verify your WebDAV server "
+ "from the Sync pane of the Zotero preferences.");
return;
default: default:
this.onError("Unexpected file upload status " + status this.onError("Unexpected file upload status " + status
+ " in Zotero.Sync.Storage._onUploadComplete()"); + " in Zotero.Sync.Storage._onUploadComplete()");
@ -1312,7 +1328,7 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._getPropertyURIFromItemURI = functi
* 'deleted', 'missing', and 'error', * 'deleted', 'missing', and 'error',
* each containing filenames * each containing filenames
*/ */
Zotero.Sync.Storage.Session.WebDAV.prototype._deleteStorageFiles = function (files, callback) { Zotero.Sync.Storage.Session.WebDAV.prototype._deleteStorageFiles = function (files, callback, session) {
var results = { var results = {
deleted: [], deleted: [],
missing: [], missing: [],
@ -1326,14 +1342,18 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._deleteStorageFiles = function (fil
return; return;
} }
var self = session ? session : this;
for (var i=0; i<files.length; i++) { for (var i=0; i<files.length; i++) {
let last = (i == files.length - 1); let last = (i == files.length - 1);
let fileName = files[i]; let fileName = files[i];
let deleteURI = Zotero.Sync.Storage.rootURI; let deleteURI = self.rootURI;
// This should never happen, but let's be safe // This should never happen, but let's be safe
if (!deleteURI.spec.match(/\/$/)) { if (!deleteURI.spec.match(/\/$/)) {
callback(deleted); if (callback) {
callback(deleted);
}
_error("Root URI does not end in slash in " _error("Root URI does not end in slash in "
+ "Zotero.Sync.Storage._deleteStorageFiles()"); + "Zotero.Sync.Storage._deleteStorageFiles()");
} }
@ -1366,7 +1386,7 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._deleteStorageFiles = function (fil
} }
// If an item file URI, get the property URI // If an item file URI, get the property URI
var deletePropURI = _getPropertyURIFromItemURI(deleteURI); var deletePropURI = self._getPropertyURIFromItemURI(deleteURI);
if (!deletePropURI) { if (!deletePropURI) {
if (fileDeleted) { if (fileDeleted) {
results.deleted.push(fileName); results.deleted.push(fileName);