GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start fixing restore on Windows

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-05-17 12:13:01 +02:00
parent 9410f93dbf
commit aa07de45ed
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cura/Backups/Backup.py
View File

@ -1,5 +1,6 @@
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import fnmatch
import io import io
import os import os
import shutil import shutil
@ -22,7 +23,7 @@ class Backup:
""" """
# These files should be ignored when making a backup. # These files should be ignored when making a backup.
IGNORED_FILES = {"cura.log", "cache"} IGNORED_FILES = {"cura.log", "cache", "(?s).qmlc"}
# Re-use translation catalog. # Re-use translation catalog.
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")
@ -84,14 +85,17 @@ class Backup:
archive = ZipFile(buffer, "w", ZIP_DEFLATED) archive = ZipFile(buffer, "w", ZIP_DEFLATED)
for root, folders, files in contents: for root, folders, files in contents:
for folder_name in folders: for folder_name in folders:
if folder_name in self.IGNORED_FILES: for ignore_rule in self.IGNORED_FILES:
continue if fnmatch.fnmatch(ignore_rule, folder_name):
continue
absolute_path = os.path.join(root, folder_name) absolute_path = os.path.join(root, folder_name)
relative_path = absolute_path[len(root_path) + len(os.sep):] relative_path = absolute_path[len(root_path) + len(os.sep):]
archive.write(absolute_path, relative_path) archive.write(absolute_path, relative_path)
for file_name in files: for file_name in files:
if file_name in self.IGNORED_FILES: for ignore_rule in self.IGNORED_FILES:
continue if fnmatch.fnmatch(ignore_rule, file_name):
print("FNMATCH=====", ignore_rule, file_name)
continue
absolute_path = os.path.join(root, file_name) absolute_path = os.path.join(root, file_name)
relative_path = absolute_path[len(root_path) + len(os.sep):] relative_path = absolute_path[len(root_path) + len(os.sep):]
archive.write(absolute_path, relative_path) archive.write(absolute_path, relative_path)
@ -145,18 +149,7 @@ class Backup:
:return: A boolean whether we had success or not. :return: A boolean whether we had success or not.
""" """
Logger.log("d", "Removing current data in location: %s", target_path) Logger.log("d", "Removing current data in location: %s", target_path)
try: Resources.factoryReset()
shutil.rmtree(target_path, ignore_errors=True, onerror=self._handleRemovalError)
except PermissionError as error:
# This happens if a file is already opened by another program, usually only the log file.
# For now we just ignore this as it doesn't harm the restore process.
Logger.log("w", "Permission error while trying to remove tree: %s", error)
pass
Logger.log("d", "Extracting backup to location: %s", target_path) Logger.log("d", "Extracting backup to location: %s", target_path)
archive.extractall(target_path) archive.extractall(target_path)
return True return True
@staticmethod
def _handleRemovalError(*args):
func, path, _ = args
Logger.log("w", "Could not remove path %s when doing recursive delete, ignoring...", path)