Now displays download size

scriptingosx · Jun 22, 2021 · 7fd501c · 7fd501c
1 parent b1c821d
commit 7fd501c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/FetchInstallerPkg.xcodeproj/project.pbxproj b/FetchInstallerPkg.xcodeproj/project.pbxproj
@@ -373,7 +373,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_ASSET_PATHS = "\"FetchInstallerPkg/Preview Content\"";
 				DEVELOPMENT_TEAM = JME5BW3F3R;
 				ENABLE_APP_SANDBOX = YES;
@@ -409,7 +409,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_ASSET_PATHS = "\"FetchInstallerPkg/Preview Content\"";
 				DEVELOPMENT_TEAM = JME5BW3F3R;
 				ENABLE_APP_SANDBOX = YES;

diff --git a/FetchInstallerPkg/Model/Product.swift b/FetchInstallerPkg/Model/Product.swift
@@ -50,13 +50,20 @@ class Product: Codable, Identifiable, ObservableObject {
         return buildManifest?.url
     }
 
+    var installerPackage: Package? {
+        return packages.first { $0.url.hasSuffix("InstallAssistant.pkg")}
+    }
+
     var installAssistantURL: URL? {
-        if let installAssistant = packages.first(where: { $0.url.hasSuffix("InstallAssistant.pkg")}) {
+        if let installAssistant = self.installerPackage {
             return URL(string: installAssistant.url)
         } else {
             return nil
         }
-
+    }
+
+    var installAssistantSize: Int {
+        return self.installerPackage?.size ?? 0
     }
 
     func loadBuildManifest() {

diff --git a/FetchInstallerPkg/Prefs.swift b/FetchInstallerPkg/Prefs.swift
@@ -41,4 +41,6 @@ struct Prefs {
         let downloadURL = URL(fileURLWithPath: self.downloadPath)
         return downloadURL
     }
+
+    static let byteFormatter = ByteCountFormatter()
 }
diff --git a/FetchInstallerPkg/View/DownloadView.swift b/FetchInstallerPkg/View/DownloadView.swift
@@ -38,7 +38,7 @@ struct DownloadView: View {
                 Button(action: {
                     downloadManager.revealInFinder()
                 }) {
-                    Image(systemName: "magnifyingglass.circle")
+                    Image(systemName: "magnifyingglass")
                     Text("Show in Finder")
                 }
             }

diff --git a/FetchInstallerPkg/View/InstallerView.swift b/FetchInstallerPkg/View/InstallerView.swift
@@ -32,6 +32,8 @@ struct InstallerView: View {
                     HStack {
                         Text(product.postDate, style: .date)
                             .font(.footnote)
+                        Text(Prefs.byteFormatter.string(fromByteCount: Int64(product.installAssistantSize)))
+                            .font(.footnote)
                         Spacer()
                         Text(product.buildVersion ?? "<no build>")
                             .frame(alignment: .trailing)