Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve suggested filename on download

Browse Source 
For all of the following URLs, "file.pdf" will be suggested:
http://.../file.pdf
http://.../download.aspx?file=file.pdf&whatever
http://.../get.pdf?name=file.pdf&whatever
http://.../single-page-app#view=file.pdf
http://.../download.aspx?file=%2Fpath%2Fto%2Ffile.pdf&whatever

Fixes #3161
This commit is contained in:
Rob Wu 2013-07-10 20:14:00 +02:00
parent 69a64d45bc
commit 84ae29c21d
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/firefox/components/PdfStreamConverter.js
View File

@ -206,6 +206,10 @@ ChromeActions.prototype = {
// The data may not be downloaded so we need just retry getting the pdf with
// the original url.
var originalUri = NetUtil.newURI(data.originalUrl);
var filename = data.filename;
if (typeof filename !== 'string' || !/\.pdf$/i.test(filename)) {
filename = 'document.pdf';
}
var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri;
var extHelperAppSvc =
Cc['@mozilla.org/uriloader/external-helper-app-service;1'].
@ -234,7 +238,9 @@ ChromeActions.prototype = {
// contentDisposition/contentDispositionFilename is readonly before FF18
channel.contentDisposition = Ci.nsIChannel.DISPOSITION_ATTACHMENT;
if (self.contentDispositionFilename) {
channel.contentDispositionFilename = self.contentDispositionFilename;
channel.contentDispositionFilename = self.contentDispositionFilename;
} else {
channel.contentDispositionFilename = filename;
}
} catch (e) {}
channel.setURI(originalUri);

38
web/viewer.js
View File

@ -916,6 +916,30 @@ var PDFView = {
download: function pdfViewDownload() {
var url = this.url.split('#')[0];
function getPDFFileNameFromURL(url) {
var reURI = /^(?:([^:]+:)?\/\/[^\/]+)?([^?#]*)(\?[^#]*)?(#.*)?$/;
// SCHEME HOST 1.PATH 2.QUERY 3.REF
// Pattern to get last matching NAME.pdf
var reFilename = /[^\/?#=]+\.pdf\b(?!.*\.pdf\b)/i;
var splitURI = reURI.exec(url);
var suggestedFilename = reFilename.exec(splitURI[1]) ||
reFilename.exec(splitURI[2]) ||
reFilename.exec(splitURI[3]);
if (suggestedFilename) {
suggestedFilename = suggestedFilename[0];
if (suggestedFilename.indexOf('%') != -1) {
// URL-encoded %2Fpath%2Fto%2Ffile.pdf should be file.pdf
try {
suggestedFilename =
reFilename.exec(decodeURIComponent(suggestedFilename))[0];
} catch(e) { // Possible (extremely rare) errors:
// URIError "Malformed URI", e.g. for "%AA.pdf"
// TypeError "null has no properties", e.g. for "%2F.pdf"
}
}
}
return suggestedFilename || 'document.pdf';
}
//#if !(FIREFOX || MOZCENTRAL)
function noData() {
triggerSaveAs(url + '#pdfjs.action=download');
@ -940,8 +964,7 @@ var PDFView = {
// Use a.download if available. This increases the likelihood that
// the file is downloaded instead of opened by another PDF plugin.
if ('download' in a) {
var filename = url.match(/([^\/?#=]+\.pdf\b)(?!.*\.pdf\b)/i);
a.download = filename ? filename[1] : 'document.pdf';
a.download = getPDFFileNameFromURL(url);
}
// <a> must be in the document for IE and recent Firefox versions.
// (otherwise .click() is ignored)
@ -961,10 +984,17 @@ var PDFView = {
}
//#else
// function noData() {
// FirefoxCom.request('download', { originalUrl: url });
// FirefoxCom.request('download', {
// originalUrl: url,
// filename: getPDFFileNameFromURL(url)
// });
// }
// function triggerSaveAs(url, blobUrl) {
// FirefoxCom.request('download', { blobUrl: blobUrl, originalUrl: url },
// FirefoxCom.request('download', {
// blobUrl: blobUrl,
// originalUrl: url,
// filename: getPDFFileNameFromURL(url)
// },
// function response(err) {
// if (err) {
// // This error won't really be helpful because it's likely the