hierarchical tagging selection

.version

@@ -1 +1 @@
-2.7.2
+2.7.4

StaticGalleryBuilder.code-workspace

@@ -38,8 +38,8 @@
           "-n",
           "-m",
           "--reverse-sort",
-          // "--regenerate-thumbnails",
-          // "--reread-metadata",
+          "--regenerate-thumbnails",
+          "--reread-metadata",
           "--folderthumbnails"
         ],
         "console": "integratedTerminal",

files/global.css

@@ -176,6 +176,7 @@ figure {
 
 .tooltip .tagdropdown {
   padding: 0;
+  margin: 0;
 }
 
 .tooltip:hover .tooltiptext {
@@ -196,6 +197,11 @@ figure {
   padding: 0;
 }
 
+.tooltip .tooltiptext ol {
+  margin-left: 0;
+  padding-left: 0.5em;
+}
+
 .tooltip .tooltiptext .tagentry label {
   cursor: pointer;
   width: 100%;

modules/generate_html.py

@@ -5,6 +5,7 @@ import fnmatch
 import json
 from typing import Any
 from datetime import datetime
+from collections import defaultdict
 
 from tqdm.auto import tqdm
 from PIL import Image, ExifTags, TiffImagePlugin, UnidentifiedImageError
@@ -189,25 +190,66 @@ def get_image_info(item: str, folder: str) -> dict[str, Any]:
             tags = xmpdata["xmpmeta"]["RDF"]["Description"]["subject"]["Bag"]["li"]
             if isinstance(tags, str):
                 tags = [tags]
-            xmp = xmpdata
         except TypeError:
-            ...
+            pass
         except KeyError:
-            ...
+            pass
         try:
             tags = xmpdata["xapmeta"]["RDF"]["Description"]["subject"]["Bag"]["li"]
             if isinstance(tags, str):
                 tags = [tags]
-            xmp = xmpdata
         except TypeError:
-            ...
+            pass
         except KeyError:
-            ...
+            pass
+        try:
+            tags = xmpdata["xmpmeta"]["RDF"]["Description"]["hierarchicalSubject"]["Bag"]["li"]
+            if isinstance(tags, str):
+                tags = [tags]
+        except TypeError:
+            pass
+        except KeyError:
+            pass
+        try:
+            tags = xmpdata["xapmeta"]["RDF"]["Description"]["hierarchicalSubject"]["Bag"]["li"]
+            if isinstance(tags, str):
+                tags = [tags]
+        except TypeError:
+            pass
+        except KeyError:
+            pass
     if None in tags:
         tags.remove(None)
     return {"width": width, "height": height, "tags": tags, "exifdata": exifdata, "xmp": xmp}
 
 
+def nested_dict():
+    return defaultdict(nested_dict)
+
+
+def insert_path(d, path):
+    for part in path[:-1]:
+        d = d[part]
+    last = path[-1]
+    if not isinstance(d[last], dict):
+        d[last] = {}
+
+
+def finalize(d):
+    if isinstance(d, defaultdict):
+        # Sort keys before recursion
+        return {k: finalize(d[k]) for k in sorted(d)}
+    return d or []
+
+
+def parse_hierarchical_tags(tags, delimiter="|"):
+    tree = nested_dict()
+    for tag in tags:
+        parts = tag.split(delimiter)
+        insert_path(tree, parts)
+    return finalize(tree)
+
+
 def get_tags(sidecarfile: str) -> list[str]:
     """
     Extracts Tags from XMP sidecar file
@@ -228,17 +270,33 @@ def get_tags(sidecarfile: str) -> list[str]:
         if isinstance(tags, str):
             tags = [tags]
     except TypeError:
-        ...
+        pass
     except KeyError:
-        ...
+        pass
     try:
         tags = xmpdata["xapmeta"]["RDF"]["Description"]["subject"]["Bag"]["li"]
         if isinstance(tags, str):
             tags = [tags]
     except TypeError:
-        ...
+        pass
     except KeyError:
-        ...
+        pass
+    try:
+        tags = xmpdata["xmpmeta"]["RDF"]["Description"]["hierarchicalSubject"]["Bag"]["li"]
+        if isinstance(tags, str):
+            tags = [tags]
+    except TypeError:
+        pass
+    except KeyError:
+        pass
+    try:
+        tags = xmpdata["xapmeta"]["RDF"]["Description"]["hierarchicalSubject"]["Bag"]["li"]
+        if isinstance(tags, str):
+            tags = [tags]
+    except TypeError:
+        pass
+    except KeyError:
+        pass
     if None in tags:
         tags.remove(None)
     return tags
@@ -485,9 +543,9 @@ def create_html_file(folder: str, title: str, foldername: str, images: list[dict
 
     alltags = set()
     for img in images:
-        for tag in img["tags"]:
-            alltags.add(tag)
-    alltags = sorted(alltags)
+        alltags.update(img["tags"])
+
+    nested_tags = parse_hierarchical_tags(alltags)
 
     folder_info = info.get(urllib.parse.quote(folder), "").split("\n")
     _info = [i for i in folder_info if len(i) > 1] if folder_info else None
@@ -537,7 +595,7 @@ def create_html_file(folder: str, title: str, foldername: str, images: list[dict
         version=version,
         logo=logo,
         licensefile=license_url,
-        tags=alltags,
+        tags=nested_tags,
     )
 
     with open(html_file, "w", encoding="utf-8") as f:

templates/default.css

@@ -52,7 +52,7 @@
   background-color: var(--color2);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color4);
 }
 

templates/index.html.j2

@@ -1,3 +1,17 @@
+{%- macro render_tags(tag_tree, parent) -%}
+  <ol>
+    {%- for key, value in tag_tree.items() %}
+      <li class="tagentry">
+        <label onclick="filter()" title="{{ key }}" id="{{ parent }}|{{ key }}">
+          <input type="checkbox" />{{ key }}
+        </label>
+        {%- if value %}
+          {{ render_tags(value, parent + '|' + key) }}
+        {%- endif %}
+      </li>
+    {%- endfor %}
+  </ol>
+{%- endmacro -%}
 <!DOCTYPE html>
 <html lang="en">
 
@@ -49,15 +63,14 @@
         <li class="title"><span class="header">{{ header }}</span></li>
       </div>
       <div class="navright">
-        {%- if tags|length > 0 %}
-        <li class="tooltip"><a>Filter by Tags</a>
+        {% if tags %}
+        <li class="tooltip">
+          <a>Filter by Tags</a>
           <ol class="tooltiptext tagdropdown" id="tagdropdown">
-            {%- for tag in tags -%}
-            <li class="tagentry"><label onclick="filter()"><input type="checkbox" />{{ tag }}</label></li><br />
-            {%- endfor -%}
+            {{ render_tags(tags, '') }}
           </ol>
         </li>
-        {%- endif %}
+        {% endif %}
         {%- if licensefile %}
         <li class="license"><a href="{{ licensefile }}">License</a></li>
         {%- endif %}
@@ -85,22 +98,6 @@
   {% if images %}
   {%- set ns = namespace(count = 0) -%}
   <div class="row" id="imagelist">
-    {%- for image in images %}
-    <div class="column">
-      <figure>
-        <img src="{{ image.thumbnail }}" alt="{{ image.name }}" onclick="openSwipe({{ ns.count }})" onmouseover="prefetch({{ ns.count }})" onmouseleave="cancel({{ ns.count }})" />
-        {%- set ns.count = ns.count + 1 %}
-        <figcaption class="caption">{{ image.name }}
-          {%- if image.tiff %}
-          <a href="{{ image.tiff }}">TIFF</a>
-          {%- endif %}
-          {%- if image.raw %}
-          <a href="{{ image.raw }}">RAW</a>
-          {%- endif %}
-        </figcaption>
-      </figure>
-    </div>
-    {%- endfor %}
   </div>
   {%- endif %}
   {% if license %}
@@ -123,14 +120,14 @@
     {%- endif %}
     <span class="attribution">Made with <a href="https://github.com/greflm13/StaticGalleryBuilder" target="_blank" rel="noopener noreferrer">StaticGalleryBuilder {{ version }}</a> by <a
         href="https://github.com/greflm13" target="_blank" rel="noopener noreferrer">{{ logo }}</a>.</span>
-    <button onclick="topFunction()" id="totop" title="Back to Top">Back to Top</button>
+    <button type="button" onclick="topFunction()" id="totop" title="Back to Top">Back to Top</button>
   </div>
   {%- endif %}
   {%- else %}
   <div class="footer">
     <span class="attribution">Made with <a href="https://github.com/greflm13/StaticGalleryBuilder" target="_blank" rel="noopener noreferrer">StaticGalleryBuilder {{ version }}</a> by <a
         href="https://github.com/greflm13" target="_blank" rel="noopener noreferrer">{{ logo }}</a>.</span>
-    <button onclick="topFunction()" id="totop" title="Back to Top">Back to Top</button>
+    <button type="button" onclick="topFunction()" id="totop" title="Back to Top">Back to Top</button>
   </div>
   {%- endif %}
   {% if images %}
@@ -175,28 +172,24 @@
     var items = [
       {%- for image in images %}
       {%- if image.exifdata.DateTime %}
-      { src: "{{ image.url }}", w: {{ image.width }}, h: {{ image.height }}, msrc: "{{ image.thumbnail }}", tags: "{{ image.tags }}", title: "Captured: {{ image.exifdata.DateTime }}" },
+      { name: "{{ image.name }}", tiff: "{{ image.tiff }}", raw: "{{ image.raw }}", src: "{{ image.url }}", w: {{ image.width }}, h: {{ image.height }}, msrc: "{{ image.thumbnail }}", tags: "{{ image.tags }}", title: "Captured: {{ image.exifdata.DateTime }}" },
       {%- else %}
-      { src: "{{ image.url }}", w: {{ image.width }}, h: {{ image.height }}, msrc: "{{ image.thumbnail }}", tags: "{{ image.tags }}" },
+      { name: "{{ image.name }}", tiff: "{{ image.tiff }}", raw: "{{ image.raw }}", src: "{{ image.url }}", w: {{ image.width }}, h: {{ image.height }}, msrc: "{{ image.thumbnail }}", tags: "{{ image.tags }}" },
       {%- endif %}
       {%- endfor %}
     ];
     var re = /pid=(\d+)/;
+    var filterre = /#(.*)/;
     var controllers = {}
 
     function openSwipe(img) {
       var options = {
         index: img
       };
-      var gallery = new PhotoSwipe(pswpElement, PhotoSwipeUI_Default, items, options);
+      var gallery = new PhotoSwipe(pswpElement, PhotoSwipeUI_Default, shown, options);
       gallery.init();
     }
 
-    if (re.test(window.location.href)) {
-      var pid = window.location.href.match(re)[1];
-      openSwipe(parseInt(pid));
-    }
-
     let totopbutton = document.getElementById("totop");
 
     window.onscroll = function () { scrollFunction() };
@@ -213,6 +206,23 @@
       window.scrollTo({ top: 0, behavior: 'smooth' })
     }
 
+    function updateImageList(images) {
+      var str = ""
+      var imagelist = document.getElementById("imagelist");
+      images.forEach((item, index) => {
+        str += '<div class="column"><figure><img src="' + item.msrc + '" onclick="openSwipe(' + index + ')" onmouseover="prefetch(' + index + ')" onmouseleave="cancel(' + index + ')" /><figcaption class="caption">' + item.name;
+        if (item.tiff != "") {
+          str += ' <a href="' + item.tiff + '">TIFF</a>';
+        }
+        if (item.raw != "") {
+          str += ' <a href="' + item.raw + '">RAW</a>';
+        }
+        str += '</figcaption></figure></div>';
+      });
+
+      imagelist.innerHTML = str;
+    }
+
     function prefetch(img) {
       const controller = new AbortController()
       const signal = controller.signal
@@ -230,36 +240,66 @@
       delete controllers[img];
     }
 
-    {%- if tags|length > 0 %}
     function filter() {
-      var selected_tags = [];
-      var tagdropdown, imagelist, figures, i, j, tags, incl;
+      window.location.href = window.location.href.split("#")[0] + "#";
+
+      const selected_tags = [];
+      const shown = [];
+
+      const tagcheckboxes = document.querySelectorAll("#tagdropdown input[type='checkbox']:checked");
+
+      tagcheckboxes.forEach((checkbox) => {
+        const tag = checkbox.parentElement.id.trim().substring(1);
+        selected_tags.push(tag);
+      });
+      console.log(selected_tags);
+
+      const urltags = selected_tags.join(",");
+
+      items.forEach((item) => {
+        const tags = item.tags || [];
+        const include = selected_tags.every(tag => tags.includes(tag));
+        if (include || selected_tags.length === 0) {
+          shown.push(item);
+        }
+      });
+
+      updateImageList(shown);
+      window.location.href += urltags;
+    }
+
+    function setFilter(selected) {
       tagdropdown = document.getElementById("tagdropdown").getElementsByTagName("li");
-      for (i = 0; i < tagdropdown.length; i++) {
-        if (tagdropdown[i].firstChild.firstChild.checked) {
-          selected_tags.push([tagdropdown[i].innerText])
+      selected.forEach((tag) => {
+        for (var i = 0; i < tagdropdown.length; i++) {
+          if (tagdropdown[i].innerText == tag) {
+            tagdropdown[i].firstChild.firstChild.checked = true;
           }
         }
-      imagelist = document.getElementById("imagelist");
-      figures = imagelist.getElementsByTagName("div");
-      for (i = 0; i < figures.length; i++) {
-        tags = items[i].tags;
-        incl = true;
-        for (j = 0; j < selected_tags.length; j++) {
-          if (tags.indexOf(selected_tags[j]) == -1) {
-            incl = false;
+      });
     }
+
+    function onLoad() {
+      {%- if tags | length > 0 %}
+      if (filterre.test(window.location.href)) {
+        var selected = window.location.href.match(filterre)[1].split(",");
+        setFilter(selected);
       }
-        if (incl || selected_tags == []) {
-          figures[i].style.display = "";
-        } else {
-          figures[i].style.display = "none";
-        }
+      filter();
+      {%- else %}
+      updateImageList(items);
+      {%- endif %}
+
+      if (re.test(window.location.href)) {
+        var pid = window.location.href.match(re)[1];
+        openSwipe(parseInt(pid));
       }
     }
 
-    filter()
-    {%- endif %}
+    window.addEventListener ? 
+      window.addEventListener("load", onLoad, false) : 
+      window.attachEvent && window.attachEvent("onload", onLoad);
+
   </script>
   {%- endif %}
 </body>

templates/license.html.j2

@@ -54,14 +54,14 @@
     {%- endif %}
     <span class="attribution">Made with <a href="https://github.com/greflm13/StaticGalleryBuilder" target="_blank" rel="noopener noreferrer">StaticGalleryBuilder {{ version }}</a> by <a
         href="https://github.com/greflm13" target="_blank" rel="noopener noreferrer">{{ logo }}</a>.</span>
-    <button onclick="topFunction()" id="totop" title="Back to Top">Back to Top</button>
+    <button type="button" onclick="topFunction()" id="totop" title="Back to Top">Back to Top</button>
   </div>
   {%- endif %}
   {%- else %}
   <div class="footer">
     <span class="attribution">Made with <a href="https://github.com/greflm13/StaticGalleryBuilder" target="_blank" rel="noopener noreferrer">StaticGalleryBuilder {{ version }}</a> by <a
         href="https://github.com/greflm13" target="_blank" rel="noopener noreferrer">{{ logo }}</a>.</span>
-    <button onclick="topFunction()" id="totop" title="Back to Top">Back to Top</button>
+    <button type="button" onclick="topFunction()" id="totop" title="Back to Top">Back to Top</button>
   </div>
   {%- endif %}
 </body>

test/example/000041900001.jpg.xmp

@@ -0,0 +1,27 @@
+<?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: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="000041900001.jpg">
+            <dc:subject>
+                <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>
+            </dc:subject>
+            <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>
+            </lr:hierarchicalSubject>
+        </rdf:Description>
+    </rdf:RDF>
+</x:xmpmeta>

test/example/000041900001.tif.xmp

@@ -0,0 +1,7 @@
+<?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: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="000041900001.tif">
+<dc:subject><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></dc:subject><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></lr:hierarchicalSubject></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>

test/example/DSC00009.jpg.xmp

@@ -2,6 +2,6 @@
 <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: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="DSC00009.jpg">
-<dc:subject><rdf:Bag><rdf:li></rdf:li><rdf:li>aqueduct</rdf:li><rdf:li>arch</rdf:li><rdf:li>arch bridge</rdf:li><rdf:li>bridge</rdf:li><rdf:li>hillside</rdf:li><rdf:li>passenger train</rdf:li><rdf:li>railroad</rdf:li><rdf:li>railroad bridge</rdf:li><rdf:li>span</rdf:li><rdf:li>train track</rdf:li><rdf:li>tree</rdf:li><rdf:li>viaduct</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>|aqueduct</rdf:li><rdf:li>|arch</rdf:li><rdf:li>|arch bridge</rdf:li><rdf:li>|bridge</rdf:li><rdf:li>|hillside</rdf:li><rdf:li>|passenger train</rdf:li><rdf:li>|railroad</rdf:li><rdf:li>|railroad bridge</rdf:li><rdf:li>|span</rdf:li><rdf:li>|train track</rdf:li><rdf:li>|tree</rdf:li><rdf:li>|viaduct</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
+<dc:subject><rdf:Bag><rdf:li>st</rdf:li><rdf:li>aqueduct</rdf:li><rdf:li>arch</rdf:li><rdf:li>arch bridge</rdf:li><rdf:li>bridge</rdf:li><rdf:li>hillside</rdf:li><rdf:li>passenger train</rdf:li><rdf:li>railroad</rdf:li><rdf:li>railroad bridge</rdf:li><rdf:li>span</rdf:li><rdf:li>train track</rdf:li><rdf:li>tree</rdf:li><rdf:li>viaduct</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>st|aqueduct</rdf:li><rdf:li>st|arch</rdf:li><rdf:li>st|arch bridge</rdf:li><rdf:li>st|bridge</rdf:li><rdf:li>st|hillside</rdf:li><rdf:li>st|passenger train</rdf:li><rdf:li>st|railroad</rdf:li><rdf:li>st|railroad bridge</rdf:li><rdf:li>st|span</rdf:li><rdf:li>st|train track</rdf:li><rdf:li>st|tree</rdf:li><rdf:li>st|viaduct</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>

test/example/DSC01106.jpg.xmp

@@ -2,6 +2,6 @@
 <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: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="DSC01106.jpg">
-<dc:subject><rdf:Bag><rdf:li></rdf:li><rdf:li>clear</rdf:li><rdf:li>dark</rdf:li><rdf:li>moon</rdf:li><rdf:li>night</rdf:li><rdf:li>night sky</rdf:li><rdf:li>sky</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>|clear</rdf:li><rdf:li>|dark</rdf:li><rdf:li>|moon</rdf:li><rdf:li>|night</rdf:li><rdf:li>|night sky</rdf:li><rdf:li>|sky</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
+<dc:subject><rdf:Bag><rdf:li>st</rdf:li><rdf:li>clear</rdf:li><rdf:li>dark</rdf:li><rdf:li>moon</rdf:li><rdf:li>night</rdf:li><rdf:li>night sky</rdf:li><rdf:li>sky</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>st|clear</rdf:li><rdf:li>st|dark</rdf:li><rdf:li>st|moon</rdf:li><rdf:li>st|night</rdf:li><rdf:li>st|night sky</rdf:li><rdf:li>st|sky</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>

test/example/DSC03470.JPG.xmp

@@ -2,6 +2,6 @@
 <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: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">
-<dc:subject><rdf:Bag><rdf:li></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>|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></lr:hierarchicalSubject></rdf:Description>
+<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>
 </rdf:RDF>
 </x:xmpmeta>

test/example/DSC03508.ARW.xmp

@@ -2,6 +2,6 @@
 <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: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.ARW">
-<dc:subject><rdf:Bag><rdf:li></rdf:li><rdf:li>building</rdf:li><rdf:li>ceiling</rdf:li><rdf:li>pillar</rdf:li><rdf:li>display</rdf:li><rdf:li>rail</rdf:li><rdf:li>steam engine</rdf:li><rdf:li>steam locomotive</rdf:li><rdf:li>train</rdf:li><rdf:li>train car</rdf:li><rdf:li>train track</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>|building</rdf:li><rdf:li>|ceiling</rdf:li><rdf:li>|pillar</rdf:li><rdf:li>|display</rdf:li><rdf:li>|rail</rdf:li><rdf:li>|steam engine</rdf:li><rdf:li>|steam locomotive</rdf:li><rdf:li>|train</rdf:li><rdf:li>|train car</rdf:li><rdf:li>|train track</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
+<dc:subject><rdf:Bag><rdf:li>st</rdf:li><rdf:li>building</rdf:li><rdf:li>ceiling</rdf:li><rdf:li>pillar</rdf:li><rdf:li>display</rdf:li><rdf:li>rail</rdf:li><rdf:li>steam engine</rdf:li><rdf:li>steam locomotive</rdf:li><rdf:li>train</rdf:li><rdf:li>train car</rdf:li><rdf:li>train track</rdf:li></rdf:Bag></dc:subject><lr:hierarchicalSubject><rdf:Bag><rdf:li>st|building</rdf:li><rdf:li>st|ceiling</rdf:li><rdf:li>st|pillar</rdf:li><rdf:li>st|display</rdf:li><rdf:li>st|rail</rdf:li><rdf:li>st|steam engine</rdf:li><rdf:li>st|steam locomotive</rdf:li><rdf:li>st|train</rdf:li><rdf:li>st|train car</rdf:li><rdf:li>st|train track</rdf:li></rdf:Bag></lr:hierarchicalSubject></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>

test/example/DSC03508.JPG.xmp

@@ -2,6 +2,6 @@
 <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: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">
-<dc:subject><rdf:Bag><rdf:li></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>|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></lr:hierarchicalSubject></rdf:Description>
+<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>
 </rdf:RDF>
 </x:xmpmeta>

test/example/example.jpg.xmp

@@ -2,6 +2,6 @@
 <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: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">
-<dc:subject><rdf:Bag><rdf:li></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>|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></lr:hierarchicalSubject></rdf:Description>
+<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>
 </rdf:RDF>
 </x:xmpmeta>

test/example/example.tif.xmp

@@ -2,6 +2,6 @@
 <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: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.tif">
-<dc:subject><rdf:Bag><rdf:li></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>|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></lr:hierarchicalSubject></rdf:Description>
+<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>
 </rdf:RDF>
 </x:xmpmeta>

themes/alpenglow-dark.css

@@ -97,7 +97,7 @@ body {
   background-color: var(--color6);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color3);
 }
 

themes/alpenglow.css

@@ -96,7 +96,7 @@ body {
   background-color: var(--color3);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color7);
 }
 

themes/aritim-dark.css

@@ -74,7 +74,7 @@
   background-color: var(--bcolor1);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor3);
 }
 

themes/aritim.css

@@ -74,7 +74,7 @@
   background-color: var(--bcolor1);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor3);
 }
 

themes/autumn.css

@@ -79,7 +79,7 @@
   font-family: "Playfair Display", serif;
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color3);
 }
 

themes/carnation.css

@@ -73,7 +73,7 @@
   background-color: var(--bcolor2);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor4);
 }
 

themes/catpuccin.css

@@ -79,7 +79,7 @@
   font-family: "Nunito", sans-serif;
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color4);
 }
 

themes/cornflower.css

@@ -73,7 +73,7 @@
   background-color: var(--bcolor2);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor4);
 }
 

themes/default-dark.css

@@ -52,7 +52,7 @@
   background-color: var(--color3);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color4);
 }
 

themes/default.css

@@ -52,7 +52,7 @@
   background-color: var(--color2);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color4);
 }
 

themes/ivy.css

@@ -73,7 +73,7 @@
   background-color: var(--bcolor2);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor4);
 }
 

themes/kjoe.css

@@ -72,7 +72,7 @@
   background-color: var(--color3);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color2);
 }
 

themes/monokai-vibrant.css

@@ -55,7 +55,7 @@
   background-color: var(--bcolor2);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor3);
 }
 

themes/rainbow.css

@@ -76,7 +76,7 @@
   background-color: var(--bcolor2);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor4);
 }
 

themes/spring.css

@@ -79,7 +79,7 @@
   font-family: "Lora", serif;
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor3);
 }
 

themes/steam.css

@@ -80,7 +80,7 @@
   background-color: var(--color4);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color3);
 }
 

themes/summer.css

@@ -80,7 +80,7 @@
   font-family: "Roboto", sans-serif;
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor3);
   color: var(--bcolor2);
 }

themes/sunflower.css

@@ -74,7 +74,7 @@
   background-color: var(--bcolor2);
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--bcolor4);
 }
 

themes/winter.css

@@ -88,7 +88,7 @@
   font-family: "Montserrat", sans-serif;
 }
 
-.tagentry:hover {
+.tagentry > label:hover {
   background-color: var(--color2);
 }