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

Expose private Attachments functions for electron

Browse source
This commit is contained in:
Adomas Venčkauskas 2018-08-15 17:09:15 +03:00
parent 51e181cb81
commit 850d2d2977
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/attachments.js
View file

@ -431,11 +431,11 @@ Zotero.Attachments = new function(){
fileBaseName = this.getFileBaseNameFromItem(parentItem); fileBaseName = this.getFileBaseNameFromItem(parentItem);
} }
if (fileBaseName) { if (fileBaseName) {
let ext = _getExtensionFromURL(url, contentType); let ext = this._getExtensionFromURL(url, contentType);
var filename = fileBaseName + (ext != '' ? '.' + ext : ''); var filename = fileBaseName + (ext != '' ? '.' + ext : '');
} }
else { else {
var filename = _getFileNameFromURL(url, contentType); var filename = this._getFileNameFromURL(url, contentType);
} }
// Create a temporary directory to save to within the storage directory. // Create a temporary directory to save to within the storage directory.
@ -644,7 +644,7 @@ Zotero.Attachments = new function(){
// Override MIME type to application/pdf if extension is .pdf -- // Override MIME type to application/pdf if extension is .pdf --
// workaround for sites that respond to the HEAD request with an // workaround for sites that respond to the HEAD request with an
// invalid MIME type (https://www.zotero.org/trac/ticket/460) // invalid MIME type (https://www.zotero.org/trac/ticket/460)
var ext = _getExtensionFromURL(url); var ext = this._getExtensionFromURL(url);
if (ext == 'pdf') { if (ext == 'pdf') {
contentType = 'application/pdf'; contentType = 'application/pdf';
} }
@ -731,7 +731,7 @@ Zotero.Attachments = new function(){
var tmpDir = (yield this.createTemporaryStorageDirectory()).path; var tmpDir = (yield this.createTemporaryStorageDirectory()).path;
try { try {
var fileName = Zotero.File.truncateFileName(_getFileNameFromURL(url, contentType), 100); var fileName = Zotero.File.truncateFileName(this._getFileNameFromURL(url, contentType), 100);
var tmpFile = OS.Path.join(tmpDir, fileName); var tmpFile = OS.Path.join(tmpDir, fileName);
// If we're using the title from the document, make some adjustments // If we're using the title from the document, make some adjustments
@ -742,7 +742,7 @@ Zotero.Attachments = new function(){
title = title.replace(/(.+ \([^,]+, [0-9]+x[0-9]+[^\)]+\)) - .+/, "$1" ); title = title.replace(/(.+ \([^,]+, [0-9]+x[0-9]+[^\)]+\)) - .+/, "$1" );
} }
// If not native type, strip mime type data in parens // If not native type, strip mime type data in parens
else if (!Zotero.MIME.hasNativeHandler(contentType, _getExtensionFromURL(url))) { else if (!Zotero.MIME.hasNativeHandler(contentType, this._getExtensionFromURL(url))) {
title = title.replace(/(.+) \([a-z]+\/[^\)]+\)/, "$1" ); title = title.replace(/(.+) \([a-z]+\/[^\)]+\)/, "$1" );
} }
} }
@ -1471,7 +1471,7 @@ Zotero.Attachments = new function(){
}); });
function _getFileNameFromURL(url, contentType){ this._getFileNameFromURL = function(url, contentType) {
var nsIURL = Components.classes["@mozilla.org/network/standard-url;1"] var nsIURL = Components.classes["@mozilla.org/network/standard-url;1"]
.createInstance(Components.interfaces.nsIURL); .createInstance(Components.interfaces.nsIURL);
nsIURL.spec = url; nsIURL.spec = url;
@ -1522,7 +1522,7 @@ Zotero.Attachments = new function(){
} }
function _getExtensionFromURL(url, contentType) { this._getExtensionFromURL = function(url, contentType) {
var nsIURL = Components.classes["@mozilla.org/network/standard-url;1"] var nsIURL = Components.classes["@mozilla.org/network/standard-url;1"]
.createInstance(Components.interfaces.nsIURL); .createInstance(Components.interfaces.nsIURL);
nsIURL.spec = url; nsIURL.spec = url;