Fixes the recovery for cloud projects

crsib · Dec 15, 2023 · ca7df92 · ca7df92
1 parent dc66ed5
commit ca7df92
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 17 deletions.
diff --git a/libraries/lib-cloud-audiocom/CloudSettings.cpp b/libraries/lib-cloud-audiocom/CloudSettings.cpp
@@ -13,11 +13,17 @@
 #include "CloudSettings.h"
 
 #include "FileNames.h"
+#include "wxFileNameWrapper.h"
 
 namespace cloud::audiocom
 {
-StringSetting CloudProjectsSavePath { "/cloud/audiocom/CloudProjectsSavePath",
-                                      [] {
-                                         return FileNames::DataDir() + "/cloud";
-                                      } };
+StringSetting CloudProjectsSavePath {
+   "/cloud/audiocom/CloudProjectsSavePath",
+   []
+   {
+      wxFileNameWrapper path { FileNames::DataDir(), "" };
+      path.AppendDir("CloudProjects");
+      return path.GetPath();
+   }
+};
 } // namespace cloud::audiocom
diff --git a/libraries/lib-cloud-audiocom/CloudSyncService.cpp b/libraries/lib-cloud-audiocom/CloudSyncService.cpp
@@ -18,6 +18,7 @@
 #include "sync/CloudProjectSnapshot.h"
 #include "sync/ProjectCloudExtension.h"
 #include "sync/CloudSyncUI.h"
+#include "sync/CloudSyncUtils.h"
 
 #include "CodeConversions.h"
 
@@ -31,6 +32,7 @@
 #include "FileNames.h"
 
 #include <wx/log.h>
+#include "wxFileNameWrapper.h"
 
 
 namespace cloud::audiocom
@@ -74,18 +76,7 @@ bool CloudSyncService::OnSave(AudacityProject& project, bool fromTempProject)
 
    project.SetProjectName(audacity::ToWXString(result.Title));
 
-   wxString filePath;
-   bool available = false;
-
-   auto potentialFileId =
-      std::chrono::system_clock::now().time_since_epoch().count();
-
-   while (!available)
-   {
-      filePath = wxString::Format("%s/%lld.aup3", dir, potentialFileId);
-      available = !wxFileName::FileExists(filePath);
-      ++potentialFileId;
-   }
+   const wxString filePath = sync::MakeSafeProjectPath(dir, audacity::ToWXString(result.Title));
 
    return ProjectFileIO::Get(project).SaveProject(filePath, nullptr);
 }

diff --git a/libraries/lib-cloud-audiocom/sync/CloudProjectSnapshot.cpp b/libraries/lib-cloud-audiocom/sync/CloudProjectSnapshot.cpp
@@ -417,7 +417,7 @@ void CloudProjectSnapshot::OnSnapshotCreated(
                   if (completed)
                   {
                      mCompleted.store(true, std::memory_order_release);
-                     mProjectCloudExtension.OnSyncCompleted(succeeded);
+                     mProjectCloudExtension.OnSyncCompleted(false);
                   }
                });
          }

diff --git a/libraries/lib-cloud-audiocom/sync/CloudSyncUtils.cpp b/libraries/lib-cloud-audiocom/sync/CloudSyncUtils.cpp
@@ -12,6 +12,7 @@
 
 #include <numeric>
 #include <set>
+#include <unordered_set>
 
 #include <rapidjson/document.h>
 #include <rapidjson/writer.h>
@@ -20,6 +21,8 @@
 
 #include <algorithm>
 
+#include "wxFileNameWrapper.h"
+
 namespace cloud::audiocom::sync
 {
 
@@ -230,4 +233,37 @@ DeserializeProjectResponse(const std::string& data)
    return result;
 }
 
+namespace
+{
+wxString SafeName (wxString name)
+{
+   static const std::unordered_set<wxChar> invalidChars {
+      L'/', L'\\', L':', L'*', L'?', L'"', L'<', L'>', L'|', L'@', L'&'
+   };
+
+   for (size_t i = 0; i < name.length(); ++i)
+   {
+      if (invalidChars.find(name[i]) != invalidChars.end())
+         name[i] = wxT('_');
+   }
+
+   return name;
+}
+} // namespace
+
+wxString
+MakeSafeProjectPath(const wxString& rootDir, const wxString& projectName)
+{
+   const auto safeName = SafeName(projectName);
+
+   auto path = wxFileNameWrapper { rootDir, safeName, "aup3" };
+
+   int iteration = 0;
+   while (path.FileExists())
+      path.SetName(wxString::Format("%s_%d", safeName, ++iteration));
+
+
+   return path.GetFullPath();
+}
+
 } // namespace cloud::audiocom::sync
diff --git a/libraries/lib-cloud-audiocom/sync/CloudSyncUtils.h b/libraries/lib-cloud-audiocom/sync/CloudSyncUtils.h
@@ -17,6 +17,8 @@
 #include <vector>
 #include <memory>
 
+#include <wx/string.h>
+
 enum class sampleFormat : unsigned;
 class SampleBlock;
 using SampleBlockPtr = std::shared_ptr<SampleBlock>;
@@ -83,4 +85,7 @@ struct ProjectResponse final
 
 std::optional<ProjectResponse> DeserializeProjectResponse(const std::string& data);
 
+wxString
+MakeSafeProjectPath(const wxString& rootDir, const wxString& projectName);
+
 } // namespace cloud::audiocom::sync