Removed some explicit unwraps

Add more emojis in logs Fix a stupid crash in b1 Disabled migration from super old old Aerial versions
JohnCoates · Jul 4, 2023 · 24b0ab5 · 24b0ab5
1 parent f5a42f7
commit 24b0ab5
Show file tree

Hide file tree

Showing 8 changed files with 181 additions and 257 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -3241,15 +3241,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3.2.7beta0c;
+				CURRENT_PROJECT_VERSION = 3.2.7beta2;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Old stuff/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 3.2.7beta0c;
+				MARKETING_VERSION = 3.2.7beta2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3270,15 +3270,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3.2.7beta0c;
+				CURRENT_PROJECT_VERSION = 3.2.7beta2;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Old stuff/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 3.2.7beta0c;
+				MARKETING_VERSION = 3.2.7beta2;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Aerial/Source/Models/AerialVideo.swift b/Aerial/Source/Models/AerialVideo.swift
@@ -54,15 +54,17 @@ final class AerialVideo: CustomStringConvertible, Equatable {
             return getURL(string: urls[wanted]!)
         } else {
             // Fallback
-            if urls[.v4KHEVC] != "" {
+            if urls.keys.contains(.v4KHEVC), urls[.v4KHEVC] != "" {
                 return getURL(string: urls[.v4KHEVC]!)
-            } else if urls[.v4KSDR240] != "" {  // macOS manifest only have those
+            } else if urls.keys.contains(.v4KSDR240), urls[.v4KSDR240] != "" {
+                // macOS manifest only have those
                 return getURL(string: urls[.v4KSDR240]!)
-            } else if urls[.v1080pHEVC] != "" {
+            } else if urls.keys.contains(.v1080pHEVC), urls[.v1080pHEVC] != "" {
                 return getURL(string: urls[.v1080pHEVC]!)
-            } else if urls[.v1080pH264] != "" { // Last resort
+            } else if urls.keys.contains(.v1080pH264), urls[.v1080pH264] != "" { // Last resort
                 return getURL(string: urls[.v1080pH264]!)
             } else {
+                errorLog("getClosestAvailable failed back hard to 4KHDR")
                 // Something went very wrong if we are here
                 return getURL(string: urls[.v4KHDR]!)
             }

diff --git a/Aerial/Source/Models/Cache/Cache.swift b/Aerial/Source/Models/Cache/Cache.swift
@@ -382,7 +382,10 @@ struct Cache {
 
             // let pathURL = URL(fileURLWithPath: path)
             do {
-                pathUrl.startAccessingSecurityScopedResource()
+                guard pathUrl.startAccessingSecurityScopedResource() else {
+                    errorLog("removeCruft couldn't access scoped resouce")
+                    return
+                }
 
                 let directoryContent = try FileManager.default.contentsOfDirectory(at: pathUrl, includingPropertiesForKeys: nil)
                 debugLog("count : \(directoryContent.count)")

diff --git a/Aerial/Source/Models/ErrorLog.swift b/Aerial/Source/Models/ErrorLog.swift
@@ -196,5 +196,5 @@ func warnLog(_ message: String) {
 }
 
 func errorLog(_ message: String) {
-    Log(level: .error, message: message)
+    Log(level: .error, message: "🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨 " + message)
 }
diff --git a/Aerial/Source/Models/Sources/SourceList.swift b/Aerial/Source/Models/Sources/SourceList.swift
@@ -17,7 +17,7 @@ struct SourceHeader {
 struct SourceList {
     // This is the current one until next fall
     static let macOS14 = Source(name: "macOS 14b1",
-                        description: "High framerate lock screen videos from macOS 14 Sonoma",
+                        description: "High framerate videos from macOS 14 Sonoma",
                         manifestUrl: "https://sylvan.apple.com/itunes-assets/Aerials126/v4/82/2e/34/822e344c-f5d2-878c-3d56-508d5b09ed61/resources-14-0.tar",
                         type: .tvOS12,
                         scenes: [.nature, .city, .space, .sea],