Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-07-27 01:17:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Introduce a helper method, in the Annotation class, for determining the attachment fileId

Browse Source 
This avoids duplication between the `FileAttachmentAnnotation` and `MediaAnnotation` classes, since they currently include essentially the same code for determining the attachment `fileId`.
This commit is contained in:
Jonas Jenwald 2026-06-24 10:31:07 +02:00
parent 8a2c112c20
commit 15d93e1f34
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/core/annotation.js
View File

@ -1502,6 +1502,25 @@ class Annotation {
return fieldName.join("."); return fieldName.join(".");
} }
/**
* Encode the embedded content's reference in the id so it can be
* re-fetched from the xref on demand (see `Catalog.attachmentContent`)
* instead of being cached where `cleanup` would wipe it. The file-spec is
* usually indirect; when it's inline its embedded-file stream still isn't
* (streams are always indirect), so fall back to that ref.
*/
_getAttachmentId(fsDict, fsRef, annotationGlobals) {
if (!(fsDict instanceof Dict)) {
return undefined;
}
if (!(fsRef instanceof Ref)) {
fsRef = FileSpec.pickPlatformItem(fsDict.get("EF"), /* raw = */ true);
}
return fsRef instanceof Ref
? annotationGlobals.catalog.getAttachmentIdForAnnotation(fsRef)
: undefined;
}
get width() { get width() {
return this.data.rect[2] - this.data.rect[0]; return this.data.rect[2] - this.data.rect[0];
} }
@ -5418,29 +5437,14 @@ class FileAttachmentAnnotation extends MarkupAnnotation {
const { annotationGlobals, dict } = params; const { annotationGlobals, dict } = params;
const fsDict = dict.get("FS"); const fsDict = dict.get("FS");
// Encode the embedded content's reference in the id so it can be
// re-fetched from the xref on demand (see `Catalog.attachmentContent`)
// instead of being cached where `cleanup` would wipe it. The file-spec is
// usually indirect; when it's inline its embedded-file stream still isn't
// (streams are always indirect), so fall back to that ref.
let fileId;
if (fsDict instanceof Dict) {
let contentRef = dict.getRaw("FS");
if (!(contentRef instanceof Ref)) {
contentRef = FileSpec.pickPlatformItem(
fsDict.get("EF"),
/* raw = */ true
);
}
if (contentRef instanceof Ref) {
fileId =
annotationGlobals.catalog.getAttachmentIdForAnnotation(contentRef);
}
}
this.data.hasOwnCanvas = this.data.noRotate; this.data.hasOwnCanvas = this.data.noRotate;
this.data.noHTML = false; this.data.noHTML = false;
this.data.fileId = fileId; this.data.fileId = this._getAttachmentId(
fsDict,
dict.getRaw("FS"),
annotationGlobals
);
this.data.file = new FileSpec(fsDict).serializable; this.data.file = new FileSpec(fsDict).serializable;
const name = dict.get("Name"); const name = dict.get("Name");
@ -5484,23 +5488,18 @@ class MediaAnnotation extends Annotation {
* when `assetRef` isn't itself a reference. * when `assetRef` isn't itself a reference.
* @param {string} asset.filename * @param {string} asset.filename
* @param {string} asset.contentType * @param {string} asset.contentType
* @param {Catalog} catalog * @param {Object} annotationGlobals
*/ */
_setMediaData({ assetRef, assetDict, filename, contentType }, catalog) { _setMediaData(
let contentRef = assetRef; { assetRef, assetDict, filename, contentType },
if (!(contentRef instanceof Ref)) { annotationGlobals
contentRef = FileSpec.pickPlatformItem( ) {
assetDict.get("EF"),
/* raw = */ true
);
}
const fileId =
contentRef instanceof Ref
? catalog.getAttachmentIdForAnnotation(contentRef)
: undefined;
this.data.noHTML = false; this.data.noHTML = false;
this.data.richMedia = { fileId, filename, contentType }; this.data.richMedia = {
fileId: this._getAttachmentId(assetDict, assetRef, annotationGlobals),
filename,
contentType,
};
} }
/** /**
@ -5582,7 +5581,7 @@ class RichMediaAnnotation extends MediaAnnotation {
warn("RichMedia annotation has no playable asset."); warn("RichMedia annotation has no playable asset.");
return; return;
} }
this._setMediaData(asset, annotationGlobals.catalog); this._setMediaData(asset, annotationGlobals);
} }
/** /**
@ -5666,7 +5665,7 @@ class ScreenAnnotation extends MediaAnnotation {
// a /Movie); such ones simply render their appearance, so don't warn. // a /Movie); such ones simply render their appearance, so don't warn.
return; return;
} }
this._setMediaData(asset, annotationGlobals.catalog); this._setMediaData(asset, annotationGlobals);
} }
/** /**