From 2d572eef7f5eed3dcfd4b7a4c97e9a4b1e17e745 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 28 May 2021 10:25:35 +0200 Subject: [PATCH] No longer include plugins in the backup Backups are synced with your account anyway. Backing up the plugins means that you quickly reach the limit of the max size (250mb) that the backups allow. CURA-8269 --- cura/Backups/Backup.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cura/Backups/Backup.py b/cura/Backups/Backup.py index 85852e74f6..6f4a44d37e 100644 --- a/cura/Backups/Backup.py +++ b/cura/Backups/Backup.py @@ -28,6 +28,8 @@ class Backup: IGNORED_FILES = [r"cura\.log", r"plugins\.json", r"cache", r"__pycache__", r"\.qmlc", r"\.pyc"] """These files should be ignored when making a backup.""" + IGNORED_FOLDERS = [r"plugins"] + SECRETS_SETTINGS = ["general/ultimaker_auth_data"] """Secret preferences that need to obfuscated when making a backup of Cura""" @@ -74,8 +76,9 @@ class Backup: machine_count = max(len([s for s in files if "machine_instances/" in s]) - 1, 0) # If people delete their profiles but not their preferences, it can still make a backup, and report -1 profiles. Server crashes on this. material_count = max(len([s for s in files if "materials/" in s]) - 1, 0) profile_count = max(len([s for s in files if "quality_changes/" in s]) - 1, 0) - plugin_count = len([s for s in files if "plugin.json" in s]) - + # We don't store plugins anymore, since if you can make backups, you have an account (and the plugins are + # on the marketplace anyway) + plugin_count = 0 # Store the archive and metadata so the BackupManager can fetch them when needed. self.zip_file = buffer.getvalue() self.meta_data = { @@ -94,8 +97,7 @@ class Backup: :param root_path: The root directory to archive recursively. :return: The archive as bytes. """ - - ignore_string = re.compile("|".join(self.IGNORED_FILES)) + ignore_string = re.compile("|".join(self.IGNORED_FILES + self.IGNORED_FOLDERS)) try: archive = ZipFile(buffer, "w", ZIP_DEFLATED) for root, folders, files in os.walk(root_path):