diff --git a/modules/generate_html.py b/modules/generate_html.py index 401d0cc..5a20487 100644 --- a/modules/generate_html.py +++ b/modules/generate_html.py @@ -205,6 +205,8 @@ def get_image_info(item: str, folder: str) -> dict[str, Any]: ... if None in tags: tags.remove(None) + if "st" in tags: + tags.remove("st") return {"width": width, "height": height, "tags": tags, "exifdata": exifdata, "xmp": xmp} @@ -241,6 +243,8 @@ def get_tags(sidecarfile: str) -> list[str]: ... if None in tags: tags.remove(None) + if "st" in tags: + tags.remove("st") return tags diff --git a/test/example/000041900001.jpg.xmp b/test/example/000041900001.jpg.xmp index 504eea4..463dd2d 100644 --- a/test/example/000041900001.jpg.xmp +++ b/test/example/000041900001.jpg.xmp @@ -1,43 +1,27 @@ - - - - - - - - - - - - - darktable - format - jpg - - - - - darktable|format|jpg - - - - - + + + + + + + st + cloud + cloudy + fly + sky + + + + + st|cloud + st|cloudy + st|fly + st|sky + + + + + \ No newline at end of file diff --git a/test/example/000041900001.tif.xmp b/test/example/000041900001.tif.xmp new file mode 100644 index 0000000..0a03364 --- /dev/null +++ b/test/example/000041900001.tif.xmp @@ -0,0 +1,7 @@ + + + + +stcloudcloudyflyskyst|cloudst|cloudyst|flyst|sky + + \ No newline at end of file diff --git a/test/example/DSC00009.jpg.xmp b/test/example/DSC00009.jpg.xmp index 3f6ea50..9563a42 100644 --- a/test/example/DSC00009.jpg.xmp +++ b/test/example/DSC00009.jpg.xmp @@ -2,6 +2,6 @@ -aqueductarcharch bridgebridgehillsidepassenger trainrailroadrailroad bridgespantrain tracktreeviaduct|aqueduct|arch|arch bridge|bridge|hillside|passenger train|railroad|railroad bridge|span|train track|tree|viaduct +staqueductarcharch bridgebridgehillsidepassenger trainrailroadrailroad bridgespantrain tracktreeviaductst|aqueductst|archst|arch bridgest|bridgest|hillsidest|passenger trainst|railroadst|railroad bridgest|spanst|train trackst|treest|viaduct \ No newline at end of file diff --git a/test/example/DSC01106.jpg.xmp b/test/example/DSC01106.jpg.xmp index 757bb28..b80aaa7 100644 --- a/test/example/DSC01106.jpg.xmp +++ b/test/example/DSC01106.jpg.xmp @@ -2,6 +2,6 @@ -cleardarkmoonnightnight skysky|clear|dark|moon|night|night sky|sky +stcleardarkmoonnightnight skyskyst|clearst|darkst|moonst|nightst|night skyst|sky \ No newline at end of file diff --git a/test/example/DSC03470.JPG.xmp b/test/example/DSC03470.JPG.xmp index cb5551a..1da6c75 100644 --- a/test/example/DSC03470.JPG.xmp +++ b/test/example/DSC03470.JPG.xmp @@ -2,6 +2,6 @@ -busilluminateneonpassenger trainneon lightnightsigntrain cartrolleywindow|bus|illuminate|neon|neon light|night|sign|train car|trolley|window +stbusilluminateneonneon lightnightsigntrain cartrolleywindowst|busst|illuminatest|neonst|neon lightst|nightst|signst|train carst|trolleyst|window \ No newline at end of file diff --git a/test/example/DSC03508.ARW.xmp b/test/example/DSC03508.ARW.xmp index 77c6ca2..02b3b59 100644 --- a/test/example/DSC03508.ARW.xmp +++ b/test/example/DSC03508.ARW.xmp @@ -2,6 +2,6 @@ -buildingceilingpillardisplayrailsteam enginesteam locomotivetraintrain cartrain track|building|ceiling|pillar|display|rail|steam engine|steam locomotive|train|train car|train track +stbuildingceilingpillardisplayrailsteam enginesteam locomotivetraintrain cartrain trackst|buildingst|ceilingst|pillarst|displayst|railst|steam enginest|steam locomotivest|trainst|train carst|train track \ No newline at end of file diff --git a/test/example/DSC03508.JPG.xmp b/test/example/DSC03508.JPG.xmp index 7ec1303..5243d16 100644 --- a/test/example/DSC03508.JPG.xmp +++ b/test/example/DSC03508.JPG.xmp @@ -2,6 +2,6 @@ -attachbasementbeambuildingceilingequipmentfloorpiperedroomscaffoldtubewarehousewater pipe|attach|basement|beam|building|ceiling|equipment|floor|pipe|red|room|scaffold|tube|warehouse|water pipe +stattachbasementbeambuildingceilingequipmentfloorpiperedroomscaffoldtubewarehousewater pipest|attachst|basementst|beamst|buildingst|ceilingst|equipmentst|floorst|pipest|redst|roomst|scaffoldst|tubest|warehousest|water pipe \ No newline at end of file diff --git a/test/example/example.jpg.xmp b/test/example/example.jpg.xmp index afe5b68..d2762fc 100644 --- a/test/example/example.jpg.xmp +++ b/test/example/example.jpg.xmp @@ -2,6 +2,6 @@ -cloudcloudyevening skyseaskystorm cloudstormysunsunset|cloud|cloudy|evening sky|sea|sky|storm cloud|stormy|sun|sunset +stcloudcloudyevening skyseaskystorm cloudstormysunsunsetst|cloudst|cloudyst|evening skyst|seast|skyst|storm cloudst|stormyst|sunst|sunset \ No newline at end of file diff --git a/test/example/example.tif.xmp b/test/example/example.tif.xmp index a605eb8..db2acbf 100644 --- a/test/example/example.tif.xmp +++ b/test/example/example.tif.xmp @@ -2,6 +2,6 @@ -cloudcloudyevening skyseaskystorm cloudstormysunsunset|cloud|cloudy|evening sky|sea|sky|storm cloud|stormy|sun|sunset +stcloudcloudyevening skyseaskystorm cloudstormysunsunsetst|cloudst|cloudyst|evening skyst|seast|skyst|storm cloudst|stormyst|sunst|sunset \ No newline at end of file