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

Re-factor destinations/getDestination, in the Catalog, to reduce unnecessary duplication

Browse Source 
Currently, these two methods contain the same boilerplate code for getting the /Dests data.
This commit is contained in:
Jonas Jenwald 2018-08-11 15:40:08 +02:00
parent 309b6f820e
commit b74c813353
1 changed files with 26 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/core/obj.js
View File

@ -28,6 +28,10 @@ import { ChunkedStream } from './chunked_stream';
import { CipherTransformFactory } from './crypto'; import { CipherTransformFactory } from './crypto';
import { ColorSpace } from './colorspace'; import { ColorSpace } from './colorspace';
function fetchDestination(dest) {
return isDict(dest) ? dest.get('D') : dest;
}
var Catalog = (function CatalogClosure() { var Catalog = (function CatalogClosure() {
function Catalog(pdfManager, xref) { function Catalog(pdfManager, xref) {
this.pdfManager = pdfManager; this.pdfManager = pdfManager;
@ -173,64 +177,37 @@ var Catalog = (function CatalogClosure() {
// shadow the prototype getter // shadow the prototype getter
return shadow(this, 'numPages', obj); return shadow(this, 'numPages', obj);
}, },
get destinations() { get destinations() {
function fetchDestination(dest) { const obj = this._readDests(), dests = Object.create(null);
return isDict(dest) ? dest.get('D') : dest; if (obj instanceof NameTree) {
} const names = obj.getAll();
for (let name in names) {
var xref = this.xref;
var dests = {}, nameTreeRef, nameDictionaryRef;
var obj = this.catDict.get('Names');
if (obj && obj.has('Dests')) {
nameTreeRef = obj.getRaw('Dests');
} else if (this.catDict.has('Dests')) {
nameDictionaryRef = this.catDict.get('Dests');
}
if (nameDictionaryRef) {
// reading simple destination dictionary
obj = nameDictionaryRef;
obj.forEach(function catalogForEach(key, value) {
if (!value) {
return;
}
dests[key] = fetchDestination(value);
});
}
if (nameTreeRef) {
var nameTree = new NameTree(nameTreeRef, xref);
var names = nameTree.getAll();
for (var name in names) {
dests[name] = fetchDestination(names[name]); dests[name] = fetchDestination(names[name]);
} }
} else if (obj instanceof Dict) {
obj.forEach(function(key, value) {
if (value) {
dests[key] = fetchDestination(value);
}
});
} }
return shadow(this, 'destinations', dests); return shadow(this, 'destinations', dests);
}, },
getDestination: function Catalog_getDestination(destinationId) { getDestination(destinationId) {
function fetchDestination(dest) { const obj = this._readDests();
return isDict(dest) ? dest.get('D') : dest; if (obj instanceof NameTree || obj instanceof Dict) {
return fetchDestination(obj.get(destinationId) || null);
} }
return null;
var xref = this.xref; },
var dest = null, nameTreeRef, nameDictionaryRef; _readDests() {
var obj = this.catDict.get('Names'); const obj = this.catDict.get('Names');
if (obj && obj.has('Dests')) { if (obj && obj.has('Dests')) {
nameTreeRef = obj.getRaw('Dests'); return new NameTree(obj.getRaw('Dests'), this.xref);
} else if (this.catDict.has('Dests')) { } else if (this.catDict.has('Dests')) { // Simple destination dictionary.
nameDictionaryRef = this.catDict.get('Dests'); return this.catDict.get('Dests');
} }
if (nameDictionaryRef) { // Simple destination dictionary.
var value = nameDictionaryRef.get(destinationId);
if (value) {
dest = fetchDestination(value);
}
}
if (nameTreeRef) {
var nameTree = new NameTree(nameTreeRef, xref);
dest = fetchDestination(nameTree.get(destinationId));
}
return dest;
}, },
get pageLabels() { get pageLabels() {