fixed selection of partial matching tags

templates/index.html.j2

@@ -320,17 +320,29 @@
       const tagcheckboxes = document.querySelectorAll("#tagdropdown input[class='tag']:checked");
 
       tagcheckboxes.forEach((checkbox) => {
-        const tag = checkbox.parentElement.id.trim().substring(1);
+        let tag = checkbox.parentElement.id.trim().substring(1);
+        if (checkbox.parentElement.parentElement.children.length > 1) {
+          tag += "|"
+        }
         selected_tags.push(tag);
       });
 
+      console.log(selected_tags);
+
       const urltags = selected_tags.join(",");
 
       const isRecursiveChecked = document.getElementById("recursive").checked;
 
       for (const item of items) {
         const tags = item.tags || [];
-        const include = selected_tags.every(tag => tags.some(t => t.startsWith(tag)));
+        const include = selected_tags.every(selected => {
+          const isParent = selected.endsWith('|');
+          if (isParent) {
+            return tags.some(t => t.startsWith(selected));
+          } else {
+            return tags.includes(selected);
+          }
+        });
 
         if (include || selected_tags.length === 0) {
           if (!isRecursiveChecked) {

test/example/DSC03470.JPG.xmp

@@ -1,7 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <x:xmpmeta x:xmptk="XMP Core 4.4.0-Exiv2" xmlns:x="adobe:ns:meta/">
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:exif="http://ns.adobe.com/exif/1.0/" xmlns:lr="http://ns.adobe.com/lightroom/1.0/" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmpMM:DerivedFrom="DSC03470.JPG">
+        <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"
-<dc:subject><rdf:Bag><rdf:li>st</rdf:li><rdf:li>bus</rdf:li><rdf:li>illuminate</rdf:li><rdf:li>neon</rdf:li><rdf:li>neon light</rdf:li><rdf:li>night</rdf:li><rdf:li>sign</rdf:li><rdf:li>train car</rdf:li><rdf:li>trolley</rdf:li><rdf:li>window</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>st|bus</rdf:li><rdf:li>st|illuminate</rdf:li><rdf:li>st|neon</rdf:li><rdf:li>st|neon light</rdf:li><rdf:li>st|night</rdf:li><rdf:li>st|sign</rdf:li><rdf:li>st|train car</rdf:li><rdf:li>st|trolley</rdf:li><rdf:li>st|window</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
+            xmlns:exif="http://ns.adobe.com/exif/1.0/" xmlns:lr="http://ns.adobe.com/lightroom/1.0/"
-</rdf:RDF>
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmpMM:DerivedFrom="DSC03470.JPG">
+            <dc:subject>
+                <rdf:Bag>
+                    <rdf:li>st</rdf:li>
+                    <rdf:li>bus</rdf:li>
+                    <rdf:li>illuminate</rdf:li>
+                    <rdf:li>neon</rdf:li>
+                    <rdf:li>neon light</rdf:li>
+                    <rdf:li>night</rdf:li>
+                    <rdf:li>sign</rdf:li>
+                    <rdf:li>train car</rdf:li>
+                    <rdf:li>trolley</rdf:li>
+                    <rdf:li>window</rdf:li>
+                    <rdf:li>train</rdf:li>
+                </rdf:Bag>
+            </dc:subject>
+            <lr:hierarchicalSubject>
+                <rdf:Bag>
+                    <rdf:li>st|bus</rdf:li>
+                    <rdf:li>st|illuminate</rdf:li>
+                    <rdf:li>st|neon</rdf:li>
+                    <rdf:li>st|neon light</rdf:li>
+                    <rdf:li>st|night</rdf:li>
+                    <rdf:li>st|sign</rdf:li>
+                    <rdf:li>st|train car</rdf:li>
+                    <rdf:li>st|trolley</rdf:li>
+                    <rdf:li>st|window</rdf:li>
+                    <rdf:li>st|train</rdf:li>
+                </rdf:Bag>
+            </lr:hierarchicalSubject>
+        </rdf:Description>
+    </rdf:RDF>
 </x:xmpmeta>

test/example/DSC03508.JPG.xmp

@@ -1,7 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <x:xmpmeta x:xmptk="XMP Core 4.4.0-Exiv2" xmlns:x="adobe:ns:meta/">
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:exif="http://ns.adobe.com/exif/1.0/" xmlns:lr="http://ns.adobe.com/lightroom/1.0/" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmpMM:DerivedFrom="DSC03508.JPG">
+        <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"
-<dc:subject><rdf:Bag><rdf:li>st</rdf:li><rdf:li>attach</rdf:li><rdf:li>basement</rdf:li><rdf:li>beam</rdf:li><rdf:li>building</rdf:li><rdf:li>ceiling</rdf:li><rdf:li>equipment</rdf:li><rdf:li>floor</rdf:li><rdf:li>pipe</rdf:li><rdf:li>red</rdf:li><rdf:li>room</rdf:li><rdf:li>scaffold</rdf:li><rdf:li>tube</rdf:li><rdf:li>warehouse</rdf:li><rdf:li>water pipe</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>st|attach</rdf:li><rdf:li>st|basement</rdf:li><rdf:li>st|beam</rdf:li><rdf:li>st|building</rdf:li><rdf:li>st|ceiling</rdf:li><rdf:li>st|equipment</rdf:li><rdf:li>st|floor</rdf:li><rdf:li>st|pipe</rdf:li><rdf:li>st|red</rdf:li><rdf:li>st|room</rdf:li><rdf:li>st|scaffold</rdf:li><rdf:li>st|tube</rdf:li><rdf:li>st|warehouse</rdf:li><rdf:li>st|water pipe</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
+            xmlns:exif="http://ns.adobe.com/exif/1.0/" xmlns:lr="http://ns.adobe.com/lightroom/1.0/"
-</rdf:RDF>
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmpMM:DerivedFrom="DSC03508.JPG">
+            <dc:subject>
+                <rdf:Bag>
+                    <rdf:li>st</rdf:li>
+                    <rdf:li>attach</rdf:li>
+                    <rdf:li>basement</rdf:li>
+                    <rdf:li>beam</rdf:li>
+                    <rdf:li>building</rdf:li>
+                    <rdf:li>ceiling</rdf:li>
+                    <rdf:li>equipment</rdf:li>
+                    <rdf:li>floor</rdf:li>
+                    <rdf:li>pipe</rdf:li>
+                    <rdf:li>red</rdf:li>
+                    <rdf:li>room</rdf:li>
+                    <rdf:li>scaffold</rdf:li>
+                    <rdf:li>tube</rdf:li>
+                    <rdf:li>warehouse</rdf:li>
+                    <rdf:li>water pipe</rdf:li>
+                    <rdf:li>train</rdf:li>
+                </rdf:Bag>
+            </dc:subject>
+            <lr:hierarchicalSubject>
+                <rdf:Bag>
+                    <rdf:li>st|attach</rdf:li>
+                    <rdf:li>st|basement</rdf:li>
+                    <rdf:li>st|beam</rdf:li>
+                    <rdf:li>st|building</rdf:li>
+                    <rdf:li>st|ceiling</rdf:li>
+                    <rdf:li>st|equipment</rdf:li>
+                    <rdf:li>st|floor</rdf:li>
+                    <rdf:li>st|pipe</rdf:li>
+                    <rdf:li>st|red</rdf:li>
+                    <rdf:li>st|room</rdf:li>
+                    <rdf:li>st|scaffold</rdf:li>
+                    <rdf:li>st|tube</rdf:li>
+                    <rdf:li>st|warehouse</rdf:li>
+                    <rdf:li>st|water pipe</rdf:li>
+                    <rdf:li>st|train</rdf:li>
+                </rdf:Bag>
+            </lr:hierarchicalSubject>
+        </rdf:Description>
+    </rdf:RDF>
 </x:xmpmeta>

test/example/example.jpg.xmp

@@ -1,7 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <x:xmpmeta x:xmptk="XMP Core 4.4.0-Exiv2" xmlns:x="adobe:ns:meta/">
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:exif="http://ns.adobe.com/exif/1.0/" xmlns:lr="http://ns.adobe.com/lightroom/1.0/" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmpMM:DerivedFrom="example.jpg">
+        <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"
-<dc:subject><rdf:Bag><rdf:li>st</rdf:li><rdf:li>cloud</rdf:li><rdf:li>cloudy</rdf:li><rdf:li>evening sky</rdf:li><rdf:li>sea</rdf:li><rdf:li>sky</rdf:li><rdf:li>storm cloud</rdf:li><rdf:li>stormy</rdf:li><rdf:li>sun</rdf:li><rdf:li>sunset</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>st|cloud</rdf:li><rdf:li>st|cloudy</rdf:li><rdf:li>st|evening sky</rdf:li><rdf:li>st|sea</rdf:li><rdf:li>st|sky</rdf:li><rdf:li>st|storm cloud</rdf:li><rdf:li>st|stormy</rdf:li><rdf:li>st|sun</rdf:li><rdf:li>st|sunset</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
+            xmlns:exif="http://ns.adobe.com/exif/1.0/" xmlns:lr="http://ns.adobe.com/lightroom/1.0/"
-</rdf:RDF>
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmpMM:DerivedFrom="example.jpg">
+            <dc:subject>
+                <rdf:Bag>
+                    <rdf:li>st</rdf:li>
+                    <rdf:li>cloudy</rdf:li>
+                    <rdf:li>evening sky</rdf:li>
+                    <rdf:li>sea</rdf:li>
+                    <rdf:li>sky</rdf:li>
+                    <rdf:li>storm cloud</rdf:li>
+                    <rdf:li>stormy</rdf:li>
+                    <rdf:li>sun</rdf:li>
+                    <rdf:li>sunset</rdf:li>
+                </rdf:Bag>
+            </dc:subject>
+            <lr:hierarchicalSubject>
+                <rdf:Bag>
+                    <rdf:li>st|cloudy</rdf:li>
+                    <rdf:li>st|evening sky</rdf:li>
+                    <rdf:li>st|sea</rdf:li>
+                    <rdf:li>st|sky</rdf:li>
+                    <rdf:li>st|storm cloud</rdf:li>
+                    <rdf:li>st|stormy</rdf:li>
+                    <rdf:li>st|sun</rdf:li>
+                    <rdf:li>st|sunset</rdf:li>
+                </rdf:Bag>
+            </lr:hierarchicalSubject>
+        </rdf:Description>
+    </rdf:RDF>
 </x:xmpmeta>

test/example/subfolder/subsubfolder (now with symbols)/000041900001.jpg.xmp

@@ -9,7 +9,6 @@
                 <rdf:Bag>
                     <rdf:li>st</rdf:li>
                     <rdf:li>cloud</rdf:li>
-                    <rdf:li>cloudy</rdf:li>
                     <rdf:li>fly</rdf:li>
                     <rdf:li>sky</rdf:li>
                 </rdf:Bag>
@@ -17,7 +16,6 @@
             <lr:hierarchicalSubject>
                 <rdf:Bag>
                     <rdf:li>st|cloud</rdf:li>
-                    <rdf:li>st|cloudy</rdf:li>
                     <rdf:li>st|fly</rdf:li>
                     <rdf:li>st|sky</rdf:li>
                 </rdf:Bag>