Recommend unique filename for new/default score

src/project/internal/notationproject.cpp

@@ -74,7 +74,7 @@ static void setupScoreMetaTags(mu::engraving::MasterScore* masterScore, const Pr
     }
 }
 
-static QString scoreDefaultTitle()
+QString NotationProject::scoreDefaultTitle()
 {
     return qtrc("project", "Untitled score");
 }

src/project/internal/notationproject.h

@@ -58,6 +58,8 @@ class NotationProject : public INotationProject, public async::Asyncable
 public:
     ~NotationProject() override;
 
+    static QString scoreDefaultTitle();
+
     Ret load(const io::path_t& path, const io::path_t& stylePath = io::path_t(), bool forceMode = false,
              const std::string& format = "") override;
     Ret createNew(const ProjectCreateOptions& projectInfo) override;

src/project/internal/projectconfiguration.cpp

@@ -29,6 +29,7 @@
 #include "settings.h"
 
 #include "engraving/infrastructure/mscio.h"
+#include "project/internal/notationproject.h"
 
 #include "log.h"
 
@@ -288,6 +289,7 @@ io::path_t ProjectConfiguration::defaultSavingFilePath(INotationProjectPtr proje
     io::path_t folderPath;
     io::path_t filename;
     std::string theSuffix = suffix;
+    std::string theFilenameAddition = filenameAddition;
 
     io::path_t projectPath = project->path();
     bool isLocalProject = !project->isCloudProject();
@@ -334,11 +336,31 @@ io::path_t ProjectConfiguration::defaultSavingFilePath(INotationProjectPtr proje
         theSuffix = DEFAULT_FILE_SUFFIX;
     }
 
+    if (project->isNewlyCreated() && filename.toQString() == NotationProject::scoreDefaultTitle()) {
+        theFilenameAddition += uniqueFileNameAddition(filename + theFilenameAddition, folderPath, theSuffix);
+    }
+
     return folderPath
-           .appendingComponent(filename + filenameAddition)
+           .appendingComponent(filename + theFilenameAddition)
            .appendingSuffix(theSuffix);
 }
 
+std::string ProjectConfiguration::uniqueFileNameAddition(const io::path_t& filename, const io::path_t& folderPath,
+                                                         const std::string& suffix) const
+{
+    // Return a filename addition which would make filename unique if it wasn't already
+    const std::string theSuffix = suffix.empty() ? DEFAULT_FILE_SUFFIX : suffix;
+    std::string addition;
+    int id = 1;
+    while (fileSystem()->exists(folderPath
+                                .appendingComponent(filename + addition)
+                                .appendingSuffix(theSuffix))) {
+        addition = " (" + std::to_string(id) + ")";
+        id++;
+    }
+    return addition;
+}
+
 SaveLocationType ProjectConfiguration::lastUsedSaveLocationType() const
 {
     return settings()->value(LAST_USED_SAVE_LOCATION_TYPE).toEnum<SaveLocationType>();

src/project/internal/projectconfiguration.h

@@ -156,6 +156,7 @@ class ProjectConfiguration : public IProjectConfiguration
     io::path_t appTemplatesPath() const;
     io::path_t legacyCloudProjectsPath() const;
     io::path_t cloudProjectsPath() const;
+    std::string uniqueFileNameAddition(const io::path_t& filename, const io::path_t& folderPath, const std::string& suffix) const;
 
     async::Channel<io::path_t> m_userTemplatesPathChanged;
     async::Channel<io::path_t> m_userScoresPathChanged;