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

Merge pull request #11596 from Snuffleupagus/metadata-map

Browse Source 
Re-factor how `Metadata` class instances store its data internally
This commit is contained in:
Tim van der Meij 2020-02-13 23:01:51 +01:00 committed by GitHub
commit cd3f2d49e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/display/metadata.js
View File

@ -27,7 +27,7 @@ class Metadata {
const parser = new SimpleXMLParser(); const parser = new SimpleXMLParser();
const xmlDocument = parser.parseFromString(data); const xmlDocument = parser.parseFromString(data);
this._metadata = Object.create(null); this._metadataMap = new Map();
if (xmlDocument) { if (xmlDocument) {
this._parse(xmlDocument); this._parse(xmlDocument);
@ -37,7 +37,7 @@ class Metadata {
_repair(data) { _repair(data) {
// Start by removing any "junk" before the first tag (see issue 10395). // Start by removing any "junk" before the first tag (see issue 10395).
return data return data
.replace(/^([^<]+)/, "") .replace(/^[^<]+/, "")
.replace(/>\\376\\377([^<]+)/g, function(all, codes) { .replace(/>\\376\\377([^<]+)/g, function(all, codes) {
const bytes = codes const bytes = codes
.replace(/\\([0-3])([0-7])([0-7])/g, function(code, d1, d2, d3) { .replace(/\\([0-3])([0-7])([0-7])/g, function(code, d1, d2, d3) {
@ -63,11 +63,11 @@ class Metadata {
for (let i = 0, ii = bytes.length; i < ii; i += 2) { for (let i = 0, ii = bytes.length; i < ii; i += 2) {
const code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1); const code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1);
if ( if (
code >= 32 && code >= /* Space = */ 32 &&
code < 127 && code < /* Delete = */ 127 &&
code !== 60 && code !== /* '<' = */ 60 &&
code !== 62 && code !== /* '>' = */ 62 &&
code !== 38 code !== /* '&' = */ 38
) { ) {
chars += String.fromCharCode(code); chars += String.fromCharCode(code);
} else { } else {
@ -107,23 +107,26 @@ class Metadata {
const entry = desc.childNodes[j]; const entry = desc.childNodes[j];
const name = entry.nodeName.toLowerCase(); const name = entry.nodeName.toLowerCase();
this._metadata[name] = entry.textContent.trim(); this._metadataMap.set(name, entry.textContent.trim());
} }
} }
} }
} }
get(name) { get(name) {
const data = this._metadata[name]; return this._metadataMap.has(name) ? this._metadataMap.get(name) : null;
return typeof data !== "undefined" ? data : null;
} }
getAll() { getAll() {
return this._metadata; const obj = Object.create(null);
for (const [key, value] of this._metadataMap) {
obj[key] = value;
}
return obj;
} }
has(name) { has(name) {
return typeof this._metadata[name] !== "undefined"; return this._metadataMap.has(name);
} }
} }