fix: similar implementation for private and public files

Author: earthcomfy

filer/admin/folderadmin.py

@@ -376,30 +376,8 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
             .order_by("-modified")
         )
         file_qs = file_qs.annotate(
-            # For private files (Filer pattern)
-            thumbnail_name_filer=Subquery(
-                thumbnail_qs.filter(name__contains=f"__{size}_").values_list("name")[:1]
-            ),
-            thumbnailx2_name_filer=Subquery(
-                thumbnail_qs.filter(name__contains=f"__{size_x2}_").values_list("name")[
-                    :1
-                ]
-            ),
-            # For public files (easy_thumbnails pattern)
-            thumbnail_name_easy=Subquery(
-                thumbnail_qs.filter(name__contains=f".{size}_q85_crop").values_list(
-                    "name"
-                )[:1]
-            ),
-            thumbnailx2_name_easy=Subquery(
-                thumbnail_qs.filter(name__contains=f".{size_x2}_q85_crop").values_list(
-                    "name"
-                )[:1]
-            ),
-            thumbnail_name=Coalesce("thumbnail_name_filer", "thumbnail_name_easy"),
-            thumbnailx2_name=Coalesce(
-                "thumbnailx2_name_filer", "thumbnailx2_name_easy"
-            ),
+            thumbnail_name=Subquery(thumbnail_qs.filter(name__contains=f".{size}_").values_list("name")[:1]),
+            thumbnailx2_name=Subquery(thumbnail_qs.filter(name__contains=f".{size_x2}_").values_list("name")[:1])
         ).select_related("owner")
 
         try:

filer/utils/filer_easy_thumbnails.py

@@ -3,12 +3,11 @@
 
 from easy_thumbnails.files import Thumbnailer
 
-
-# match the source filename using `__` as the seperator. ``opts_and_ext`` is non
-# greedy so it should match the last occurence of `__`.
-# in ``ThumbnailerNameMixin.get_thumbnail_name`` we ensure that there is no `__`
-# in the opts part.
-RE_ORIGINAL_FILENAME = re.compile(r"^(?P<source_filename>.*)__(?P<opts_and_ext>.*?)$")
+# easy-thumbnails default pattern
+# e.g: source.jpg.100x100_q80_crop_upscale.jpg
+RE_ORIGINAL_FILENAME = re.compile(
+    r"^(?P<source_filename>.*?)\.(?P<opts_and_ext>[^.]+\.[^.]+)$"
+)
 
 
 def thumbnail_to_original_filename(thumbnail_name):
@@ -19,69 +18,42 @@ def thumbnail_to_original_filename(thumbnail_name):
 
 
 class ThumbnailerNameMixin:
-    thumbnail_basedir = ''
-    thumbnail_subdir = ''
-    thumbnail_prefix = ''
+    thumbnail_basedir = ""
+    thumbnail_subdir = ""
+    thumbnail_prefix = ""
 
     def get_thumbnail_name(self, thumbnail_options, transparent=False):
         """
-        A version of ``Thumbnailer.get_thumbnail_name`` that produces a
-        reproducible thumbnail name that can be converted back to the original
-        filename. For public files, it uses easy_thumbnails default naming.
+        Get thumbnail name using easy-thumbnails pattern.
+        For public files: Uses configurable naming via THUMBNAIL_NAMER
+        For private files: Uses easy-thumbnails default naming pattern regardless of THUMBNAIL_NAMER
         """
         is_public = False
         if hasattr(self, "thumbnail_storage"):
             is_public = "PrivateFileSystemStorage" not in str(
                 self.thumbnail_storage.__class__
             )
 
-        if is_public:
-            return super(ThumbnailerNameMixin, self).get_thumbnail_name(
-                thumbnail_options, transparent
-            )
-        
         path, source_filename = os.path.split(self.name)
-        source_extension = os.path.splitext(source_filename)[1][1:].lower()
-        preserve_extensions = self.thumbnail_preserve_extensions
-        if preserve_extensions is True or source_extension == 'svg' or \
-                isinstance(preserve_extensions, (list, tuple)) and source_extension in preserve_extensions:
-            extension = source_extension
-        elif transparent:
-            extension = self.thumbnail_transparency_extension
-        else:
-            extension = self.thumbnail_extension
-        extension = extension or 'jpg'
-
-        thumbnail_options = thumbnail_options.copy()
-        size = tuple(thumbnail_options.pop('size'))
-        initial_opts = ['{}x{}'.format(*size)]
-        quality = thumbnail_options.pop('quality', self.thumbnail_quality)
-        if extension == 'jpg':
-            initial_opts.append(f'q{quality}')
-        elif extension == 'svg':
-            thumbnail_options.pop('subsampling', None)
-            thumbnail_options.pop('upscale', None)
-
-        opts = list(thumbnail_options.items())
-        opts.sort()   # Sort the options so the file name is consistent.
-        opts = ['{}'.format(v is not True and f'{k}-{v}' or k)
-                for k, v in opts if v]
-        all_opts = '_'.join(initial_opts + opts)
-
-        basedir = self.thumbnail_basedir
-        subdir = self.thumbnail_subdir
-
-        # make sure our magic delimiter is not used in all_opts
-        all_opts = all_opts.replace('__', '_')
-        filename = f'{source_filename}__{all_opts}.{extension}'
+        thumbnail_name = super(ThumbnailerNameMixin, self).get_thumbnail_name(
+            thumbnail_options, transparent
+        )
+        if is_public:
+            return thumbnail_name
 
