scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-06 02:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allow attachment.path to be one of the following:

Browse source 
- An absolute path
- A relative path
- A file:/// URI
- A mangled absolute path that's missing a leading /
This commit is contained in:
Simon Kornblith 2012-04-27 23:15:12 -04:00
parent 24f7b9fe48
commit effffd621b
1 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
chrome/content/zotero/xpcom/translation/translate_item.js
View file

@ -238,36 +238,8 @@ Zotero.Translate.ItemSaver.prototype = {
Zotero.debug("Translate: Created attachment; id is "+myID, 4);
var newItem = Zotero.Items.get(myID);
} else {
var uri, file;
// generate nsIFile
var IOService = Components.classes["@mozilla.org/network/io-service;1"].
getService(Components.interfaces.nsIIOService);
try {
var uri = IOService.newURI(attachment.path, "", this._baseURI);
}
catch (e) {
var msg = "Error parsing attachment path: " + attachment.path;
Zotero.logError(msg);
Zotero.debug("Translate: " + msg, 2);
return;
}
try {
var file = uri.QueryInterface(Components.interfaces.nsIFileURL).file;
if (file.path == '/') {
var msg = "Error parsing attachment path: " + attachment.path;
Zotero.logError(msg);
Zotero.debug("Translate: " + msg, 2);
return;
}
}
catch (e) {
var msg = "Error getting file from attachment path: " + attachment.path;
Zotero.logError(msg);
Zotero.debug("Translate: " + msg, 2);
return;
}
var file = this._parsePath(attachment.path);
if(!file) return;
if (!file.exists()) {
// use attachment title if possible, or else file leaf name
@ -308,6 +280,45 @@ Zotero.Translate.ItemSaver.prototype = {
return newItem;
},
"_parsePath":function(path) {
// generate nsIFile
var IOService = Components.classes["@mozilla.org/network/io-service;1"].
getService(Components.interfaces.nsIIOService);
try {
var uri = IOService.newURI(path, "", this._baseURI);
}
catch (e) {
var msg = "Error parsing attachment path: " + attachment.path;
Zotero.logError(msg);
Zotero.debug("Translate: " + msg, 2);
return false;
}
try {
var file = uri.QueryInterface(Components.interfaces.nsIFileURL).file;
if (file.path == '/') {
var msg = "Error parsing attachment path: " + attachment.path;
Zotero.logError(msg);
Zotero.debug("Translate: " + msg, 2);
return false;
}
}
catch (e) {
var msg = "Error getting file from attachment path: " + attachment.path;
Zotero.logError(msg);
Zotero.debug("Translate: " + msg, 2);
return false;
}
if(!file.exists() && path[0] !== "/" && path.substr(0, 5).toLowerCase() !== "file:") {
// This looks like a relative path, but it might actually be an absolute path, because
// some people are not quite there.
var newFile = this._parsePath("/"+path);
if(newFile.exists()) return newFile;
}
return file;
},
"_saveAttachmentDownload":function(attachment, parentID) {
Zotero.debug("Translate: Adding attachment", 4);