Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-07-26 08:57:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reduce duplication when parsing searchParams in the getPdfFilenameFromUrl function

Browse Source 
Currently we essentially "duplicate" the same code for parsing the `values` and `keys` of the `searchParams`, which seems a little unnecessary.

To be able to parse the `searchParams` from the end, we currently create an Array (from the Iterator) and then reverse it before finally looping through it. Here the latter two steps can be replaced with the `Array.prototype.findLast()` method instead.

*Please note:* I completely understand if this patch is rejected, on account of being less readable than the current code.
This commit is contained in:
Jonas Jenwald 2026-02-19 17:20:51 +01:00
parent 74ab1a98a6
commit 34f27187f8
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/display/display_utils.js
View File

@ -395,19 +395,14 @@ function getPdfFilenameFromUrl(url, defaultFilename = "document.pdf") {
} }
if (newURL.searchParams.size > 0) { if (newURL.searchParams.size > 0) {
const values = Array.from(newURL.searchParams.values()).reverse(); const getLast = iterator => [...iterator].findLast(v => pdfRegex.test(v));
for (const value of values) {
if (pdfRegex.test(value)) { // If any of the search parameters ends with ".pdf", return it.
// If any of the search parameters ends with ".pdf", return it. const name =
return decode(value); getLast(newURL.searchParams.values()) ??
} getLast(newURL.searchParams.keys());
} if (name) {
const keys = Array.from(newURL.searchParams.keys()).reverse(); return decode(name);
for (const key of keys) {
if (pdfRegex.test(key)) {
// If any of the search parameter keys ends with ".pdf", return it.
return decode(key);
}
} }
} }