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

Skip and log too-long filenames on Linux (since they're most likely gibberish advertising files anyway)

Browse source
This commit is contained in:
Dan Stillman 2011-08-02 22:41:09 +00:00
parent c2db7b53b1
commit d4287e4459
1 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
chrome/content/zotero/xpcom/storage.js
View file

@ -915,12 +915,15 @@ Zotero.Sync.Storage = new function () {
else if (e.name == "NS_ERROR_FAILURE" && destFile.leafName.length >= 244) {
nameLength = true;
}
// ecrypt (on Ubuntu, at least) can result in a lower limit —
// not much we can do about this, but throw a specific error
// Filesystem encryption (or, more specifically, filename encryption)
// can result in a lower limit -- not much we can do about this,
// but log a warning and skip the file
else if (e.name == "NS_ERROR_FAILURE" && Zotero.isLinux && destFile.leafName.length > 130) {
var e = "Error creating file '" + destFile.leafName + "'\n\n"
+ "Check whether you are using a filesystem encryption such as eCryptfs "
+ "that results in a filename length limit below 255 bytes.";
Zotero.debug(e);
var msg = "Error creating file '" + destFile.leafName + "'\n\n"
+ "See http://www.zotero.org/support/kb/encrypted_filenames for more information.";
Components.utils.reportError(msg);
return;
}
if (windowsLength || nameLength) {
@ -1113,13 +1116,16 @@ Zotero.Sync.Storage = new function () {
else if (e.name == "NS_ERROR_FAILURE" && destFile.leafName.length >= 244) {
nameLength = true;
}
// ecrypt (on Ubuntu, at least) can result in a lower limit --
// not much we can do about this, but log a warning
// Filesystem encryption (or, more specifically, filename encryption)
// can result in a lower limit -- not much we can do about this,
// but log a warning and skip the file
else if (e.name == "NS_ERROR_FAILURE" && Zotero.isLinux && destFile.leafName.length > 130) {
var msg = "Error creating file '" + destFile.leafName + "' "
+ "(Are you using filesystem encryption such as ecrypt "
+ "that results in a filename length limit below 255 bytes?)";
Zotero.debug(e);
// TODO: localize
var msg = "Error creating file '" + destFile.leafName + "'. "
+ "See http://www.zotero.org/support/kb/encrypted_filenames for more information.";
Components.utils.reportError(msg);
continue;
}
if (windowsLength || nameLength) {
@ -1168,7 +1174,26 @@ Zotero.Sync.Storage = new function () {
Zotero.debug(msg, 2);
Components.utils.reportError(msg);
destFile.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
try {
destFile.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
}
catch (e) {
// See above
if (e.name == "NS_ERROR_FAILURE" && Zotero.isLinux && destFile.leafName.length > 130) {
Zotero.debug(e);
// TODO: localize
var msg = "Error creating file '" + destFile.leafName + "'. "
+ "See http://www.zotero.org/support/kb/encrypted_filenames for more information.";
Components.utils.reportError(msg);
continue;
}
zipReader.close();
Components.utils.reportError(e);
var msg = Zotero.getString('sync.storage.error.fileNotCreated', parentDir.leafName + '/' + fileName);
throw(msg);
}
if (primaryFile) {
renamed = true;