v5.2.0 (#665)

Author: Archmonger

CHANGELOG.md

@@ -14,6 +14,10 @@ Don't forget to remove deprecated code on each major release!
 
 ## [Unreleased]
 
+- Nothing (yet)!
+
+## [5.2.0] - 2026-02-10
+
 ### Added
 
 - Added support for custom metadata writing and validation during operations via `DBBACKUP_BACKUP_METADATA_SETTER` and `DBBACKUP_RESTORE_METADATA_VALIDATOR` settings.
@@ -348,7 +352,8 @@ Don't forget to remove deprecated code on each major release!
 
 - Miscellaneous maintenance and minor bug fixes.
 
-[Unreleased]: https://github.com/Archmonger/django-dbbackup/compare/5.1.2...HEAD
+[Unreleased]: https://github.com/Archmonger/django-dbbackup/compare/5.2.0...HEAD
+[5.2.0]: https://github.com/Archmonger/django-dbbackup/compare/5.1.2...5.2.0
 [5.1.2]: https://github.com/Archmonger/django-dbbackup/compare/5.1.1...5.1.2
 [5.1.1]: https://github.com/Archmonger/django-dbbackup/compare/5.1.0...5.1.1
 [5.1.0]: https://github.com/Archmonger/django-dbbackup/compare/5.0.1...5.1.0

dbbackup/__init__.py

@@ -1,3 +1,3 @@
 """Management commands to help backup and restore a project database and media"""
 
-__version__ = "5.1.2"
+__version__ = "5.2.0"

dbbackup/checks.py

@@ -1,44 +1,45 @@
 import re
 from datetime import datetime
 
-from django.core.checks import Tags, Warning, register
+from django.core.checks import Tags, register
+from django.core.checks import Warning as DjangoWarning
 
 from dbbackup import settings
 
-W001 = Warning(
+W001 = DjangoWarning(
     "Invalid HOSTNAME parameter",
     hint="Set a non empty string to this settings.DBBACKUP_HOSTNAME",
     id="dbbackup.W001",
 )
-W002 = Warning(
+W002 = DjangoWarning(
     "Invalid STORAGE parameter",
     hint="Set a valid path to a storage in settings.DBBACKUP_STORAGE",
     id="dbbackup.W002",
 )
-W003 = Warning(
+W003 = DjangoWarning(
     "Invalid FILENAME_TEMPLATE parameter",
     hint="Include {datetime} to settings.DBBACKUP_FILENAME_TEMPLATE",
     id="dbbackup.W003",
 )
-W004 = Warning(
+W004 = DjangoWarning(
     "Invalid MEDIA_FILENAME_TEMPLATE parameter",
     hint="Include {datetime} to settings.DBBACKUP_MEDIA_FILENAME_TEMPLATE",
     id="dbbackup.W004",
 )
-W005 = Warning(
+W005 = DjangoWarning(
     "Invalid DATE_FORMAT parameter",
     hint="settings.DBBACKUP_DATE_FORMAT can contain only [A-Za-z0-9%_-]",
     id="dbbackup.W005",
 )
 # W006: Historical - "FAILURE_RECIPIENTS has been deprecated"
 
-W007 = Warning(
+W007 = DjangoWarning(
     "Invalid FILENAME_TEMPLATE parameter",
     hint="settings.DBBACKUP_FILENAME_TEMPLATE must not contain slashes ('/'). "
     "Did you mean to change the value for 'location'?",
     id="dbbackup.W007",
 )
-W008 = Warning(
+W008 = DjangoWarning(
     "Invalid MEDIA_FILENAME_TEMPLATE parameter",
     hint="settings.DBBACKUP_MEDIA_FILENAME_TEMPLATE must not contain slashes ('/')"
     "Did you mean to change the value for 'location'?",

dbbackup/management/commands/_base.py

@@ -2,14 +2,20 @@
 Abstract Command.
 """
 
+from __future__ import annotations
+
 import logging
 import sys
 from shutil import copyfileobj
+from typing import TYPE_CHECKING
 
 from django.core.management.base import BaseCommand, CommandError
 
 from dbbackup.storage import StorageError
 
+if TYPE_CHECKING:
+    from dbbackup.storage import Storage
+
 USELESS_ARGS = ("callback", "callback_args", "callback_kwargs", "metavar")
 TYPES = {
     "string": str,
@@ -57,6 +63,14 @@ class BaseDbBackupCommand(BaseCommand):
     verbosity = 1
     quiet = False
     logger = logging.getLogger("dbbackup.command")
+    storage: Storage
+    path: str | None = None
+    filename: str | None = None
+    decrypt = False
+    uncompress = False
+    encrypt = False
+    compress = False
+    content_type = ""
 
     def __init__(self, *args, **kwargs):
         self.option_list = self.base_option_list + self.option_list

dbbackup/management/commands/dbrestore.py

@@ -2,6 +2,8 @@
 Restore database.
 """
 
+from __future__ import annotations
+
 import io
 import json
 import os
@@ -67,7 +69,7 @@ class Command(BaseDbBackupCommand):
 
     def handle(self, *args, **options):
         """Django command handler."""
-        self.verbosity = int(options.get("verbosity"))
+        self.verbosity = int(options.get("verbosity", "1"))
         self.quiet = options.get("quiet")
         self._set_logger_level()
 
@@ -90,7 +92,7 @@ def handle(self, *args, **options):
         except StorageError as err:
             raise CommandError(err) from err
 
-    def _get_database(self, database_name: str):
+    def _get_database(self, database_name: str | None):
         """Get the database to restore."""
         if not database_name:
             if len(settings.DATABASES) > 1:

dbbackup/management/commands/listbackups.py

@@ -62,10 +62,11 @@ def handle(self, **options):
     def get_backup_attrs(self, options):
         filters = {k: v for k, v in options.items() if k in FILTER_KEYS}
         filenames = self.storage.list_backups(**filters)
-        return [
-            {
-                "datetime": utils.filename_to_date(filename).strftime("%x %X"),
+        backups = []
+        for filename in filenames:
+            file_date = utils.filename_to_date(filename)
+            backups.append({
+                "datetime": file_date.strftime("%x %X") if file_date is not None else "Unknown",
                 "name": filename,
-            }
-            for filename in filenames
-        ]
+            })
+        return backups

dbbackup/management/commands/mediarestore.py

@@ -47,7 +47,7 @@ class Command(BaseDbBackupCommand):
 
     def handle(self, *args, **options):
         """Django command handler."""
-        self.verbosity = int(options.get("verbosity"))
+        self.verbosity = int(options.get("verbosity", "1"))
         self.quiet = options.get("quiet")
         self._set_logger_level()
 

dbbackup/storage.py

@@ -4,6 +4,7 @@
 
 import contextlib
 import logging
+from datetime import datetime, timezone
 
 from django.core.exceptions import ImproperlyConfigured
 
@@ -185,7 +186,7 @@ def get_latest_backup(
         if not files:
             msg = "There's no backup file available."
             raise StorageError(msg)
-        return max(files, key=utils.filename_to_date)
+        return max(files, key=self._filename_to_date_or_min)
 
     def get_older_backup(
         self,
@@ -230,7 +231,7 @@ def get_older_backup(
         if not files:
             msg = "There's no backup file available."
             raise StorageError(msg)
-        return min(files, key=utils.filename_to_date)
+        return min(files, key=self._filename_to_date_or_min)
 
     def clean_old_backups(
         self,
@@ -274,7 +275,7 @@ def clean_old_backups(
             database=database,
             servername=servername,
         )
-        files = sorted(files, key=utils.filename_to_date, reverse=True)
+        files = sorted(files, key=self._filename_to_date_or_min, reverse=True)
         files_to_delete = [fi for i, fi in enumerate(files) if i >= keep_number]
         for filename in files_to_delete:
             if keep_filter(filename):
@@ -285,6 +286,15 @@ def clean_old_backups(
             if self.storage.exists(metadata_filename):
                 self.delete_file(metadata_filename)
 
+    @staticmethod
+    def _filename_to_date_or_min(filename: str) -> datetime:
+        file_date = utils.filename_to_date(filename)
+        if file_date is None:
+            return datetime.min.replace(tzinfo=timezone.utc)
+        if file_date.tzinfo is None:
+            return file_date.replace(tzinfo=timezone.utc)
+        return file_date
+
 
 def get_storage_class(path=None):
     """

dbbackup/utils.py

@@ -123,7 +123,7 @@ def wrapper(*args, **kwargs):
             logger = logging.getLogger("dbbackup")
             exc_type, exc_value, tb = sys.exc_info()
             tb_str = "".join(traceback.format_tb(tb))
-            msg = f"{exc_type.__name__}: {exc_value}\n{tb_str}"
+            msg = f"{getattr(exc_type, '__name__', str(exc_type) or 'Exception')}: {exc_value}\n{tb_str}"
             logger.exception(msg)
             raise
         finally:
@@ -155,7 +155,19 @@ def create_spooled_temporary_file(filepath=None, fileobj=None):
     return spooled_file
 
 
-def encrypt_file(inputfile, filename):
+def _gpg_encrypt_file(inputfile, filepath, recipients, always_trust):
+    import gnupg
+
+    g = gnupg.GPG()
+    return g.encrypt_file(
+        inputfile,
+        output=filepath,
+        recipients=recipients,
+        always_trust=always_trust,
+    )
+
+
+def encrypt_file(inputfile, filename):  # sourcery skip: extract-method
     """
     Encrypt input file using GPG and remove .gpg extension to its name.
 
@@ -168,8 +180,6 @@ def encrypt_file(inputfile, filename):
     :returns: Tuple with file and new file's name
     :rtype: :class:`tempfile.SpooledTemporaryFile`, ``str``
     """
-    import gnupg
-
     tempdir = tempfile.mkdtemp(dir=settings.TMP_DIR)
     try:
         filename = f"{filename}.gpg"
@@ -179,14 +189,8 @@ def encrypt_file(inputfile, filename):
             raise ValueError(msg)
         try:
             inputfile.seek(0)
-            always_trust = settings.GPG_ALWAYS_TRUST
-            g = gnupg.GPG()
-            result = g.encrypt_file(
-                inputfile,
-                output=filepath,
-                recipients=settings.GPG_RECIPIENT,
-                always_trust=always_trust,
-            )
+            always_trust = bool(settings.GPG_ALWAYS_TRUST)
+            result = _gpg_encrypt_file(inputfile, filepath, settings.GPG_RECIPIENT, always_trust)
             inputfile.close()
             if not result:
                 msg = f"Encryption failed; status: {result.status}"

tests/test_connectors/test_sqlite.py

@@ -120,12 +120,12 @@ def test_restore_dump_warns_only_for_serious_errors(self):
 
         # Should warn about the serious error
         dbbackup_warnings = [w for w in warning_list if "dbbackup" in str(w.filename)]
-        assert len(dbbackup_warnings) > 0, "Should warn about 'no such table' error"
+        assert dbbackup_warnings, "Should warn about 'no such table' error"
 
         warning_messages = [str(w.message) for w in dbbackup_warnings]
-        assert any(
-            "no such table" in msg.lower() for msg in warning_messages
-        ), f"Should warn about 'no such table', got: {warning_messages}"
+        assert any("no such table" in msg.lower() for msg in warning_messages), (
+            f"Should warn about 'no such table', got: {warning_messages}"
+        )
 
     def test_create_dump_with_virtual_tables(self):
         with connection.cursor() as c:
@@ -210,11 +210,11 @@ def test_restore_warns_about_already_exists_errors(self):
         dbbackup_warnings = [w for w in warning_list if "dbbackup" in str(w.filename)]
 
         # Should warn about "already exists" errors now that filtering is removed
-        assert len(dbbackup_warnings) > 0, "Should have warnings for 'already exists' errors"
+        assert dbbackup_warnings, "Should have warnings for 'already exists' errors"
 
         # Verify we get warnings about "already exists"
         already_exists_warnings = [w for w in dbbackup_warnings if "already exists" in str(w.message).lower()]
-        assert len(already_exists_warnings) > 0, "Should warn about 'already exists' errors"
+        assert already_exists_warnings, "Should warn about 'already exists' errors"
 
 
 @patch("dbbackup.db.sqlite.open", mock_open(read_data=b"foo"), create=True)