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

Merge pull request #630 from aurimasv/attach-url

Browse source 
Don't try to parse path if it looks like a web URL
This commit is contained in:
Dan Stillman 2015-02-11 01:22:39 -05:00
commit 161733b207
1 changed files with 60 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,6 +226,17 @@ Zotero.Translate.ItemSaver.prototype = {
return false; return false;
} }
if (attachment.path) {
var url = Zotero.Attachments.cleanAttachmentURI(attachment.path, false);
if (url && /^(?:https?|ftp):/.test(url)) {
// A web URL. Don't bother parsing it as path below
// Some paths may look like URIs though, so don't just test for 'file'
// E.g. C:\something
if (!attachment.url) attachment.url = attachment.path;
delete attachment.path;
}
}
let done = false; let done = false;
if (attachment.path) { if (attachment.path) {
var file = this._parsePath(attachment.path); var file = this._parsePath(attachment.path);
@ -318,43 +329,73 @@ Zotero.Translate.ItemSaver.prototype = {
"_parsePathURI":function(path) { "_parsePathURI":function(path) {
try { try {
var uri = Services.io.newURI(path, "", this._baseURI); var uri = Services.io.newURI(path, "", this._baseURI);
} catch(e) {
Zotero.debug("Translate: " + path + " is not a valid URI");
return false;
}
try {
var file = uri.QueryInterface(Components.interfaces.nsIFileURL).file; var file = uri.QueryInterface(Components.interfaces.nsIFileURL).file;
if(file.path != '/' && file.exists()) return file;
} }
catch (e) { catch (e) {
Zotero.logError(e); Zotero.debug("Translate: " + uri.spec + " is not a file URI");
return false;
} }
return false;
if(file.path == '/') {
Zotero.debug("Translate: " + path + " points to root directory");
return false;
}
if(!file.exists()) {
Zotero.debug("Translate: File at " + file.path + " does not exist");
return false;
}
return file;
}, },
"_parseAbsolutePath":function(path) { "_parseAbsolutePath":function(path) {
var file = Components.classes["@mozilla.org/file/local;1"].
createInstance(Components.interfaces.nsILocalFile);
try { try {
// First, try to parse absolute paths using initWithPath
var file = Components.classes["@mozilla.org/file/local;1"].
createInstance(Components.interfaces.nsILocalFile);
file.initWithPath(path); file.initWithPath(path);
if(file.exists()) return file;
} catch(e) { } catch(e) {
Zotero.logError(e); Zotero.debug("Translate: Invalid absolute path: " + path);
return false;
} }
return false;
if(!file.exists()) {
Zotero.debug("Translate: File at absolute path " + file.path + " does not exist");
return false;
}
return file;
}, },
"_parseRelativePath":function(path) { "_parseRelativePath":function(path) {
try { if (!this._baseURI) {
var file = this._baseURI.QueryInterface(Components.interfaces.nsIFileURL).file.parent; Zotero.debug("Translate: Cannot parse as relative path. No base URI available.");
var splitPath = path.split(/\//g); return false;
for(var i=0; i<splitPath.length; i++) {
if(splitPath[i] !== "") file.append(splitPath[i]);
}
if(file.exists()) return file;
} catch(e) {
Zotero.logError(e);
} }
return false;
var file = this._baseURI.QueryInterface(Components.interfaces.nsIFileURL).file.parent;
var splitPath = path.split(/\//g);
for(var i=0; i<splitPath.length; i++) {
if(splitPath[i] !== "") file.append(splitPath[i]);
}
if(!file.exists()) {
Zotero.debug("Translate: File at " + file.path + " does not exist");
return false;
}
return file;
}, },
"_parsePath":function(path) { "_parsePath":function(path) {
Zotero.debug("Translate: Attempting to parse path " + path);
var file; var file;
// First, try to parse as absolute path // First, try to parse as absolute path