Merge pull request #632 from glouel/feature/1.4.6

Feature/1.4.6
JohnCoates · Nov 9, 2018 · 5ca5025 · 5ca5025
2 parents cf7a05d + a765dde
commit 5ca5025
Show file tree

Hide file tree

Showing 10 changed files with 329 additions and 86 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -25,6 +25,8 @@
 		03510C7121834FC7008F74F2 /* IOBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 03510C6E21834F38008F74F2 /* IOBridge.m */; };
 		03510C732185EF76008F74F2 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03510C722185EF76008F74F2 /* CoreLocation.framework */; };
 		03510C772185EF8F008F74F2 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03510C722185EF76008F74F2 /* CoreLocation.framework */; };
+		0369985D2196103300E359D3 /* missingvideos.json in Resources */ = {isa = PBXBuildFile; fileRef = 0369985C2196103300E359D3 /* missingvideos.json */; };
+		0369985E2196129C00E359D3 /* missingvideos.json in Resources */ = {isa = PBXBuildFile; fileRef = 0369985C2196103300E359D3 /* missingvideos.json */; };
 		03893CB3217749F0008E7125 /* ErrorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03893CB2217749F0008E7125 /* ErrorLog.swift */; };
 		03893CB4217753AC008E7125 /* ErrorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03893CB2217749F0008E7125 /* ErrorLog.swift */; };
 		0393857A2175D4B80040B850 /* AVPlayerViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039385792175D4B80040B850 /* AVPlayerViewExtension.swift */; };
@@ -99,6 +101,7 @@
 		03510C6D21834F38008F74F2 /* Aerial-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Aerial-Bridging-Header.h"; sourceTree = "<group>"; };
 		03510C6E21834F38008F74F2 /* IOBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IOBridge.m; sourceTree = "<group>"; };
 		03510C722185EF76008F74F2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
+		0369985C2196103300E359D3 /* missingvideos.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = missingvideos.json; sourceTree = "<group>"; };
 		03893CB2217749F0008E7125 /* ErrorLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorLog.swift; sourceTree = "<group>"; };
 		039385792175D4B80040B850 /* AVPlayerViewExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerViewExtension.swift; sourceTree = "<group>"; };
 		03958348217F4416008E8F9C /* Solar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Solar.swift; sourceTree = "<group>"; };
@@ -170,6 +173,7 @@
 			isa = PBXGroup;
 			children = (
 				033192E0217B78240073B580 /* en.json */,
+				0369985C2196103300E359D3 /* missingvideos.json */,
 			);
 			path = Community;
 			sourceTree = "<group>";
@@ -460,6 +464,7 @@
 				033192E2217B78240073B580 /* en.json in Resources */,
 				FAC36F541BE1756D007F2A20 /* PreferencesWindow.xib in Resources */,
 				FAC36F4E1BE1756D007F2A20 /* icon-day.pdf in Resources */,
+				0369985E2196129C00E359D3 /* missingvideos.json in Resources */,
 				033D62B0216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */,
 				0395835621807D1F008E8F9C /* thumbnail.png in Resources */,
 				FAC36F481BE1756D007F2A20 /* Assets.xcassets in Resources */,
@@ -489,6 +494,7 @@
 				0395835321807D1F008E8F9C /* thumbnail@2x.png in Resources */,
 				0395835521807D1F008E8F9C /* thumbnail.png in Resources */,
 				033D62AF216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */,
+				0369985D2196103300E359D3 /* missingvideos.json in Resources */,
 				FAC36F4F1BE1756D007F2A20 /* icon-night.pdf in Resources */,
 				033192E1217B78240073B580 /* en.json in Resources */,
 			);

