Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

fix(metadata-json):fix-wrapperless-sidecar-parsing

Aswin Asok4434b63cf0a8
diff --git a/web/apps/photos/tests/upload.test.ts b/web/apps/photos/tests/upload.test.ts
index 6d267dc89f..24260568b2 100644
--- a/web/apps/photos/tests/upload.test.ts
+++ b/web/apps/photos/tests/upload.test.ts
@@ -8,6 +8,7 @@ import {
metadataJSONMapKeyForJSON,
metadataJSONMapKeyForXMP,
parseXMPSidecarTags,
+ tryParseXMPSidecar,
} from "ente-gallery/services/upload/metadata-json";
import { describe, expect, test } from "vitest";
@@ -140,6 +141,27 @@ describe("upload filename metadata", () => {
});
describe("Apple Photos XMP sidecars", () => {
+ test("parses a wrapperless sidecar with a BOM and XML declaration", async () => {
+ const sidecar = new File(
+ [
+ `\uFEFF <?xml version="1.0" encoding="UTF-8"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
+ <rdf:RDF>
+ <rdf:Description photoshop:DateCreated="2023-04-27T14:51:16+05:30" />
+ </rdf:RDF>
+</x:xmpmeta>`,
+ ],
+ "278.xmp",
+ );
+
+ await expect(tryParseXMPSidecar(sidecar)).resolves.toMatchObject({
+ creationDate: {
+ dateTime: "2023-04-27T14:51:16.000",
+ offset: "+05:30",
+ },
+ });
+ });
+
test("parses DateCreated with an offset", () => {
const metadata = parseXMPSidecarTags({
xmp: { DateCreated: xmpTag("2023-04-27T14:51:16+05:30") },
diff --git a/web/packages/gallery/services/upload/metadata-json.ts b/web/packages/gallery/services/upload/metadata-json.ts
index 7000f4b57f..efca3d768f 100644
--- a/web/packages/gallery/services/upload/metadata-json.ts
+++ b/web/packages/gallery/services/upload/metadata-json.ts
@@ -163,7 +163,7 @@ export const tryParseXMPSidecar = async (
uploadItem: UploadItem,
): Promise<ParsedMetadataJSON | undefined> => {
try {
- const text = await uploadItemText(uploadItem);
+ const text = normalizeXMPSidecarText(await uploadItemText(uploadItem));
return parseXMPSidecarTags(await extractRawExif(new Blob([text])));
} catch (e) {
log.error("Failed to parse XMP sidecar", e);
@@ -171,6 +171,16 @@ export const tryParseXMPSidecar = async (
}
};
+const normalizeXMPSidecarText = (text: string) => {
+ const source = text
+ .replace(/^\uFEFF/, "")
+ .trimStart()
+ .replace(/^<\?xml\s+[^>]*\?>\s*/i, "");
+ return source.startsWith("<?xpacket begin")
+ ? source
+ : `<?xpacket begin=""?>\n${source}`;
+};
+
export const tryParseTakeoutAlbumNameMetadataJSON = async (
uploadItem: UploadItem,
): Promise<string | undefined> => {