changing Seed preference now reloads catalog

scriptingosx · scriptingosx · commit fcc3133b378e · 2021-06-16T14:24:19.000+02:00
diff --git a/FetchInstallerPkg.xcodeproj/project.pbxproj b/FetchInstallerPkg.xcodeproj/project.pbxproj
@@ -105,12 +105,12 @@
 			isa = PBXGroup;
 			children = (
 				C636436F2670E1F700301DC8 /* SUCatalog.swift */,
+				C69C80D126788B8D00E20E20 /* Catalog.swift */,
+				C69C80CD26788B1400E20E20 /* Product.swift */,
 				C69C80D726788BC900E20E20 /* BuildManifest.swift */,
 				C69C80D526788BB600E20E20 /* MetaInfo.swift */,
 				C69C80D326788BA100E20E20 /* Package.swift */,
-				C69C80D126788B8D00E20E20 /* Catalog.swift */,
 				C69C80CF26788B6B00E20E20 /* DistParserDelegate.swift */,
-				C69C80CD26788B1400E20E20 /* Product.swift */,
 				C635B0AB26789F5F001EEA82 /* SeedProgram.swift */,
 			);
 			path = Model;
@@ -270,7 +270,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 11.4;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -325,7 +325,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 11.4;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
diff --git a/FetchInstallerPkg/FetchInstallerPkgApp.swift b/FetchInstallerPkg/FetchInstallerPkgApp.swift
@@ -10,13 +10,13 @@ import SwiftUI
 @main
 struct FetchInstallerPkgApp: App {
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
-    
+    @StateObject var sucatalog = SUCatalog()
     var body: some Scene {
         WindowGroup {
-            ContentView()
+            ContentView().environmentObject(sucatalog)
         }
         Settings {
-            PreferencesView()
+            PreferencesView().environmentObject(sucatalog)
         }
     }
 }
diff --git a/FetchInstallerPkg/Model/SUCatalog.swift b/FetchInstallerPkg/Model/SUCatalog.swift
@@ -20,7 +20,7 @@ class SUCatalog: ObservableObject {
         load()
     }
     
