Merge branch 'tweak/backup-file-time-' into 'dev'

Set backup filename to use same time as schedule

See merge request crafty-controller/crafty-4!534

CHANGELOG.md

@@ -7,6 +7,8 @@ TBD
 - Fix Schedule Restore | Add Backup Config Preservation. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/533))
 ### Tweaks
 - Added further login screen customisation settings. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/531))
+- Fix Schedule Restore | Add Backup Config Preservation. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/533))
+- Set backup filename to use same time as schedule. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/534))
 ### Lang
 TBD
 <br><br>

app/classes/shared/server.py

@@ -131,13 +131,13 @@ class ServerInstance:
         self.stats_helper = HelperServerStats(self.server_id)
         self.last_backup_failed = False
         try:
-            tz = get_localzone()
+            self.tz = get_localzone()
         except ZoneInfoNotFoundError:
             logger.error(
                 "Could not capture time zone from system. Falling back to Europe/London"
             )
-            tz = "Europe/London"
-        self.server_scheduler = BackgroundScheduler(timezone=str(tz))
+            self.tz = "Europe/London"
+        self.server_scheduler = BackgroundScheduler(timezone=str(self.tz))
         self.server_scheduler.start()
         self.backup_thread = threading.Thread(
             target=self.a_backup_server, daemon=True, name=f"backup_{self.name}"
@@ -1037,7 +1037,7 @@ class ServerInstance:
         try:
             backup_filename = (
                 f"{self.settings['backup_path']}/"
-                f"{datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}"
+                f"{datetime.datetime.now().astimezone(self.tz).strftime('%Y-%m-%d_%H-%M-%S')}"  # pylint: disable=line-too-long
             )
             logger.info(
                 f"Creating backup of server '{self.settings['server_name']}'"