MyPlanetModel savePublic is now async

Planetable · Aug 15, 2023 · 303453f · 303453f
1 parent 663023a
commit 303453f
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 16 deletions.
diff --git a/Planet/Entities/DraftModel.swift b/Planet/Entities/DraftModel.swift
@@ -353,7 +353,7 @@ class DraftModel: Identifiable, Equatable, Hashable, Codable, ObservableObject {
         try planet.save()
 
         Task {
-            try planet.savePublic()
+            try await planet.savePublic()
             try await planet.publish()
         }
 

diff --git a/Planet/Entities/MyPlanetModel.swift b/Planet/Entities/MyPlanetModel.swift
@@ -980,7 +980,7 @@ class MyPlanetModel: Equatable, Hashable, Identifiable, ObservableObject, Codabl
 
         Task {
             do {
-                try planet.savePublic()
+                try await planet.savePublic()
             }
             catch {
                 Self.logger.error("Error creating planet public info \(planet.id): \(error)")
@@ -1264,7 +1264,7 @@ class MyPlanetModel: Equatable, Hashable, Identifiable, ObservableObject, Codabl
         }
     }
 
-    func savePublic() throws {
+    func savePublic() async throws {
         guard let template = template else {
             throw PlanetError.MissingTemplateError
         }
@@ -1687,7 +1687,7 @@ class MyPlanetModel: Equatable, Hashable, Identifiable, ObservableObject, Codabl
                 debugPrint("failed to save ops to file: \(error)")
             }
         }
-        try self.savePublic()
+        try await self.savePublic()
         NotificationCenter.default.post(name: .loadArticle, object: nil)
         Task { @MainActor in
             NotificationCenter.default.post(name: .publishMyPlanet, object: self)

diff --git a/Planet/Entities/PlanetStore.swift b/Planet/Entities/PlanetStore.swift
@@ -461,7 +461,7 @@ enum PlanetDetailViewType: Hashable, Equatable {
         try toPlanet.save()
 
         debugPrint("target planet save public")
-        try toPlanet.savePublic()
+        try await toPlanet.savePublic()
 
         debugPrint("update from planet update date")
         fromPlanet.updated = Date()
@@ -470,7 +470,7 @@ enum PlanetDetailViewType: Hashable, Equatable {
         try fromPlanet.save()
 
         debugPrint("from planet save public")
-        try fromPlanet.savePublic()
+        try await fromPlanet.savePublic()
 
         debugPrint("refresh planet store")
         let refreshedFromPlanet = try MyPlanetModel.load(from: fromPlanet.basePath)

diff --git a/Planet/PlanetAPI.swift b/Planet/PlanetAPI.swift
@@ -223,7 +223,7 @@ extension PlanetAPI {
                     try planet.uploadAvatar(image: planetAvatarImage)
                 }
                 try planet.save()
-                try planet.savePublic()
+                try await planet.savePublic()
                 PlanetStore.shared.myPlanets.insert(planet, at: 0)
                 PlanetStore.shared.selectedView = .myPlanet(planet)
             } catch {
@@ -283,7 +283,7 @@ extension PlanetAPI {
                 try planet.save()
                 try planet.copyTemplateAssets()
                 try planet.articles.forEach { try $0.savePublic() }
-                try planet.savePublic()
+                try await planet.savePublic()
                 NotificationCenter.default.post(name: .loadArticle, object: nil)
                 try await planet.publish()
             } catch {
@@ -497,7 +497,9 @@ extension PlanetAPI {
                         planet.updated = Date()
                         do {
                             try planet.save()
-                            try planet.savePublic()
+                            Task {
+                                try await planet.savePublic()
+                            }
                             if PlanetStore.shared.selectedArticle == article {
                                 PlanetStore.shared.selectedArticle = nil
                             }

diff --git a/Planet/Views/Create & Follow Planet/CreatePlanetView.swift b/Planet/Views/Create & Follow Planet/CreatePlanetView.swift
@@ -110,7 +110,7 @@ struct CreatePlanetView: View {
                             }
                             planetStore.selectedView = .myPlanet(planet)
                             try planet.save()
-                            try planet.savePublic()
+                            try await planet.savePublic()
                         } catch {
                             PlanetStore.shared.alert(title: "Failed to create planet")
                         }

diff --git a/Planet/Views/My/MyArticleItemView.swift b/Planet/Views/My/MyArticleItemView.swift
@@ -150,7 +150,7 @@ struct MyArticleItemView: View {
                         planet.updated = Date()
                         Task {
                             try planet.save()
-                            try planet.savePublic()
+                            try await planet.savePublic()
                         }
                         if PlanetStore.shared.selectedArticle == article {
                             PlanetStore.shared.selectedArticle = nil

diff --git a/Planet/Views/My/MyArticleSettingsView.swift b/Planet/Views/My/MyArticleSettingsView.swift
@@ -206,8 +206,8 @@ struct MyArticleSettingsView: View {
                                 try planet.copyTemplateAssets()
                                 planet.updated = Date()
                                 try planet.save()
-                                try planet.savePublic()
-                                Task {
+                                Task(priority: .background) {
+                                    try await planet.savePublic()
                                     try await planet.publish()
                                 }
                             }

diff --git a/Planet/Views/My/MyPlanetCustomCodeView.swift b/Planet/Views/My/MyPlanetCustomCodeView.swift
@@ -207,7 +207,7 @@ struct MyPlanetCustomCodeView: View {
                             try planet.save()
                             try planet.copyTemplateAssets()
                             try planet.articles.forEach { try $0.savePublic() }
-                            try planet.savePublic()
+                            try await planet.savePublic()
                             NotificationCenter.default.post(name: .loadArticle, object: nil)
                             try await planet.publish()
                         }

diff --git a/Planet/Views/My/MyPlanetPodcastSettingsView.swift b/Planet/Views/My/MyPlanetPodcastSettingsView.swift
@@ -149,7 +149,7 @@ struct MyPlanetPodcastSettingsView: View {
                             try planet.save()
                             try planet.copyTemplateAssets()
                             try planet.articles.forEach { try $0.savePublic() }
-                            try planet.savePublic()
+                            try await planet.savePublic()
                             NotificationCenter.default.post(name: .loadArticle, object: nil)
                             try await planet.publish()
                         }

diff --git a/Planet/versioning.xcconfig b/Planet/versioning.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 1551
+CURRENT_PROJECT_VERSION = 1556