suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly revert attachment renames if they fail. Closes #430

Browse Source
This commit is contained in:
Aurimas Vinckevicius 2013-11-23 18:28:46 -06:00 committed by aurimasv
parent 59ef7cba04
commit 04335ef418
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chrome/content/zotero/bindings/attachmentbox.xml
View File

@ -401,15 +401,17 @@
'', '',
newFilename + ' exists. Overwrite existing file?' newFilename + ' exists. Overwrite existing file?'
); );
if (confirmed) { if (!confirmed) {
item.renameAttachmentFile(newFilename, true);
break;
}
// If they said not to overwrite existing file, // If they said not to overwrite existing file,
// start again // start again
continue; continue;
} }
else if (renamed == -2) {
// Force overwrite, but make sure we check that this doesn't fail
renamed = item.renameAttachmentFile(newFilename, true);
}
if (renamed == -2) {
nsIPS.alert( nsIPS.alert(
window, window,
Zotero.getString('general.error'), Zotero.getString('general.error'),

14
chrome/content/zotero/xpcom/data/item.js
View File

@ -3009,6 +3009,7 @@ Zotero.Item.prototype.renameAttachmentFile = function(newName, overwrite) {
return false; return false;
} }
var origModDate = file.lastModifiedTime;
try { try {
newName = Zotero.File.getValidFileName(newName); newName = Zotero.File.getValidFileName(newName);
@ -3027,18 +3028,17 @@ Zotero.Item.prototype.renameAttachmentFile = function(newName, overwrite) {
// files, since dest.exists() will just show true on a case-insensitive // files, since dest.exists() will just show true on a case-insensitive
// filesystem anyway. // filesystem anyway.
if (file.leafName.toLowerCase() != dest.leafName.toLowerCase()) { if (file.leafName.toLowerCase() != dest.leafName.toLowerCase()) {
if (overwrite) { if (!overwrite && dest.exists()) {
dest.remove(false);
}
else if (dest.exists()) {
return -1; return -1;
} }
} }
file.moveTo(null, newName);
// Update mod time and clear hash so the file syncs // Update mod time and clear hash so the file syncs
// TODO: use an integer counter instead of mod time for change detection // TODO: use an integer counter instead of mod time for change detection
dest.lastModifiedTime = new Date(); // Update mod time first, because it may fail for read-only files on Windows
file.lastModifiedTime = new Date();
file.moveTo(null, newName);
this.relinkAttachmentFile(dest); this.relinkAttachmentFile(dest);
Zotero.DB.beginTransaction(); Zotero.DB.beginTransaction();
@ -3051,6 +3051,8 @@ Zotero.Item.prototype.renameAttachmentFile = function(newName, overwrite) {
return true; return true;
} }
catch (e) { catch (e) {
// Restore original modification date in case we managed to change it
try { file.lastModifiedTime = origModDate } catch (e) {}
Zotero.debug(e); Zotero.debug(e);
Components.utils.reportError(e); Components.utils.reportError(e);
return -2; return -2;