From 010869ba43791afbaf69ab9e411d0f1d55d9840b Mon Sep 17 00:00:00 2001 From: Guillaume Louel <37544189+glouel@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:48:13 +0200 Subject: [PATCH] Latest mac manifest --- Aerial.xcodeproj/project.pbxproj | 8 +- .../Models/Downloads/DownloadManager.swift | 2 +- Aerial/Source/Models/Sources/SourceList.swift | 2 +- Aerial/Source/Models/Sources/VideoList.swift | 1 + Resources/MainUI/PanelWindowController.xib | 4 +- Resources/MainUI/VideosViewController.xib | 78 +++++++++---------- 6 files changed, 48 insertions(+), 47 deletions(-) diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj index 0926b8b0..1a2e033c 100644 --- a/Aerial.xcodeproj/project.pbxproj +++ b/Aerial.xcodeproj/project.pbxproj @@ -3241,7 +3241,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 3.2.7beta9; + CURRENT_PROJECT_VERSION = 3.2.7beta10; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3L54M5L5KK; ENABLE_HARDENED_RUNTIME = YES; @@ -3249,7 +3249,7 @@ 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.7beta9; + MARKETING_VERSION = 3.2.7beta10; PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3270,7 +3270,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 3.2.7beta9; + CURRENT_PROJECT_VERSION = 3.2.7beta10; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3L54M5L5KK; ENABLE_HARDENED_RUNTIME = YES; @@ -3278,7 +3278,7 @@ 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.7beta9; + MARKETING_VERSION = 3.2.7beta10; OTHER_CODE_SIGN_FLAGS = "--timestamp"; PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Aerial/Source/Models/Downloads/DownloadManager.swift b/Aerial/Source/Models/Downloads/DownloadManager.swift index aef18876..c9bcbecf 100644 --- a/Aerial/Source/Models/Downloads/DownloadManager.swift +++ b/Aerial/Source/Models/Downloads/DownloadManager.swift @@ -178,7 +178,7 @@ extension DownloadOperation: URLSessionTaskDelegate { } else if folder == "tvOS 12" { FileHelpers.unTar(file: destinationDirectory.appending("/resources.tar"), atPath: destinationDirectory) } else if folder == "macOS 14" { - FileHelpers.unTar(file: destinationDirectory.appending("/resources-14-0-9.tar"), atPath: destinationDirectory) + FileHelpers.unTar(file: destinationDirectory.appending("/resources-14-0-10.tar"), atPath: destinationDirectory) } debugLog("Finished downloading \(task.originalRequest!.url!.absoluteString)") diff --git a/Aerial/Source/Models/Sources/SourceList.swift b/Aerial/Source/Models/Sources/SourceList.swift index a96da377..722205a1 100644 --- a/Aerial/Source/Models/Sources/SourceList.swift +++ b/Aerial/Source/Models/Sources/SourceList.swift @@ -18,7 +18,7 @@ struct SourceList { // This is the current one until next fall static let macOS14 = Source(name: "macOS 14", 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-9.tar", + manifestUrl: "https://sylvan.apple.com/itunes-assets/Aerials126/v4/82/2e/34/822e344c-f5d2-878c-3d56-508d5b09ed61/resources-14-0-10.tar", type: .macOS, scenes: [.nature, .city, .space, .sea], isCachable: true, diff --git a/Aerial/Source/Models/Sources/VideoList.swift b/Aerial/Source/Models/Sources/VideoList.swift index 567fd3f8..72979cbb 100644 --- a/Aerial/Source/Models/Sources/VideoList.swift +++ b/Aerial/Source/Models/Sources/VideoList.swift @@ -34,6 +34,7 @@ class VideoList { var playlistRestrictedTo = "" var playlistHasVerticalVideos = false var playlist = [AerialVideo]() + var playlistForScreen: [String:[AerialVideo]] = [:] var lastPluckedFromPlaylist: AerialVideo? let cacheDownloaded = "Downloaded" diff --git a/Resources/MainUI/PanelWindowController.xib b/Resources/MainUI/PanelWindowController.xib index f199674a..e5016854 100644 --- a/Resources/MainUI/PanelWindowController.xib +++ b/Resources/MainUI/PanelWindowController.xib @@ -1,8 +1,8 @@ - + - + diff --git a/Resources/MainUI/VideosViewController.xib b/Resources/MainUI/VideosViewController.xib index 43139246..4e99187c 100644 --- a/Resources/MainUI/VideosViewController.xib +++ b/Resources/MainUI/VideosViewController.xib @@ -1,9 +1,9 @@ - + - - + + @@ -50,7 +50,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -310,7 +310,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -326,7 +326,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -440,9 +440,9 @@ - + - + @@ -462,7 +462,7 @@ - + @@ -517,7 +517,7 @@ - + @@ -677,7 +677,7 @@ - + @@ -703,7 +703,7 @@ - + @@ -723,7 +723,7 @@ - + @@ -732,7 +732,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -750,7 +750,7 @@ - + @@ -759,7 +759,7 @@ - + @@ -774,7 +774,7 @@ - + @@ -800,7 +800,7 @@ - + @@ -820,7 +820,7 @@ - + @@ -835,7 +835,7 @@ - + @@ -861,7 +861,7 @@ - + @@ -881,7 +881,7 @@ - + @@ -892,7 +892,7 @@ - + @@ -903,7 +903,7 @@ - + @@ -914,7 +914,7 @@ - + @@ -925,7 +925,7 @@ - + @@ -952,7 +952,7 @@ - + @@ -994,7 +994,7 @@ - + @@ -1005,6 +1005,6 @@ - +