-        return os.path.join(basedir, path, subdir, filename)
+        base_thumb_name = os.path.basename(thumbnail_name)
+        return os.path.join(
+            self.thumbnail_basedir,
+            path,
+            self.thumbnail_subdir,
+            f"{source_filename}.{base_thumb_name}",
+        )
 
 
 class ActionThumbnailerMixin:
-    thumbnail_basedir = ''
-    thumbnail_subdir = ''
-    thumbnail_prefix = ''
+    thumbnail_basedir = ""
+    thumbnail_subdir = ""
+    thumbnail_prefix = ""
 
     def get_thumbnail_name(self, thumbnail_options, transparent=False):
         """
@@ -101,7 +73,7 @@ def thumbnail_exists(self, thumbnail_name):
 
 class FilerThumbnailer(ThumbnailerNameMixin, Thumbnailer):
     def __init__(self, *args, **kwargs):
-        self.thumbnail_basedir = kwargs.pop('thumbnail_basedir', '')
+        self.thumbnail_basedir = kwargs.pop("thumbnail_basedir", "")
         super().__init__(*args, **kwargs)
 
 

tests/test_models.py

@@ -35,14 +35,13 @@ def tearDown(self):
         for f in File.objects.all():
             f.delete()
 
-    def create_filer_image(self, owner=None, is_public=True):
+    def create_filer_image(self, owner=None):
         if owner is None:
             owner = self.superuser
         file_obj = DjangoFile(open(self.filename, 'rb'), name=self.image_name)
         image = Image.objects.create(owner=owner,
                                      original_filename=self.image_name,
-                                     file=file_obj,
-                                     is_public=is_public)
+                                     file=file_obj)
         return image
 
     def test_create_folder_structure(self):
@@ -81,14 +80,14 @@ def test_create_clipboard_item(self):
         self.assertEqual(Clipboard.objects.count(), 1)
 
     def test_create_icons(self):
-        image = self.create_filer_image(is_public=False)
+        image = self.create_filer_image()
         image.save()
         icons = image.icons
         file_basename = os.path.basename(image.file.path)
         self.assertEqual(len(icons), len(filer_settings.FILER_ADMIN_ICON_SIZES))
         for size in filer_settings.FILER_ADMIN_ICON_SIZES:
             self.assertEqual(os.path.basename(icons[size]),
-                             file_basename + '__{}x{}_q85_crop_subsampling-2_upscale.jpg'.format(size, size))
+                             file_basename + '.{}x{}_q85_crop_upscale.jpg'.format(size, size))
 
     def test_access_icons_property(self):
         """Test IconsMixin that calls static on a non-existent file"""

tests/test_thumbnails.py

@@ -45,13 +45,13 @@ def test_thumbnailer_class_for_public_files(self):
         image = self.create_filer_image(is_public=True)
         thumbnailer = image.easy_thumbnails_thumbnailer
         name = thumbnailer.get_thumbnail_name({"size": (100, 100)})
-        self.assertNotIn("__", name)
+        self.assertRegex(name, r"^.*\..*\.[^.]+$")
 
     def test_thumbnailer_class_for_private_files(self):
         image = self.create_filer_image(is_public=False)
         thumbnailer = image.easy_thumbnails_thumbnailer
         name = thumbnailer.get_thumbnail_name({"size": (100, 100)})
-        self.assertIn("__", name)
+        self.assertRegex(name, r"^.*\..*\.[^.]+$")
 
     @override_settings(THUMBNAIL_NAMER="tests.test_thumbnails.custom_namer")
     def test_thumbnail_custom_namer(self):
@@ -60,3 +60,12 @@ def test_thumbnail_custom_namer(self):
         name = thumbnailer.get_thumbnail_name({"size": (100, 100)})
         filename = os.path.basename(name)
         self.assertTrue(filename.startswith("custom_prefix_"))
+
+    @override_settings(THUMBNAIL_NAMER="tests.test_thumbnails.custom_namer")
+    def test_private_thumbnail_ignores_custom_namer(self):
+        image = self.create_filer_image(is_public=False)
+        thumbnailer = image.easy_thumbnails_thumbnailer
+        name = thumbnailer.get_thumbnail_name({"size": (100, 100)})
+        filename = os.path.basename(name)
+        self.assertFalse(filename.startswith("custom_prefix_"))
+        self.assertRegex(name, r"^.*\..*\.[^.]+$")