From e02eb39ae2d2dce6e4c7e4cbe602639341646554 Mon Sep 17 00:00:00 2001 From: Hissymaster <144076671+Hissymaster@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:46:27 +1100 Subject: [PATCH 1/2] docs: change reference to `planned_features.md` to `roadmap.md` (#564) Co-authored-by: Hissymaster --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eafecdb9..3d26790b 100644 --- a/README.md +++ b/README.md @@ -190,7 +190,7 @@ As of writing (Alpha v9.3.0) the project is in a useable state, however it lacks ### What Features Are You Planning on Adding? > [!IMPORTANT] -> See the [Planned Features](/docs/updates/planned_features.md) documentation for the latest feature lists. The lists here are currently being migrated over there with individual pages for larger features. +> See the [Roadmap](/docs/updates/roadmap.md) documentation for the latest feature lists. The lists here are currently being migrated over there with individual pages for larger features. Of the several features I have planned for the project, these are broken up into “priority” features and “future” features. Priority features were originally intended for the first public release, however are currently absent from the Alpha v9.x.x builds. From 0358f51f9998570887167dbf10f791e3a772cc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= <88423841+Roc25@users.noreply.github.com> Date: Mon, 4 Nov 2024 23:28:44 +0300 Subject: [PATCH 2/2] feat: add `IMAGE_RASTER_TYPES` (Fix #550) (#551) * fix resolution info * Fix for Raw and Vector Image types * Small refactor * Create IMAGE_RASTER_TYPES and remove is_image_ext_raster * Change if statment only for raster * Rename _IMAGE_SET to _IMAGE_RASTER_SET --------- Co-authored-by: gred --- tagstudio/src/core/media_types.py | 9 +++++++-- tagstudio/src/qt/widgets/preview_panel.py | 10 ++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tagstudio/src/core/media_types.py b/tagstudio/src/core/media_types.py index 04ea5e87..a1eda5e0 100644 --- a/tagstudio/src/core/media_types.py +++ b/tagstudio/src/core/media_types.py @@ -207,7 +207,7 @@ class MediaCategories: ".rw2", } _IMAGE_VECTOR_SET: set[str] = {".svg"} - _IMAGE_SET: set[str] = { + _IMAGE_RASTER_SET: set[str] = { ".apng", ".avif", ".bmp", @@ -392,9 +392,14 @@ class MediaCategories: extensions=_IMAGE_VECTOR_SET, is_iana=False, ) + IMAGE_RASTER_TYPES: MediaCategory = MediaCategory( + media_type=MediaType.IMAGE, + extensions=_IMAGE_RASTER_SET, + is_iana=False, + ) IMAGE_TYPES: MediaCategory = MediaCategory( media_type=MediaType.IMAGE, - extensions=_IMAGE_SET | _IMAGE_RAW_SET | _IMAGE_VECTOR_SET, + extensions=_IMAGE_RASTER_SET | _IMAGE_RAW_SET | _IMAGE_VECTOR_SET, is_iana=True, ) INSTALLER_TYPES: MediaCategory = MediaCategory( diff --git a/tagstudio/src/qt/widgets/preview_panel.py b/tagstudio/src/qt/widgets/preview_panel.py index b38fc6c1..7d055a3a 100644 --- a/tagstudio/src/qt/widgets/preview_panel.py +++ b/tagstudio/src/qt/widgets/preview_panel.py @@ -625,13 +625,7 @@ class PreviewPanel(QWidget): self.preview_gif.show() image = None - if ( - MediaCategories.is_ext_in_category(ext, MediaCategories.IMAGE_TYPES) - and MediaCategories.is_ext_in_category(ext, MediaCategories.IMAGE_RAW_TYPES) - and MediaCategories.is_ext_in_category( - ext, MediaCategories.IMAGE_VECTOR_TYPES - ) - ): + if MediaCategories.is_ext_in_category(ext, MediaCategories.IMAGE_RASTER_TYPES): image = Image.open(str(filepath)) elif MediaCategories.is_ext_in_category(ext, MediaCategories.IMAGE_RAW_TYPES): try: @@ -668,7 +662,7 @@ class PreviewPanel(QWidget): # Stats for specific file types are displayed here. if image and ( MediaCategories.is_ext_in_category( - ext, MediaCategories.IMAGE_TYPES, mime_fallback=True + ext, MediaCategories.IMAGE_RASTER_TYPES, mime_fallback=True ) or MediaCategories.is_ext_in_category( ext, MediaCategories.VIDEO_TYPES, mime_fallback=True