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

Merge pull request #481 from aurimasv/import-network-shares

Browse Source 
Recognize Windows network shares on file attachment import
This commit is contained in:
Simon Kornblith 2014-05-14 23:54:45 -04:00
commit 2a292faeaf
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chrome/content/zotero/xpcom/translation/translate_item.js
View File

@ -329,10 +329,16 @@ Zotero.Translate.ItemSaver.prototype = {
var file;
// First, try to parse as absolute path
if(((/[a-zA-Z]:\\/.test(path) && Zotero.isWin) || (path[0] === "/" && !Zotero.isWin))
&& (file = this._parseAbsolutePath(path))) {
Zotero.debug("Translate: Got file "+path+" as absolute path");
return file;
if((/^[a-zA-Z]:[\\\/]|^\\\\/.test(path) && Zotero.isWin) // Paths starting with drive letter or network shares starting with \\
|| (path[0] === "/" && !Zotero.isWin)) {
// Forward slashes on Windows are not allowed in filenames, so we can
// assume they're meant to be backslashes. Backslashes are technically
// allowed on Linux, so the reverse cannot be done reliably.
var nativePath = Zotero.isWin ? path.replace('/', '\\', 'g') : path;
if (file = this._parseAbsolutePath(nativePath)) {
Zotero.debug("Translate: Got file "+nativePath+" as absolute path");
return file;
}
}
// Next, try to parse as URI