From 24ba01a87bbba1fa0dafdf25eb5ac1cde9b12eac Mon Sep 17 00:00:00 2001 From: Blake Eryx Date: Wed, 22 Jul 2020 16:29:47 -0400 Subject: [PATCH 1/2] Don't arbitrarily delete extra files in project folder --- manuskript/load_save/version_1.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/manuskript/load_save/version_1.py b/manuskript/load_save/version_1.py index 6c4f91d8..fd38d3b6 100644 --- a/manuskript/load_save/version_1.py +++ b/manuskript/load_save/version_1.py @@ -391,14 +391,6 @@ def saveProject(zip=None): # Removing phantoms for path in [p for p in cache if p not in [p for p, c in files]]: - filename = os.path.join(dir, folder, path) - log("* Removing", path) - - if os.path.isdir(filename): - shutil.rmtree(filename) - - else: # elif os.path.exists(filename) - os.remove(filename) # Clear cache cache.pop(path, 0) From 202b598e7974e689065727afdea0c410128abe6d Mon Sep 17 00:00:00 2001 From: Blake Eryx Date: Wed, 22 Jul 2020 16:50:06 -0400 Subject: [PATCH 2/2] Ignore image and PDF files in project folder --- manuskript/load_save/version_1.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manuskript/load_save/version_1.py b/manuskript/load_save/version_1.py index fd38d3b6..d9470c34 100644 --- a/manuskript/load_save/version_1.py +++ b/manuskript/load_save/version_1.py @@ -655,6 +655,9 @@ def loadProject(project, zip=None): if f[-4:] in [".xml", "opml"]: with open(os.path.join(dirpath, f), "rb") as fo: files[os.path.join(p, f)] = fo.read() + elif f[-4:] in [".png", "jpeg",".jpg","bmp","tiff",".gif",".pdf"]: + # ignore file + pass else: with open(os.path.join(dirpath, f), "r", encoding="utf8") as fo: files[os.path.join(p, f)] = fo.read()