Show the correct dialog when an error occurs while opening a file

Author: cbjeukendrup

src/engraving/infrastructure/mscreader.cpp

@@ -276,7 +276,7 @@ Ret MscReader::ZipFileReader::open(IODevice* device, const path_t& filePath)
 
     m_zip = new ZipReader(m_device);
 
-    return make_ret(Err::NoError, filePath);
+    return true;
 }
 
 void MscReader::ZipFileReader::close()

src/project/internal/notationproject.cpp

@@ -184,16 +184,16 @@ mu::Ret NotationProject::doLoad(const io::path_t& path, const io::path_t& styleP
     }
 
     MscReader reader(params);
-    Ret openResult = reader.open();
-    if (openResult != make_ret(mu::engraving::Err::NoError)) {
-        return openResult;
+    Ret ret = reader.open();
+    if (!ret) {
+        return ret;
     }
 
     // Load engraving project
     m_engravingProject->setFileInfoProvider(std::make_shared<ProjectFileInfoProvider>(this));
 
     SettingsCompat settingsCompat;
-    Ret ret = m_engravingProject->loadMscz(reader, settingsCompat, forceMode);
+    ret = m_engravingProject->loadMscz(reader, settingsCompat, forceMode);
     if (!ret) {
         return ret;
     }

src/project/internal/projectactionscontroller.cpp

@@ -238,7 +238,7 @@ RetVal<INotationProjectPtr> ProjectActionsController::loadProject(const io::path
             return ret;
         }
 
-        if (checkCanIgnoreError(ret, io::filename(loadPath).toString())) {
+        if (checkCanIgnoreError(ret, loadPath)) {
             ret = project->load(loadPath, "" /*stylePath*/, true /*forceMode*/, format);
         }
 
@@ -1375,7 +1375,7 @@ void ProjectActionsController::showScoreDownloadError(const Ret& ret)
     interactive()->warning(title, message);
 }
 
-bool ProjectActionsController::checkCanIgnoreError(const Ret& ret, const String& projectName)
+bool ProjectActionsController::checkCanIgnoreError(const Ret& ret, const io::path_t& filepath)
 {
     if (ret) {
         return true;
@@ -1387,11 +1387,16 @@ bool ProjectActionsController::checkCanIgnoreError(const Ret& ret, const String&
     case engraving::Err::FileOld300Format:
         return askIfUserAgreesToOpenProjectWithIncompatibleVersion(ret.text());
     case engraving::Err::FileCorrupted:
-        return askIfUserAgreesToOpenCorruptedProject(projectName, ret.text());
-    default:
-        warnProjectCannotBeOpened(projectName, ret.text());
+        return askIfUserAgreesToOpenCorruptedProject(io::filename(filepath).toString(), ret.text());
+    case engraving::Err::FileCriticallyCorrupted:
+        warnProjectCriticallyCorrupted(io::filename(filepath).toString(), ret.text());
         return false;
+    default:
+        break;
     }
+
+    warnProjectCannotBeOpened(ret, filepath);
+    return false;
 }
 
 bool ProjectActionsController::askIfUserAgreesToOpenProjectWithIncompatibleVersion(const std::string& errorText)
@@ -1421,7 +1426,7 @@ bool ProjectActionsController::askIfUserAgreesToOpenCorruptedProject(const Strin
     return btn == openAnywayBtn.btn;
 }
 
-void ProjectActionsController::warnProjectCannotBeOpened(const String& projectName, const std::string& errorText)
+void ProjectActionsController::warnProjectCriticallyCorrupted(const String& projectName, const std::string& errorText)
 {
     std::string title = mtrc("project", "File “%1” is corrupted and cannot be opened").arg(projectName).toStdString();
     std::string body = trc("project", "Get help for this issue on musescore.org.");
@@ -1438,6 +1443,29 @@ void ProjectActionsController::warnProjectCannotBeOpened(const String& projectNa
     }
 }
 
+void ProjectActionsController::warnProjectCannotBeOpened(const Ret& ret, const io::path_t& filepath)
+{
+    std::string title = mtrc("project", "Cannot read file %1").arg(filepath.toString()).toStdString();
+    std::string body;
+
+    switch (ret.code()) {
+    case int(engraving::Err::FileNotFound):
+        body = trc("project", "This file does not exist or cannot be accessed currently.");
+        break;
+    case int(engraving::Err::FileOpenError):
+        body = trc("project", "This file could not be opened. Please make sure that MuseScore has permission to read this file.");
+        break;
+    default:
+        if (!ret.text().empty()) {
+            body = ret.text();
+        } else {
+            body = trc("project", "An error occurred while reading this file.");
+        }
+    }
+
+    interactive()->error(title, body);
+}
+
 void ProjectActionsController::importPdf()
 {
     interactive()->openUrl("https://musescore.com/import");

src/project/internal/projectactionscontroller.h

@@ -103,10 +103,11 @@ class ProjectActionsController : public IProjectFilesController, public QObject,
 
     void showScoreDownloadError(const Ret& ret);
 
-    bool checkCanIgnoreError(const Ret& ret, const String& projectName);
+    bool checkCanIgnoreError(const Ret& ret, const io::path_t& filepath);
     bool askIfUserAgreesToOpenProjectWithIncompatibleVersion(const std::string& errorText);
     bool askIfUserAgreesToOpenCorruptedProject(const String& projectName, const std::string& errorText);
-    void warnProjectCannotBeOpened(const String& projectName, const std::string& errorText);
+    void warnProjectCriticallyCorrupted(const String& projectName, const std::string& errorText);
+    void warnProjectCannotBeOpened(const Ret& ret, const io::path_t& filepath);
 
     framework::IInteractive::Button askAboutSavingScore(INotationProjectPtr project);