{% if len(data['backups']) == 0 %}
- {{ translate('serverBackups', 'no-backup', data['lang']) }} {{
- translate('serverBackups', 'newBackup',data['lang']) }}.
+ {{ translate('serverBackups', 'no-backup', data['lang']) }}.
{% end %}
{% if len(data['backups']) > 0 %}
diff --git a/app/migrations/20240308_multi-backup.py b/app/migrations/20240308_multi-backup.py
index db154ec8..ec46286e 100644
--- a/app/migrations/20240308_multi-backup.py
+++ b/app/migrations/20240308_multi-backup.py
@@ -13,6 +13,13 @@ from app.classes.shared.file_helpers import FileHelpers
logger = logging.getLogger(__name__)
+def is_valid_backup(backup, all_servers):
+ try:
+ return str(backup.server_id) in all_servers
+ except (TypeError, peewee.DoesNotExist):
+ return False
+
+
def migrate(migrator: Migrator, database, **kwargs):
"""
Write your migrations here.
@@ -150,9 +157,17 @@ def migrate(migrator: Migrator, database, **kwargs):
migrator.create_table(NewSchedules)
migrator.run()
-
+ all_servers = [
+ row.server_id for row in Servers.select(Servers.server_id).distinct()
+ ]
+ all_backups = Backups.select()
+ Console.info("Cleaning up orphan backups for all servers")
+ valid_backups = [
+ backup for backup in all_backups if is_valid_backup(backup, all_servers)
+ ]
# Copy data from the existing backups table to the new one
- for backup in Backups.select():
+ for backup in valid_backups:
+ Console.info(f"Trying to get server for backup migration {backup.server_id}")
# Fetch the related server entry from the Servers table
server = Servers.get(Servers.server_id == backup.server_id)
Console.info(f"Migrations: Migrating backup for server {server.server_name}")
@@ -172,15 +187,28 @@ def migrate(migrator: Migrator, database, **kwargs):
default=True,
enabled=True,
)
+ Console.info(
+ f"New backup table created for {server.server_name} with id {new_backup.backup_id}"
+ )
Helpers.ensure_dir_exists(
os.path.join(server.backup_path, new_backup.backup_id)
)
- for file in os.listdir(server.backup_path):
- if not os.path.isdir(os.path.join(os.path.join(server.backup_path, file))):
- FileHelpers.move_file(
- os.path.join(server.backup_path, file),
- os.path.join(server.backup_path, new_backup.backup_id, file),
- )
+ try:
+ Console.info(
+ f"Moving old backups to new backup dir for {server.server_name}"
+ )
+ for file in os.listdir(server.backup_path):
+ if not os.path.isdir(
+ os.path.join(os.path.join(server.backup_path, file))
+ ):
+ FileHelpers.move_file(
+ os.path.join(server.backup_path, file),
+ os.path.join(server.backup_path, new_backup.backup_id, file),
+ )
+ except FileNotFoundError as why:
+ logger.error(
+ f"Could not move backup {file} for {server.server_name} to new location with error {why}"
+ )
Console.debug("Migrations: Dropping old backup table")
# Drop the existing backups table
diff --git a/app/translations/th_TH_incomplete.json b/app/translations/th_TH.json
similarity index 99%
rename from app/translations/th_TH_incomplete.json
rename to app/translations/th_TH.json
index 988b241c..2e447473 100644
--- a/app/translations/th_TH_incomplete.json
+++ b/app/translations/th_TH.json
@@ -585,6 +585,8 @@
"minMem": "หน่วยความจำขั้นต่ำ",
"myNewServer": "เซิร์ฟเวอร์ใหม่ของฉัน",
"newServer": "สร้างเซิร์ฟเวอร์ใหม่",
+ "noRole": "ไม่พบบทบาทจากพารามิเตอร์การค้นหาปัจจุบัน",
+ "noneRoles": "ไม่มีบทบาทที่เลือก",
"quickSettings": "การตั้งค่าด่วน",
"quickSettingsDescription": "ไม่ต้องกังวล คุณสามารถเปลี่ยนแปลงสิ่งเหล่านี้ได้ในภายหลัง",
"resetForm": "รีเซ็ตแบบฟอร์ม",