From b97c5366d3501e35cd282f304b9da1445383189b Mon Sep 17 00:00:00 2001 From: TheJackiMonster Date: Thu, 6 May 2021 16:57:30 +0200 Subject: [PATCH] Fixed differences in saving project with new io Signed-off-by: TheJackiMonster --- bin/test_io.py | 3 +++ manuskript/data/project.py | 5 ++++- manuskript/io/mskFile.py | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/test_io.py b/bin/test_io.py index 5da09a80..07aac8fb 100644 --- a/bin/test_io.py +++ b/bin/test_io.py @@ -29,3 +29,6 @@ for status in project.statuses: settings.set("saveToZip", True) project.save() + +settings.set("saveToZip", False) +project.save() diff --git a/manuskript/data/project.py b/manuskript/data/project.py index 33a70221..d5320ae2 100644 --- a/manuskript/data/project.py +++ b/manuskript/data/project.py @@ -40,9 +40,12 @@ class Project: def save(self): print("Save project: " + str(self.file.path) + " " + str(self.file.dir_path)) + saveToZip = self.settings.isEnabled("saveToZip") + self.file.setZipFile(saveToZip) + self.statuses.save() self.settings.save() self.plots.save() #self.revisions.save() - self.file.save(self.settings.isEnabled("saveToZip")) + self.file.save(saveToZip) diff --git a/manuskript/io/mskFile.py b/manuskript/io/mskFile.py index 0d9a1780..8604bfbf 100644 --- a/manuskript/io/mskFile.py +++ b/manuskript/io/mskFile.py @@ -34,7 +34,10 @@ class MskFile(TextFile, ZipFile): if not zipFile: self.dir_path = os.path.splitext(self.path)[0] - os.mkdir(self.dir_path) + + if not os.path.isdir(self.dir_path): + os.mkdir(self.dir_path) + ZipFile.load(self) self.zipFile = zipFile