diff --git a/etiquette/phototagger.py b/etiquette/phototagger.py index 7c8b13f..6e77858 100644 --- a/etiquette/phototagger.py +++ b/etiquette/phototagger.py @@ -210,7 +210,7 @@ def _helper_extension(ext): ext = [ext] if ext is None: return set() - ext = [e.lower() for e in ext] + ext = [e.lower().strip('.') for e in ext] ext = [e for e in ext if e] ext = set(ext) return ext @@ -504,6 +504,7 @@ def searchfilter_expression(photo_tags, expression, frozen_children, warn_bad_ta if token not in OPERATORS: try: + token = normalize_tagname(token) value = any(option in photo_tags for option in frozen_children[token]) except KeyError: if warn_bad_tags: @@ -1694,6 +1695,7 @@ class Album(ObjectBase, GroupableMixin): photoid = photo[SQL_ALBUMPHOTO['photoid']] photo = self.photodb.get_photo(photoid) photos.append(photo) + photos.sort(key=lambda x: x.basename.lower()) return photos def remove_photo(self, photo, commit=True): diff --git a/etiquette/static/basic_thumbnails/svg.png b/etiquette/static/basic_thumbnails/svg.png new file mode 100644 index 0000000..ccb1fa4 Binary files /dev/null and b/etiquette/static/basic_thumbnails/svg.png differ diff --git a/etiquette/static/basic_thumbnails/svg.svg b/etiquette/static/basic_thumbnails/svg.svg new file mode 100644 index 0000000..49a1d67 --- /dev/null +++ b/etiquette/static/basic_thumbnails/svg.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etiquette/templates/photo_object.html b/etiquette/templates/photo_object.html index 65bd8f6..76597c5 100644 --- a/etiquette/templates/photo_object.html +++ b/etiquette/templates/photo_object.html @@ -2,6 +2,7 @@ { "audio": "audio", "txt": "txt", + "svg": "svg", "video": "video", } %}