diff --git a/CHANGELOG.md b/CHANGELOG.md index e99423a4..af4945db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ ### Bug fixes - Bump requests to resolve yank for CVE-2024-35195 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/808)) - Better handle malformed mcping data ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/799)) -- Resolves type issue when posting no keywords in the "keyword" field in config.json tab ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/819)) +- Resolve type issue when posting no keywords in the "keyword" field in config.json tab ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/819)) +- Resolve issue where sometimes backup migration `20240308_multi-backup` would run twice ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/820)) ### Tweaks - Dyamically change child action translation for backups ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/806)) - Remove EXIF image data on app Background Photos ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/805)) diff --git a/app/migrations/20240308_multi-backup.py b/app/migrations/20240308_multi-backup.py index 64ff03e1..f8bd7439 100644 --- a/app/migrations/20240308_multi-backup.py +++ b/app/migrations/20240308_multi-backup.py @@ -8,7 +8,7 @@ import logging from app.classes.shared.helpers import Helpers from app.classes.shared.console import Console -from app.classes.shared.migration import Migrator +from app.classes.shared.migration import Migrator, MigrateHistory from app.classes.shared.file_helpers import FileHelpers logger = logging.getLogger(__name__) @@ -25,6 +25,12 @@ def migrate(migrator: Migrator, database, **kwargs): """ Write your migrations here. """ + this_migration = MigrateHistory.get_or_none( + MigrateHistory.name == "20240308_multi-backup" + ) + if this_migration is not None: + Console.debug("Update database already done, skipping this part") + return backup_migration_status = True schedule_migration_status = True db = database diff --git a/app/translations/zh_CN.json b/app/translations/zh_CN.json index 60c9535b..59d5106b 100644 --- a/app/translations/zh_CN.json +++ b/app/translations/zh_CN.json @@ -93,7 +93,7 @@ "kill": "杀死进程", "killing": "正在杀死进程……", "lastBackup": "上次:", - "max": "最大", + "max": "上限", "memUsage": "内存使用率", "motd": "服务器描述(MOTD)", "newServer": "创建新服务器", @@ -459,7 +459,7 @@ "rename": "重命名", "renameItemQuestion": "新名称应该是什么?", "save": "保存", - "size": "调整编辑器大小", + "size": "切换编辑器大小", "stayHere": "请不要离开此页面!", "unsupportedLanguage": "警告:这不是一个受支持的文件类型", "unzip": "解压", @@ -602,7 +602,7 @@ "serverName": "服务器名称", "serverPath": "服务器路径", "serverPort": "服务器端口", - "serverSelect": "服务器选择", + "serverSelect": "服务端选择", "serverType": "服务器类型", "serverUpload": "上传打包为 Zip 文件的服务器", "serverVersion": "服务器版本",