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

Don't return unparsed Mac persistent descriptor from Item.getFilePath()

Browse Source 
And auto-convert to path, not filename
This commit is contained in:
Dan Stillman 2017-10-31 22:03:05 -04:00
parent 4137a61bc8
commit 14ecf88ad4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2191,13 +2191,21 @@ Zotero.Item.prototype.getFilePath = function () {
// //
// These should only exist if they weren't converted in the 80 DB upgrade step because // These should only exist if they weren't converted in the 80 DB upgrade step because
// the file couldn't be found. // the file couldn't be found.
if (Zotero.isMac && path.startsWith('AAAA')) { if (path.startsWith('AAAA')) {
// These can only be resolved on Macs
if (!Zotero.isMac) {
Zotero.debug(`Can't resolve old-style attachment path '${path}' on non-Mac platform`);
this._updateAttachmentStates(false);
return false;
}
let file = Components.classes["@mozilla.org/file/local;1"] let file = Components.classes["@mozilla.org/file/local;1"]
.createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
try { try {
file.persistentDescriptor = path; file.persistentDescriptor = path;
} }
catch (e) { catch (e) {
Zotero.debug(`Can't resolve old-style attachment path '${path}'`);
this._updateAttachmentStates(false); this._updateAttachmentStates(false);
return false; return false;
} }
@ -2205,7 +2213,7 @@ Zotero.Item.prototype.getFilePath = function () {
// If valid, convert this to a regular string in the background // If valid, convert this to a regular string in the background
Zotero.DB.queryAsync( Zotero.DB.queryAsync(
"UPDATE itemAttachments SET path=? WHERE itemID=?", "UPDATE itemAttachments SET path=? WHERE itemID=?",
[file.leafName, this._id] [file.path, this._id]
); );
return file.path; return file.path;