-    private func load() {
+    func load() {
         let catalogURL = catalogURL(for: Prefs.seedProgram)
         print(catalogURL.absoluteString)
         
@@ -48,6 +48,7 @@ class SUCatalog: ObservableObject {
         isLoading = true
         hasLoaded = false
         self.catalog = nil
+        self.installers = [Product]()
         task.resume()
     }
     
diff --git a/FetchInstallerPkg/View/ContentView.swift b/FetchInstallerPkg/View/ContentView.swift
@@ -9,15 +9,16 @@ import SwiftUI
 
 
 struct ContentView: View {
-    @StateObject var catalog = SUCatalog()
+    @EnvironmentObject var sucatalog: SUCatalog
+    @AppStorage(Prefs.key(.seedProgram)) var seedProgram: String = ""
     
     var body: some View {
         VStack(alignment: .leading){
             Text("Download Full Installer")
                 .font(.title)
                 .multilineTextAlignment(.leading)
             
-            List(catalog.installers, id: \.id) { installer in
+            List(sucatalog.installers, id: \.id) { installer in
                 InstallerView(product: installer)
             }.padding(4)
             DownloadView()
diff --git a/FetchInstallerPkg/View/DownloadView.swift b/FetchInstallerPkg/View/DownloadView.swift
@@ -15,16 +15,16 @@ struct DownloadView: View {
             VStack(alignment: .leading) {
                 HStack {
                     Text("Downloading:")
+                    Text(downloadManager.progressString)
+                        .font(.footnote)
+                        .lineLimit(1)
+                        .truncationMode(.middle)
                 }
-                Text(downloadManager.progressString)
-                    .font(.footnote)
-                    .lineLimit(1)
-                    .truncationMode(.middle)
                 HStack {
                     ProgressView(value: downloadManager.progress)
                     Button(action: {downloadManager.cancel()}) {
                         Image(systemName: "xmark.circle.fill").accentColor(.gray)
-                    }
+                    }.buttonStyle(.borderless)
                 }
                 
             }
diff --git a/FetchInstallerPkg/View/InstallerView.swift b/FetchInstallerPkg/View/InstallerView.swift
@@ -19,26 +19,34 @@ struct InstallerView: View {
                     .resizable(resizingMode: .stretch)
                     .aspectRatio(contentMode: .fit)
                     .foregroundColor(Color.blue)
-                    .frame(width: 40.0, height: 40.0)
+                    .frame(width: 50.0, height: 40.0)
                 VStack(alignment: .leading) {
                     HStack {
-                        Text(product.title ?? "<no title>").font(.headline)
+                        Text(product.title ?? "<no title>")
+                            .font(.headline)
+                        Spacer()
                         Text(product.productVersion ?? "<no version>")
-                            .multilineTextAlignment(.leading)
-                            .frame(width: 60.0)
-                        Text(product.buildVersion ?? "<no build>")
+                            .frame(alignment: .trailing)
                     }
                     HStack {
                         Text(product.postDate, style: .date)
                             .font(.footnote)
+                        Spacer()
+                        Text(product.buildVersion ?? "<no build>")
+                            .frame(alignment: .trailing)
+                            .font(.footnote)
                     }
                 }
-                Spacer()
+                
+                
                 Button(action: {
                     DownloadManager.shared.download(url: product.installAssistantURL)
                 }) {
-                    Image(systemName: "arrow.down.circle")
-                }.disabled(downloadManager.isDownloading)
+                    Image(systemName: "arrow.down.circle").font(.title)
+                }
+                .disabled(downloadManager.isDownloading)
+                .buttonStyle(.borderless)
+                .controlSize(/*@START_MENU_TOKEN@*/.large/*@END_MENU_TOKEN@*/)
             }
         }
     }
diff --git a/FetchInstallerPkg/View/PreferencesView.swift b/FetchInstallerPkg/View/PreferencesView.swift
@@ -10,6 +10,7 @@ import SwiftUI
 struct PreferencesView: View {
     @AppStorage(Prefs.key(.seedProgram)) var seedProgram: String = ""
     @AppStorage(Prefs.key(.downloadPath)) var downloadPath: String = ""
+    @EnvironmentObject var sucatalog: SUCatalog
     
     let labelWidth = 100.0
     var body: some View {
@@ -21,6 +22,10 @@ struct PreferencesView: View {
                             Text(program.rawValue)
                         }
                     }
+                    .onChange(of: seedProgram) { _ in
+                        sucatalog.load()
+                    }
+
                 }
                 HStack {
                     Text("Download to:")

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@ import SwiftUI`
`10`	`10`	`@main`
`11`	`11`	`struct FetchInstallerPkgApp: App {`
`12`	`12`	`@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate`
`13`		`-`
	`13`	`+ @StateObject var sucatalog = SUCatalog()`
`14`	`14`	`var body: some Scene {`
`15`	`15`	`WindowGroup {`
`16`		`- ContentView()`
	`16`	`+ ContentView().environmentObject(sucatalog)`
`17`	`17`	`}`
`18`	`18`	`Settings {`
`19`		`- PreferencesView()`
	`19`	`+ PreferencesView().environmentObject(sucatalog)`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class SUCatalog: ObservableObject {`
`20`	`20`	`load()`
`21`	`21`	`}`
`22`	`22`
`23`		`- private func load() {`
	`23`	`+ func load() {`
`24`	`24`	`let catalogURL = catalogURL(for: Prefs.seedProgram)`
`25`	`25`	`print(catalogURL.absoluteString)`
`26`	`26`
`@@ -48,6 +48,7 @@ class SUCatalog: ObservableObject {`
`48`	`48`	`isLoading = true`
`49`	`49`	`hasLoaded = false`
`50`	`50`	`self.catalog = nil`
	`51`	`+ self.installers = [Product]()`
`51`	`52`	`task.resume()`
`52`	`53`	`}`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import SwiftUI`
`10`	`10`	`struct PreferencesView: View {`
`11`	`11`	`@AppStorage(Prefs.key(.seedProgram)) var seedProgram: String = ""`
`12`	`12`	`@AppStorage(Prefs.key(.downloadPath)) var downloadPath: String = ""`
	`13`	`+ @EnvironmentObject var sucatalog: SUCatalog`
`13`	`14`
`14`	`15`	`let labelWidth = 100.0`
`15`	`16`	`var body: some View {`
`@@ -21,6 +22,10 @@ struct PreferencesView: View {`
`21`	`22`	`Text(program.rawValue)`
`22`	`23`	`}`
`23`	`24`	`}`
	`25`	`+ .onChange(of: seedProgram) { _ in`
	`26`	`+ sucatalog.load()`
	`27`	`+ }`
	`28`	`+`
`24`	`29`	`}`
`25`	`30`	`HStack {`
`26`	`31`	`Text("Download to:")`