From 5a6d68e1397b5b857ec2404b6bcf5a254ad3f99b Mon Sep 17 00:00:00 2001
From: Jonathan Pietkiewicz <jdanielp@gmail.com>
Date: Sat, 29 Jan 2022 14:23:14 -0600
Subject: [PATCH] Fix crash on open with locked files (fixex olivierkes#950)

---
 manuskript/load_save/version_1.py | 37 ++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/manuskript/load_save/version_1.py b/manuskript/load_save/version_1.py
index 15af4d4..da0bc3e 100644
--- a/manuskript/load_save/version_1.py
+++ b/manuskript/load_save/version_1.py
@@ -429,13 +429,14 @@ def saveProject(zip=None):
             LOGGER.error("Cannot open file " + project + " for writing: " + e.strerror)
             filesWithPermissionErrors.append(project)
 
-        dlg = ListDialog()
-        dlg.setModal(True)
-        dlg.setWindowTitle(dlg.tr("Files not saved"))
-        dlg.label.setText(dlg.tr("The following files were not saved and appear to be open in another program"))
-        for f in filesWithPermissionErrors:
-            QListWidgetItem(f, dlg.listWidget)
-        dlg.exec()
+        if len(filesWithPermissionErrors) > 0:
+            dlg = ListDialog()
+            dlg.setModal(True)
+            dlg.setWindowTitle(dlg.tr("Files not saved"))
+            dlg.label.setText(dlg.tr("The following files were not saved and appear to be open in another program"))
+            for f in filesWithPermissionErrors:
+                QListWidgetItem(f, dlg.listWidget)
+            dlg.exec()
 
         if project in filesWithPermissionErrors:
             return False
@@ -646,7 +647,8 @@ def loadProject(project, zip=None):
     """
 
     mw = mainWindow()
-    errors = []
+    errors = list()
+    filesWithPermissionErrors = list()
 
     ####################################################################################################################
     # Read and store everything in a dict
@@ -685,8 +687,14 @@ def loadProject(project, zip=None):
                     with open(os.path.join(dirpath, f), "rb") as fo:
                         files[os.path.join(p, f)] = fo.read()
                 else:
-                    with open(os.path.join(dirpath, f), "r", encoding="utf8") as fo:
-                        files[os.path.join(p, f)] = fo.read()
+                    try:
+                        filename = os.path.join(dirpath, f)
+                        with open(filename, "r", encoding="utf8") as fo:
+                            files[os.path.join(p, f)] = fo.read()
+                    except PermissionError as e:
+                        LOGGER.error("Cannot open file " + filename + ": " + e.strerror)
+                        errors.append(fo)
+                        filesWithPermissionErrors.append(filename)
 
         # Saves to cache (only if we loaded from disk and not zip)
         global cache
@@ -911,6 +919,15 @@ def loadProject(project, zip=None):
     # Check IDS
     mdl.rootItem.checkIDs()
 
+    if len(filesWithPermissionErrors) > 0:
+        dlg = ListDialog()
+        dlg.setModal(True)
+        dlg.setWindowTitle(dlg.tr("Files not loaded"))
+        dlg.label.setText(dlg.tr("The following files were not loaded and appear to be open in another program"))
+        for f in filesWithPermissionErrors:
+            QListWidgetItem(f, dlg.listWidget)
+        dlg.exec()
+
     return errors