diff --git a/Aerial/App/Resources/Info.plist b/Aerial/App/Resources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.5beta2</string>
+	<string>1.4.6beta1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Aerial/Source/Controllers/Preferences.swift b/Aerial/Source/Controllers/Preferences.swift
@@ -66,6 +66,12 @@ class Preferences {
         case powerSavingOnLowBattery = "powerSavingOnLowBattery"
 
         case darkModeNightOverride = "darkModeNightOverride"
+        case newVideosMode = "newVideosMode"
+        case lastVideoCheck = "lastVideoCheck"
+    }
+
+    enum NewVideosMode: Int {
+        case weekly, monthly, never
     }
 
     enum SolarMode: Int {
@@ -176,6 +182,14 @@ class Preferences {
         defaultValues[.powerSavingOnLowBattery] = false
         defaultValues[.alternateVideoFormat] = AlternateVideoFormat.powerSaving
         defaultValues[.darkModeNightOverride] = false
+        defaultValues[.newVideosMode] = NewVideosMode.weekly
+
+        // Set today's date as default
+        let dateFormatter = DateFormatter()
+        let current = Date()
+        dateFormatter.dateFormat = "yyyy-MM-dd"
+        let today = dateFormatter.string(from: current)
+        defaultValues[.lastVideoCheck] = today
 
         let defaults = defaultValues.reduce([String: Any]()) { (result, pair:(key: Identifiers, value: Any)) -> [String: Any] in
             var mutable = result
@@ -187,6 +201,24 @@ class Preferences {
     }
 
     // MARK: - Variables
+    var lastVideoCheck: String? {
+        get {
+            return optionalValue(forIdentifier: .lastVideoCheck)
+        }
+        set {
+            setValue(forIdentifier: .lastVideoCheck, value: newValue)
+        }
+    }
+
+    var newVideosMode: Int? {
+        get {
+            return optionalValue(forIdentifier: .newVideosMode)
+        }
+        set {
+            setValue(forIdentifier: .newVideosMode, value: newValue)
+        }
+    }
+
     var alternateVideoFormat: Int? {
         get {
             return optionalValue(forIdentifier: .alternateVideoFormat)

diff --git a/Aerial/Source/Controllers/PreferencesWindowController.swift b/Aerial/Source/Controllers/PreferencesWindowController.swift
@@ -177,6 +177,7 @@ class PreferencesWindowController: NSWindowController, NSOutlineViewDataSource,
     @IBOutlet weak var logToDiskCheckbox: NSButton!
 
     @IBOutlet weak var cacheSizeTextField: NSTextField!
+    @IBOutlet var newVideosModePopup: NSPopUpButton!
 
     var player: AVPlayer = AVPlayer()
 
@@ -496,6 +497,7 @@ class PreferencesWindowController: NSWindowController, NSOutlineViewDataSource,
         multiMonitorModePopup.selectItem(at: preferences.multiMonitorMode!)
 
         popupVideoFormat.selectItem(at: preferences.videoFormat!)
+
         alternatePopupVideoFormat.selectItem(at: preferences.alternateVideoFormat!)
 
         descriptionModePopup.selectItem(at: preferences.showDescriptionsMode!)
@@ -506,6 +508,8 @@ class PreferencesWindowController: NSWindowController, NSOutlineViewDataSource,
 
         extraCornerPopup.selectItem(at: preferences.extraCorner!)
 
+        newVideosModePopup.selectItem(at: preferences.newVideosMode!)
+
         colorizeProjectPageLinks()
 
         if let cacheDirectory = VideoCache.cacheDirectory {
@@ -1041,6 +1045,11 @@ class PreferencesWindowController: NSWindowController, NSOutlineViewDataSource,
         downloadAllVideos()
     }
 
+    @IBAction func newVideosModeChange(_ sender: NSPopUpButton) {
+        debugLog("UI newVideosMode: \(sender.indexOfSelectedItem)")
+        preferences.newVideosMode = sender.indexOfSelectedItem
+    }
+
     // MARK: - Time panel
 
     @IBAction func overrideNightOnDarkModeClick(_ button: NSButton) {

diff --git a/Aerial/Source/Models/AerialVideo.swift b/Aerial/Source/Models/AerialVideo.swift
@@ -13,39 +13,59 @@ enum Manifests: String {
     case tvOS10 = "tvos10.json", tvOS11 = "tvos11.json", tvOS12 = "entries.json"
 }
 
-let spaceVideos = [ "A837FA8C-C643-4705-AE92-074EFDD067F7",
-                    "2F72BC1E-3D76-456C-81EB-842EBA488C27",
-                    "A2BE2E4A-AD4B-428A-9C41-BDAE1E78E816",
-                    "D5CFB2FF-5F8C-4637-816B-3E42FC1229B8",
-                    "4F881F8B-A7D9-4FDB-A917-17BF6AC5A589",
-                    "6A74D52E-2447-4B84-AE45-0DEF2836C3CC",
-                    "F439B0A7-D18C-4B14-9681-6520E6A74FE9",
-                    "62A926BE-AA0B-4A34-9653-78C4F130543F",
-                    "6C3D54AE-0871-498A-81D0-56ED24E5FE9F",
-                    "78911B7E-3C69-47AD-B635-9C2486F6301D",
-                    "D60B4DDA-69EB-4841-9690-E8BAE7BC4F80",
-                    "7719B48A-2005-4011-9280-2F64EEC6FD91",
-                    "63C042F0-90EF-4A95-B7CC-CC9A64BF8421", ]
-
-let timeInformation = [ "A837FA8C-C643-4705-AE92-074EFDD067F7": "night",     // Africa Night
-                        "2F72BC1E-3D76-456C-81EB-842EBA488C27": "day",       // Africa and the Middle East
-                        "A2BE2E4A-AD4B-428A-9C41-BDAE1E78E816": "night",     // California to Vegas
-                        "D5CFB2FF-5F8C-4637-816B-3E42FC1229B8": "day",       // Carribean
-                        "4F881F8B-A7D9-4FDB-A917-17BF6AC5A589": "day",       // Carribean day
-                        "6A74D52E-2447-4B84-AE45-0DEF2836C3CC": "night",     // China
-                        "F439B0A7-D18C-4B14-9681-6520E6A74FE9": "night",     // Iran and Afghanistan
-                        "62A926BE-AA0B-4A34-9653-78C4F130543F": "night",     // Ireland to Asia
-                        "6C3D54AE-0871-498A-81D0-56ED24E5FE9F": "night",     // Korean and Japan Night
-                        "78911B7E-3C69-47AD-B635-9C2486F6301D": "day",       // New Zealand (sunrise...)
-                        "D60B4DDA-69EB-4841-9690-E8BAE7BC4F80": "day",       // Sahara and Italy
-                        "7719B48A-2005-4011-9280-2F64EEC6FD91": "day",       // Southern California to Baja
-                        "63C042F0-90EF-4A95-B7CC-CC9A64BF8421": "day",       // Western Africa to the Alps (sunset...)
-                        "BAF76353-3475-4855-B7E1-CE96CC9BC3A7": "night",     // Dubai
-                        "30313BC1-BF20-45EB-A7B1-5A6FFDBD2488": "night",     // Hong Kong
-                        "89B1643B-06DD-4DEC-B1B0-774493B0F7B7": "night",     // Los Angeles
-                        "EC67726A-8212-4C5E-83CF-8412932740D2": "night",     // Los Angeles
-                        "A284F0BF-E690-4C13-92E2-4672D93E8DE5": "night",
-                        ]
+let spaceVideos = [
+    "A837FA8C-C643-4705-AE92-074EFDD067F7",
+    "2F72BC1E-3D76-456C-81EB-842EBA488C27",
+    "A2BE2E4A-AD4B-428A-9C41-BDAE1E78E816",
+    "12318CCB-3F78-43B7-A854-EFDCCE5312CD",
+    "D5CFB2FF-5F8C-4637-816B-3E42FC1229B8",
+    "4F881F8B-A7D9-4FDB-A917-17BF6AC5A589",
+    "6A74D52E-2447-4B84-AE45-0DEF2836C3CC",
+    "7825C73A-658F-48EE-B14C-EC56673094AC",
+    "E5DB138A-F04E-4619-B896-DE5CB538C534",
+    "F439B0A7-D18C-4B14-9681-6520E6A74FE9",
+    "62A926BE-AA0B-4A34-9653-78C4F130543F",
+    "7C643A39-C0B2-4BA0-8BC2-2EAA47CC580E",
+    "6C3D54AE-0871-498A-81D0-56ED24E5FE9F",
+    "009BA758-7060-4479-8EE8-FB9B40C8FB97",
+    "78911B7E-3C69-47AD-B635-9C2486F6301D",
+    "D60B4DDA-69EB-4841-9690-E8BAE7BC4F80",
+    "7719B48A-2005-4011-9280-2F64EEC6FD91",
+    "63C042F0-90EF-4A95-B7CC-CC9A64BF8421",
+    "B1B5DDC5-73C8-4920-8133-BACCE38A08DE",
+]
+
+let timeInformation = [
+    "A837FA8C-C643-4705-AE92-074EFDD067F7": "night",    // Africa Night
+    "2F72BC1E-3D76-456C-81EB-842EBA488C27": "day",      // Africa and the Middle East
+    "A2BE2E4A-AD4B-428A-9C41-BDAE1E78E816": "night",    // California to Vegas (v7)
+    "12318CCB-3F78-43B7-A854-EFDCCE5312CD": "night",    // California to Vegas (v8)
+    "D5CFB2FF-5F8C-4637-816B-3E42FC1229B8": "day",      // Carribean
+    "4F881F8B-A7D9-4FDB-A917-17BF6AC5A589": "day",      // Carribean day
+    "6A74D52E-2447-4B84-AE45-0DEF2836C3CC": "night",    // China
+    "7825C73A-658F-48EE-B14C-EC56673094AC": "night",    // China (new id)
+    "E5DB138A-F04E-4619-B896-DE5CB538C534": "night",    // Italy to Asia
+    "F439B0A7-D18C-4B14-9681-6520E6A74FE9": "night",    // Iran and Afghanistan
+    "62A926BE-AA0B-4A34-9653-78C4F130543F": "night",    // Ireland to Asia
+    "7C643A39-C0B2-4BA0-8BC2-2EAA47CC580E": "night",    // Ireland to Asia
+    "6C3D54AE-0871-498A-81D0-56ED24E5FE9F": "night",    // Korean and Japan Night (v17)
+    "009BA758-7060-4479-8EE8-FB9B40C8FB97": "night",    // Korean and Japan Night (v18)
+    "78911B7E-3C69-47AD-B635-9C2486F6301D": "day",      // New Zealand (sunrise...)
+    "D60B4DDA-69EB-4841-9690-E8BAE7BC4F80": "day",      // Sahara and Italy
+    "7719B48A-2005-4011-9280-2F64EEC6FD91": "day",      // Southern California to Baja
+    "63C042F0-90EF-4A95-B7CC-CC9A64BF8421": "day",      // Western Africa to the Alps (sunset...)
+    "BAF76353-3475-4855-B7E1-CE96CC9BC3A7": "night",    // Dubai
+    "30313BC1-BF20-45EB-A7B1-5A6FFDBD2488": "night",    // Hong Kong
+    "89B1643B-06DD-4DEC-B1B0-774493B0F7B7": "night",    // Los Angeles
+    "EC67726A-8212-4C5E-83CF-8412932740D2": "night",    // Los Angeles
+    "A284F0BF-E690-4C13-92E2-4672D93E8DE5": "night",    // Los Angeles
+    "B1B5DDC5-73C8-4920-8133-BACCE38A08DE": "night",    // New York night
+    "9680B8EB-CE2A-4395-AF41-402801F4D6A6": "night",    // Approaching Burj Khalifa
+    "EE01F02D-1413-436C-AB05-410F224A5B7B": "night",    // Ilulissat Icefjord
+    "E99FA658-A59A-4A2D-9F3B-58E7BDC71A9A": "night",    // Hong Kong Victoria Harbour
+    "3E94AE98-EAF2-4B09-96E3-452F46BC114E": "night",    // Bay Bridge
+    "29BDF297-EB43-403A-8719-A78DA11A2948": "night",    // Fisherman's Wharf
+]
 
 class AerialVideo: CustomStringConvertible, Equatable {
     static func ==(lhs: AerialVideo, rhs: AerialVideo) -> Bool {
@@ -139,6 +159,7 @@ class AerialVideo: CustomStringConvertible, Equatable {
             }
         }
     }
+
     init(id: String,
          name: String,
          secondaryName: String,