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

Allow Verify Server to pass if uploaded file doesn't exist

Browse source 
With any storage service backed by S3 or another eventually consistent
storage service, there will be a short delay between when files
are uploaded and when they're available, so show a more helpful message
and allow the verification to pass. (Any IIS servers configured not to
serve extensionless files will also fail, but that's probably much
rarer at this point.)

We should also just retry the request on a 404, but that will have to
happen on master.

Addresses #115
This commit is contained in:
Dan Stillman 2013-02-08 00:57:20 -05:00
parent 54af603989
commit be48ce06b6
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -983,7 +983,12 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServer = function (callback) {
callback(uri, Zotero.Sync.Storage.ERROR_FORBIDDEN);
return;
// IIS 6+ configured not to serve extensionless files or .prop files
// This can happen with cloud storage services
// backed by S3 or other eventually consistent
// data stores.
//
// This can also be from IIS 6+, which is configured
// not to serve extensionless files or .prop files
// http://support.microsoft.com/kb/326965
case 404:
callback(uri, Zotero.Sync.Storage.ERROR_FILE_MISSING_AFTER_UPLOAD);
@ -1208,9 +1213,15 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServerCallback = function (uri
case Zotero.Sync.Storage.ERROR_FILE_MISSING_AFTER_UPLOAD:
// TODO: localize
var errorTitle = "WebDAV Server Configuration Error";
var errorMessage = "Your WebDAV server must be configured to serve files without extensions "
+ "and files with .prop extensions in order to work with Zotero.";
var errorTitle = Zotero.getString("general.warning");
var errorMessage = "A potential problem was found with your WebDAV server.\n\n"
+ "An uploaded file was not immediately available for download. There may be a "
+ "short delay between when you upload files and when they become available, "
+ "particularly if you are using a cloud storage service.\n\n"
+ "If Zotero file syncing appears to work normally, "
+ "you can ignore this message. "
+ "If you have trouble, please post to the Zotero Forums.";
Zotero.Prefs.set("sync.storage.verified", true);
break;
case Zotero.Sync.Storage.ERROR_SERVER_ERROR: