Update GH pages using commit aef5282

mattiasw · Oct 26, 2023 · 8402494 · 8402494
1 parent 20d8b47
commit 8402494
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 10 deletions.
diff --git a/exif-reader.js b/exif-reader.js
diff --git a/exif-reader.js.map b/exif-reader.js.map
diff --git a/src/xmp-tags.js b/src/xmp-tags.js
@@ -221,12 +221,16 @@ function parseNodeAttributesAsTags(attributes) {
     const tags = {};
 
     for (const name in attributes) {
-        if (isTagAttribute(name)) {
-            tags[getLocalName(name)] = {
-                value: attributes[name],
-                attributes: {},
-                description: getDescription(attributes[name], name)
-            };
+        try {
+            if (isTagAttribute(name)) {
+                tags[getLocalName(name)] = {
+                    value: attributes[name],
+                    attributes: {},
+                    description: getDescription(attributes[name], name)
+                };
+            }
+        } catch (error) {
+            // Keep going and try to parse the rest of the tags.
         }
     }
 
@@ -321,15 +325,25 @@ function parseNodeChildrenAsTags(children) {
     const tags = {};
 
     for (const name in children) {
-        if (!isNamespaceDefinition(name)) {
-            tags[getLocalName(name)] = parseNodeAsTag(children[name], name);
+        try {
+            if (!isNamespaceDefinition(name)) {
+                tags[getLocalName(name)] = parseNodeAsTag(children[name], name);
+            }
+        } catch (error) {
+            // Keep going and try to parse the rest of the tags.
         }
     }
 
     return tags;
 }
 
 function parseNodeAsTag(node, name) {
+    if (isDuplicateTag(node)) {
+        return parseNodeAsDuplicateTag(node, name);
+    }
+    if (isEmptyResourceTag(node)) {
+        return {value: '', attributes: {}, description: ''};
+    }
     if (hasNestedSimpleRdfDescription(node)) {
         return parseNodeAsSimpleRdfDescription(node, name);
     }
@@ -345,6 +359,20 @@ function parseNodeAsTag(node, name) {
     return parseNodeAsSimpleValue(node, name);
 }
 
+function isEmptyResourceTag(node) {
+    return (node.attributes['rdf:parseType'] === 'Resource')
+        && (typeof node.value === 'string')
+        && (node.value.trim() === '');
+}
+
+function isDuplicateTag(node) {
+    return Array.isArray(node);
+}
+
+function parseNodeAsDuplicateTag(node, name) {
+    return parseNodeAsSimpleValue(node[node.length - 1], name);
+}
+
 function hasNestedSimpleRdfDescription(node) {
     return ((node.attributes['rdf:parseType'] === 'Resource') && (node.value['rdf:value'] !== undefined))
         || ((node.value['rdf:Description'] !== undefined) && (node.value['rdf:Description'].value['rdf:value'] !== undefined));