Expand DEFAULT_NOCOMPRESS, fix issue with needs_rotation, write CHANG…

…ELOG

.gitignore

@@ -9,3 +9,4 @@ __pycache__
 .coverage
 /htmlcov
 .nova
+.python-version

CHANGELOG.md

@@ -0,0 +1,10 @@
+## 1.2.0
+
+*Note we skipped a version to align with `pzip`*
+
+* Drop support for Django 3.x and Python 3.8
+* Test on Django 5.x and Python 3.13
+* Fixed an issue where the `needs_rotation` signal could be sent multiple times, and for
+  invalid keys
+* Require `pzip>=1.2.0` to address an issue on Python 3.13
+* Expanded `PZipStorage.DEFAULT_NOCOMPRESS` to include more already-compressed filetypes

README.md

@@ -26,8 +26,7 @@ You may also use `PZipStorage` as a custom storage backend anywhere Django allow
 
 * `PZIP_STORAGE_EXTENSION` - the extension to append to any file saved with `PZipStorage`. Defaults to `.pz`.
 * `PZIP_STORAGE_NOCOMPRESS` - a set of file extensions (with leading period) which should not be compressed when
-  saving. Defaults to:
-  `[".z", ".gz", ".zip", ".tgz", ".jpg", ".jpeg", ".png", ".gif", ".sit", ".sitx", ".7z", ".pz", ".bz2", ".xz"]`
+  saving. See `PZipStorage.DEFAULT_NOCOMPRESS` for the default list.
 * `PZIP_STORAGE_KEYS` - an iterable (or callable returning an iterable) of keys to use. The first key on the list will
   be used for encrypting files. Defaults to `PZipStorage.default_keys`, which yields `SECRET_KEY`.
 

pyproject.toml

@@ -16,7 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
 ]
 dependencies = [
-    "pzip>=0.9.9"
+    "pzip>=1.2.0"
 ]
 
 [dependency-groups]

pzip_storage.py

@@ -8,7 +8,7 @@
 from django.core.files.storage import FileSystemStorage
 from django.utils.encoding import force_bytes
 
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 __version_info__ = tuple(int(num) for num in __version__.split("."))
 
 
@@ -33,6 +33,7 @@ class PZipStorage(FileSystemStorage):
             ".z",
             ".gz",
             ".zip",
+            ".zipx",
             ".tgz",
             ".jpg",
             ".jpeg",
@@ -44,6 +45,16 @@ class PZipStorage(FileSystemStorage):
             ".pz",
             ".bz2",
             ".xz",
+            ".rar",
+            ".cab",
+            ".zst",
+            ".lz",
+            ".lzma",
+            ".lz4",
+            ".jar",
+            ".heic",
+            ".avif",
+            ".webp",
         ]
     )
 
@@ -90,17 +101,17 @@ def _open(self, name, mode="rb"):
             for idx, key in enumerate(self.iter_keys()):
                 try:
                     f = super()._open(name, mode)
-                    return pzip.open(f, mode, key=key, peek=True)
-                except pzip.InvalidFile:
-                    # Close the underlying fileobj if PZip fails to decode.
-                    f.close()
-                finally:
+                    pz = pzip.open(f, mode, key=key, peek=True)
                     if idx > 0:
                         # If we opened this file with an old key, broadcast a signal for
                         # callers to do rotation.
                         needs_rotation.send(
                             sender=self.__class__, storage=self, name=name, key=key
                         )
+                    return pz
+                except pzip.InvalidFile:
+                    # Close the underlying fileobj if PZip fails to decode.
+                    f.close()
             # If we tried all the keys and haven't returned yet for a PZip file, send a
             # bad_keys signal.
             bad_keys.send(sender=self.__class__, storage=self, name=name)

tests.py

@@ -43,6 +43,7 @@ def test_multiple_keys(self):
         storage = PZipStorage(keys=lambda: keys)
         name = storage.save("testfile", ContentFile(plaintext))
         keys.insert(0, b"second")
+        keys.insert(0, b"third")
         with storage.open(name) as f:
             self.assertEqual(plaintext, f.read())
             handler.assert_called_once_with(