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

CURA-4895 Correctly format the date for the backup file

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-02-05 11:17:17 +01:00
parent 915bb2e450
commit 383319d631
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cura/CrashHandler.py
View File

@ -144,23 +144,20 @@ class CrashHandler:
if cache_path not in (config_path, data_path): if cache_path not in (config_path, data_path):
folders_to_remove.append(cache_path) folders_to_remove.append(cache_path)
# need to close the redirected stdout and stderr files, otherwise, on Windows, those opened files will prevent
# the directory removal calls below.
sys.stdout.close()
sys.stderr.close()
for folder in folders_to_remove: for folder in folders_to_remove:
shutil.rmtree(folder, ignore_errors = True) shutil.rmtree(folder, ignore_errors = True)
for folder in folders_to_backup: for folder in folders_to_backup:
base_name = os.path.basename(folder) base_name = os.path.basename(folder)
root_dir = os.path.dirname(folder) root_dir = os.path.dirname(folder)
import datetime
date_now = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
idx = 0 idx = 0
file_name = base_name + "_" + str(time.time()) file_name = base_name + "_" + date_now
zip_file_path = os.path.join(root_dir, file_name + ".zip") zip_file_path = os.path.join(root_dir, file_name + ".zip")
while os.path.exists(zip_file_path): while os.path.exists(zip_file_path):
idx += 1 idx += 1
file_name = base_name + "_" + str(time.time()) + "_" + idx file_name = base_name + "_" + date_now + "_" + idx
zip_file_path = os.path.join(root_dir, file_name + ".zip") zip_file_path = os.path.join(root_dir, file_name + ".zip")
try: try:
# remove the .zip extension because make_archive() adds it # remove the .zip extension because make_archive() adds it