[macos] Pull BlobEntrys out of BlobGlobalState

Now `BlobGlobalState` has a single `uploadProgress` field. Can probably be simplified further, but this is fine for now.
atulsmadhugiri · Oct 7, 2023 · 6d6f50b · 6d6f50b
1 parent e932ab3
commit 6d6f50b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/macos/plop/AppDelegate.swift b/macos/plop/AppDelegate.swift
@@ -81,7 +81,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
       let (destinationURL, uploadTask, localPath) = uploadBlob(filepath: filepath)
 
       uploadTask.observe(.progress) { snapshot in
-        self.blobGlobalState.blobEntries.last?.uploadProgress =
+        self.blobGlobalState.uploadProgress =
           snapshot.progress?.fractionCompleted ?? 0
       }
 
@@ -106,7 +106,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             filepath: filepath.path)
 
           uploadTask.observe(.progress) { snapshot in
-            self.blobGlobalState.blobEntries.last?.uploadProgress =
+            self.blobGlobalState.uploadProgress =
               snapshot.progress?.fractionCompleted ?? 0
           }
 

diff --git a/macos/plop/BlobGlobalState.swift b/macos/plop/BlobGlobalState.swift
@@ -5,7 +5,6 @@ import SwiftData
 
 @Model final class BlobEntry: Identifiable {
   var id = UUID()
-  var uploadProgress: Double = 1.0
   var uploadURL: String = ""
   var uploadLocalPath: URL? = nil
   var fileSize: String? = nil
@@ -18,7 +17,6 @@ import SwiftData
     uploadLocalPath: URL? = nil
   ) {
     self.id = id
-    self.uploadProgress = 1.0
     self.uploadURL = uploadURL
     self.uploadLocalPath = uploadLocalPath
 
@@ -37,5 +35,5 @@ import SwiftData
 }
 
 @Observable final class BlobGlobalState {
-  var blobEntries: [BlobEntry] = []
+  var uploadProgress: Double = 1.0
 }
diff --git a/macos/plop/BlobPopover.swift b/macos/plop/BlobPopover.swift
@@ -8,12 +8,9 @@ struct BlobPopover: View {
   var body: some View {
     VStack {
       HStack {
-        ScreenshotButton(
-          uploadProgress: $blobGlobalState.blobEntries.last?.uploadProgress ?? .constant(0.0))
+        ScreenshotButton(uploadProgress: $blobGlobalState.uploadProgress)
         RecordButton()
-        UploadButton(
-          previousUploadURL: $blobGlobalState.blobEntries.last?.uploadURL ?? .constant(""),
-          uploadProgress: $blobGlobalState.blobEntries.last?.uploadProgress ?? .constant(0.0))
+        UploadButton(uploadProgress: $blobGlobalState.uploadProgress)
       }
 
       Divider()
@@ -22,7 +19,7 @@ struct BlobPopover: View {
         previousUploadLocalPath: entries.last?.uploadLocalPath ?? URL(string: ""))
 
       UploadProgressView(
-        uploadProgress: $blobGlobalState.blobEntries.last?.uploadProgress ?? .constant(0.0))
+        uploadProgress: $blobGlobalState.uploadProgress)
 
       HStack {
         TextField("", text: .constant(entries.last?.uploadURL ?? "")).frame(

diff --git a/macos/plop/UploadButton.swift b/macos/plop/UploadButton.swift
@@ -1,7 +1,6 @@
 import SwiftUI
 
 struct UploadButton: View {
-  @Binding var previousUploadURL: String
   @Binding var uploadProgress: Double
 
   @State private var fileSelectionDialogPresented = false
@@ -26,7 +25,6 @@ struct UploadButton: View {
         uploadTask.observe(.success) { _ in
           NSSound(named: "Funk")?.play()
           replaceClipboard(with: destinationURL)
-          previousUploadURL = destinationURL
         }
       } catch {
         print("Could not get filepath for selected file.")
@@ -37,6 +35,6 @@ struct UploadButton: View {
 
 struct UploadButton_Previews: PreviewProvider {
   static var previews: some View {
-    UploadButton(previousUploadURL: .constant("https://google.com"), uploadProgress: .constant(1.0))
+    UploadButton(uploadProgress: .constant(1.0))
   }
 }