Hidden verbose flag

acclivity · Mar 18, 2018 · c83c922 · c83c922
1 parent b46315d
commit c83c922
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/generate_appcast/Appcast.swift b/generate_appcast/Appcast.swift
@@ -14,10 +14,10 @@ func makeError(code: SUError, _ description: String) -> NSError {
         ]);
 }
 
-func makeAppcast(archivesSourceDir: URL, privateKey: SecKey) throws -> [String:[ArchiveItem]] {
+func makeAppcast(archivesSourceDir: URL, privateKey: SecKey, verbose: Bool) throws -> [String:[ArchiveItem]] {
     let comparator = SUStandardVersionComparator();
 
-    let allUpdates = (try unarchiveUpdates(archivesSourceDir: archivesSourceDir))
+    let allUpdates = (try unarchiveUpdates(archivesSourceDir: archivesSourceDir, verbose:verbose))
         .sorted(by: {
             .orderedDescending == comparator.compareVersion($0.version, toVersion:$1.version)
         })

diff --git a/generate_appcast/Unarchive.swift b/generate_appcast/Unarchive.swift
@@ -39,8 +39,11 @@ func unarchive(itemPath:URL, archiveDestDir: URL, callback: @escaping (Error?) -
     }
 }
 
-func unarchiveUpdates(archivesSourceDir: URL) throws -> [ArchiveItem] {
+func unarchiveUpdates(archivesSourceDir: URL, verbose: Bool) throws -> [ArchiveItem] {
     let archivesDestDir = archivesSourceDir.appendingPathComponent(".tmp");
+    if verbose {
+        print("Unarchiving to temp directory", archivesDestDir.path);
+    }
 
     let group = DispatchGroup();
 
@@ -60,10 +63,18 @@ func unarchiveUpdates(archivesSourceDir: URL) throws -> [ArchiveItem] {
         }
 
         let addItem = {
-            if let item = try? ArchiveItem(fromArchive: itemPath, unarchivedDir: archiveDestDir) {
+            do {
+                let item = try ArchiveItem(fromArchive: itemPath, unarchivedDir: archiveDestDir);
+                if verbose {
+                    print("Found archive", item);
+                }
                 objc_sync_enter(unarchived);
                 unarchived.append(item);
                 objc_sync_exit(unarchived);
+            } catch {
+                if verbose {
+                    print("Skipped", item, error);
+                }
             }
         }
 

diff --git a/generate_appcast/main.swift b/generate_appcast/main.swift
@@ -8,6 +8,8 @@
 
 import Foundation
 
+var verbose = false;
+
 func main() {
     let args = CommandLine.arguments;
     if args.count < 3 {
@@ -26,7 +28,7 @@ func main() {
     do {
         let privateKey = try loadPrivateKey(privateKeyPath: privateKeyPath);
         do {
-            let allUpdates = try makeAppcast(archivesSourceDir: archivesSourceDir, privateKey: privateKey);
+            let allUpdates = try makeAppcast(archivesSourceDir: archivesSourceDir, privateKey: privateKey, verbose:verbose);
 
             for (appcastFile, updates) in allUpdates {
                 let appcastDestPath = URL(fileURLWithPath: appcastFile, relativeTo: archivesSourceDir);