Merge pull request #32 from writeas/reload-from-server

AngeloStavrow · web-flow · commit 3751118f6e82 · 2020-09-08T09:15:37.000-04:00
Implement reload-from-server
diff --git a/Shared/Account/AccountLogoutView.swift b/Shared/Account/AccountLogoutView.swift
@@ -7,7 +7,7 @@ struct AccountLogoutView: View {
         VStack {
             Spacer()
             VStack {
-                Text("Logged in as \(model.account.username ?? "Anonymous")")
+                Text("Logged in as \(model.account.username)")
                 Text("on \(model.account.server)")
             }
             Spacer()
diff --git a/Shared/Models/Post.swift b/Shared/Models/Post.swift
@@ -7,10 +7,11 @@ enum PostStatus {
     case published
 }
 
-class Post: Identifiable, ObservableObject {
+class Post: Identifiable, ObservableObject, Hashable {
     @Published var wfPost: WFPost
     @Published var status: PostStatus
     @Published var collection: PostCollection
+    @Published var hasNewerRemoteCopy: Bool = false
 
     let id = UUID()
 
@@ -38,6 +39,16 @@ class Post: Identifiable, ObservableObject {
     }
 }
 
+extension Post {
+    static func == (lhs: Post, rhs: Post) -> Bool {
+        return lhs.id == rhs.id
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+    }
+}
+
 #if DEBUG
 let testPost = Post(
     title: "Test Post Title",
diff --git a/Shared/Models/PostStore.swift b/Shared/Models/PostStore.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WriteFreely
 
 struct PostStore {
     var posts: [Post]
@@ -11,7 +12,55 @@ struct PostStore {
         posts.append(post)
     }
 
-    mutating func purge() {
+    mutating func purgeAllPosts() {
         posts = []
     }
+
+    mutating func update(_ post: Post) {
+        // Find the local copy in the store
+        let localCopy = posts.first(where: { $0.id == post.id })
+
+        // If there's a local copy, update the updatedDate property of its WFPost
+        if let localCopy = localCopy {
+            localCopy.wfPost.updatedDate = Date()
+        } else {
+            print("Error: Local copy not found")
+        }
+    }
+
+    mutating func replace(post: Post, with fetchedPost: WFPost) {
+        // Find the local copy in the store.
+        let localCopy = posts.first(where: { $0.id == post.id })
+
+        // Replace the local copy's wfPost property with the fetched copy.
+        if let localCopy = localCopy {
+            localCopy.wfPost = fetchedPost
+            DispatchQueue.main.async {
+                localCopy.hasNewerRemoteCopy = false
+                localCopy.status = .published
+            }
+        } else {
+            print("Error: Local copy not found")
+        }
+    }
+
+    mutating func updateStore(with fetchedPosts: [Post]) {
+        for fetchedPost in fetchedPosts {
+            // Find the local copy in the store.
+            let localCopy = posts.first(where: { $0.wfPost.postId == fetchedPost.wfPost.postId })
+
+            // If there's a local copy, check which is newer; if not, add the fetched post to the store.
+            if let localCopy = localCopy {
+                // We do not discard the local copy; we simply set the hasNewerRemoteCopy flag accordingly.
+                if let remoteCopyUpdatedDate = fetchedPost.wfPost.updatedDate,
+                   let localCopyUpdatedDate = localCopy.wfPost.updatedDate {
+                    localCopy.hasNewerRemoteCopy = remoteCopyUpdatedDate > localCopyUpdatedDate
+                } else {
+                    print("Error: could not determine which copy of post is newer")
+                }
+            } else {
+                add(fetchedPost)
+            }
+        }
+    }
 }
diff --git a/Shared/Models/WriteFreelyModel.swift b/Shared/Models/WriteFreelyModel.swift
@@ -10,6 +10,7 @@ class WriteFreelyModel: ObservableObject {
     @Published var store = PostStore()
     @Published var collections = CollectionListModel(with: [])
     @Published var isLoggingIn: Bool = false
+    @Published var selectedPost: Post?
 
     private var client: WFClient?
     private let defaults = UserDefaults.standard
@@ -26,6 +27,25 @@ class WriteFreelyModel: ObservableObject {
 
         DispatchQueue.main.async {
             self.account.restoreState()
+            if self.account.isLoggedIn {
+                guard let serverURL = URL(string: self.account.server) else {
+                    print("Server URL not found")
+                    return
+                }
+                guard let token = self.fetchTokenFromKeychain(
+                        username: self.account.username,
+                        server: self.account.server
+                ) else {
+                    print("Could not fetch token from Keychain")
+                    return
+                }
+                self.account.login(WFUser(token: token, username: self.account.username))
+                self.client = WFClient(for: serverURL)
+                self.client?.user = self.account.user
+                self.collections.clearUserCollection()
+                self.fetchUserCollections()
+                self.fetchUserPosts()
+            }
         }
     }
 }
@@ -80,6 +100,15 @@ extension WriteFreelyModel {
             )
         }
     }
+
+    func updateFromServer(post: Post) {
+        guard let loggedInClient = client else { return }
+        guard let postId = post.wfPost.postId else { return }
+        DispatchQueue.main.async {
+            self.selectedPost = post
+        }
+        loggedInClient.getPost(byId: postId, completion: updateFromServerHandler)
+    }
 }
 
 private extension WriteFreelyModel {
@@ -121,7 +150,7 @@ private extension WriteFreelyModel {
                 DispatchQueue.main.async {
                     self.account.logout()
                     self.collections.clearUserCollection()
-                    self.store.purge()
+                    self.store.purgeAllPosts()
                 }
             } catch {
                 print("Something went wrong purging the token from the Keychain.")
@@ -136,7 +165,7 @@ private extension WriteFreelyModel {
                 DispatchQueue.main.async {
                     self.account.logout()
                     self.collections.clearUserCollection()
-                    self.store.purge()
+                    self.store.purgeAllPosts()
                 }
             } catch {
                 print("Something went wrong purging the token from the Keychain.")
@@ -176,6 +205,7 @@ private extension WriteFreelyModel {
     func fetchUserPostsHandler(result: Result<[WFPost], Error>) {
         do {
             let fetchedPosts = try result.get()
+            var fetchedPostsArray: [Post] = []
             for fetchedPost in fetchedPosts {
                 var post: Post
                 if let matchingAlias = fetchedPost.collectionAlias {
@@ -186,9 +216,10 @@ private extension WriteFreelyModel {
                 } else {
                     post = Post(wfPost: fetchedPost)
                 }
-                DispatchQueue.main.async {
-                    self.store.add(post)
-                }
+                fetchedPostsArray.append(post)
+            }
+            DispatchQueue.main.async {
+                self.store.updateStore(with: fetchedPostsArray)
             }
         } catch {
             print(error)
@@ -209,6 +240,18 @@ private extension WriteFreelyModel {
             print(error)
         }
     }
+
+    func updateFromServerHandler(result: Result<WFPost, Error>) {
+        do {
+            let fetchedPost = try result.get()
+            DispatchQueue.main.async {
+                guard let selectedPost = self.selectedPost else { return }
+                self.store.replace(post: selectedPost, with: fetchedPost)
+            }
+        } catch {
+            print(error)
+        }
+    }
 }
 
 private extension WriteFreelyModel {
diff --git a/Shared/PostEditor/PostEditorStatusToolbarView.swift b/Shared/PostEditor/PostEditorStatusToolbarView.swift
@@ -0,0 +1,118 @@
+import SwiftUI
+
+struct PostEditorStatusToolbarView: View {
+    #if os(iOS)
+    @Environment(\.horizontalSizeClass) var horizontalSizeClass
+    #endif
+    @EnvironmentObject var model: WriteFreelyModel
+
+    @ObservedObject var post: Post
+
+    var body: some View {
+        if post.hasNewerRemoteCopy {
+            #if os(iOS)
+            if horizontalSizeClass == .compact {
+                VStack {
+                    PostStatusBadgeView(post: post)
+                    HStack {
+                        Text("⚠️ Newer copy on server. Replace local copy?")
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                        Button(action: {
+                            model.updateFromServer(post: post)
+                        }, label: {
+                            Image(systemName: "square.and.arrow.down")
+                        })
+                    }
+                    .padding(.bottom)
+                }
+                .padding(.top)
+            } else {
+                HStack {
+                    PostStatusBadgeView(post: post)
+                        .padding(.trailing)
+                    Text("⚠️ Newer copy on server. Replace local copy?")
+                        .font(.callout)
+                        .foregroundColor(.secondary)
+                    Button(action: {
+                        model.updateFromServer(post: post)
+                    }, label: {
+                        Image(systemName: "square.and.arrow.down")
+                    })
+                }
+            }
+            #else
+            HStack {
+                PostStatusBadgeView(post: post)
+                    .padding(.trailing)
+                Text("⚠️ Newer copy on server. Replace local copy?")
+                    .font(.callout)
+                    .foregroundColor(.secondary)
+                Button(action: {
+                    model.updateFromServer(post: post)
+                }, label: {
+                    Image(systemName: "square.and.arrow.down")
+                })
+            }
+            #endif
+        } else {
+            PostStatusBadgeView(post: post)
+        }
+    }
+}
+
+struct ToolbarView_LocalPreviews: PreviewProvider {
+    static var previews: some View {
+        let model = WriteFreelyModel()
+        let post = testPost
+        return PostEditorStatusToolbarView(post: post)
+            .environmentObject(model)
+    }
+}
+
+struct ToolbarView_RemotePreviews: PreviewProvider {
+    static var previews: some View {
+        let model = WriteFreelyModel()
+        let newerRemotePost = Post(
+            title: testPost.wfPost.title ?? "",
+            body: testPost.wfPost.body,
+            createdDate: testPost.wfPost.createdDate ?? Date(),
+            status: testPost.status,
+            collection: testPost.collection
+        )
+        newerRemotePost.hasNewerRemoteCopy = true
+        return PostEditorStatusToolbarView(post: newerRemotePost)
+            .environmentObject(model)
+    }
+}
+
+#if os(iOS)
+struct ToolbarView_CompactLocalPreviews: PreviewProvider {
+    static var previews: some View {
+        let model = WriteFreelyModel()
+        let post = testPost
+        return PostEditorStatusToolbarView(post: post)
+            .environmentObject(model)
+            .environment(\.horizontalSizeClass, .compact)
+    }
+}
+#endif
+
+#if os(iOS)
+struct ToolbarView_CompactRemotePreviews: PreviewProvider {
+    static var previews: some View {
+        let model = WriteFreelyModel()
+        let newerRemotePost = Post(
+            title: testPost.wfPost.title ?? "",
+            body: testPost.wfPost.body,
+            createdDate: testPost.wfPost.createdDate ?? Date(),
+            status: testPost.status,
+            collection: testPost.collection
+        )
+        newerRemotePost.hasNewerRemoteCopy = true
+        return PostEditorStatusToolbarView(post: newerRemotePost)
+            .environmentObject(model)
+            .environment(\.horizontalSizeClass, .compact)
+    }
+}
+#endif
diff --git a/Shared/PostEditor/PostEditorView.swift b/Shared/PostEditor/PostEditorView.swift
@@ -29,7 +29,7 @@ struct PostEditorView: View {
         .padding()
         .toolbar {
             ToolbarItem(placement: .status) {
-                PostStatusBadgeView(post: post)
+                PostEditorStatusToolbarView(post: post)
             }
             ToolbarItem(placement: .primaryAction) {
                 Button(action: {
@@ -47,6 +47,13 @@ struct PostEditorView: View {
                 addNewPostToStore()
             }
         })
+        .onDisappear(perform: {
+            if post.status == .edited {
+                DispatchQueue.main.async {
+                    model.store.update(post)
+                }
+            }
+        })
     }
 
     private func checkIfNewPost() {
@@ -68,9 +75,24 @@ struct PostEditorView_NewLocalDraftPreviews: PreviewProvider {
     }
 }
 
-struct PostEditorView_ExistingPostPreviews: PreviewProvider {
+struct PostEditorView_NewerLocalPostPreviews: PreviewProvider {
+    static var previews: some View {
+        return PostEditorView(post: testPost)
+            .environmentObject(WriteFreelyModel())
+    }
+}
+
+struct PostEditorView_NewerRemotePostPreviews: PreviewProvider {
     static var previews: some View {
-        PostEditorView(post: testPostData[0])
+        let newerRemotePost = Post(
+            title: testPost.wfPost.title ?? "",
+            body: testPost.wfPost.body,
+            createdDate: testPost.wfPost.createdDate ?? Date(),
+            status: testPost.status,
+            collection: testPost.collection
+        )
+        newerRemotePost.hasNewerRemoteCopy = true
+        return PostEditorView(post: newerRemotePost)
             .environmentObject(WriteFreelyModel())
     }
 }
diff --git a/Shared/PostList/PostListView.swift b/Shared/PostList/PostListView.swift
diff --git a/WriteFreely-MultiPlatform.xcodeproj/project.pbxproj b/WriteFreely-MultiPlatform.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ struct AccountLogoutView: View {`
`7`	`7`	`VStack {`
`8`	`8`	`Spacer()`
`9`	`9`	`VStack {`
`10`		`- Text("Logged in as \(model.account.username ?? "Anonymous")")`
	`10`	`+ Text("Logged in as \(model.account.username)")`
`11`	`11`	`Text("on \(model.account.server)")`
`12`	`12`	`}`
`13`	`13`	`Spacer()`