Merge pull request #818 from glouel/master

quick beta5 with the panel fix
JohnCoates · Jun 24, 2019 · 3bbcddb · 3bbcddb
2 parents b9c96d2 + a4da9c8
commit 3bbcddb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -1169,15 +1169,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application: Guillaume Louel (3L54M5L5KK)";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.5.1beta4;
+				CURRENT_PROJECT_VERSION = 1.5.1beta5;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 1.5.1beta4;
+				MARKETING_VERSION = 1.5.1beta5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1198,15 +1198,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application: Guillaume Louel (3L54M5L5KK)";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.5.1beta4;
+				CURRENT_PROJECT_VERSION = 1.5.1beta5;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 1.5.1beta4;
+				MARKETING_VERSION = 1.5.1beta5;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Aerial/Source/Controllers/PWC Tabs/PWC+Advanced.swift b/Aerial/Source/Controllers/PWC Tabs/PWC+Advanced.swift
@@ -70,13 +70,13 @@ extension PreferencesWindowController {
     }
 
     @IBAction func showLogInFinder(_ button: NSButton!) {
-        let logfile = VideoCache.cacheDirectory!.appending("/AerialLog.txt")
+        let logfile = VideoCache.appSupportDirectory!.appending("/AerialLog.txt")
 
         // If we don't have a log, just show the folder
         if FileManager.default.fileExists(atPath: logfile) == false {
-            NSWorkspace.shared.selectFile(nil, inFileViewerRootedAtPath: VideoCache.cacheDirectory!)
+            NSWorkspace.shared.selectFile(nil, inFileViewerRootedAtPath: VideoCache.appSupportDirectory!)
         } else {
-            NSWorkspace.shared.selectFile(logfile, inFileViewerRootedAtPath: VideoCache.cacheDirectory!)
+            NSWorkspace.shared.selectFile(logfile, inFileViewerRootedAtPath: VideoCache.appSupportDirectory!)
         }
     }
 

diff --git a/Aerial/Source/Controllers/PreferencesWindowController.swift b/Aerial/Source/Controllers/PreferencesWindowController.swift
@@ -316,7 +316,7 @@ final class PreferencesWindowController: NSWindowController, NSOutlineViewDataSo
         setupVideosTab()
         setupDisplaysTab()
         setupTextTab()
-        //setupTimeTab()
+        setupTimeTab()
         setupBrightnessTab()
         setupCacheTab()
         setupUpdatesTab()
@@ -339,13 +339,13 @@ final class PreferencesWindowController: NSWindowController, NSOutlineViewDataSo
         }
 
         // We also load our CustomVideos nib here
-        /*let bundle = Bundle(for: PreferencesWindowController.self)
+        let bundle = Bundle(for: PreferencesWindowController.self)
         var topLevelObjects: NSArray? = NSArray()
         if !bundle.loadNibNamed(NSNib.Name("CustomVideos"),
                             owner: customVideosController,
                             topLevelObjects: &topLevelObjects) {
             errorLog("Could not load nib for CustomVideos, please report")
-        }*/
+        }
     }
 
     override func windowDidLoad() {

diff --git a/Aerial/Source/Models/Cache/VideoCache.swift b/Aerial/Source/Models/Cache/VideoCache.swift
@@ -136,9 +136,6 @@ final class VideoCache {
         // Cache the computed value
         computedCacheDirectory = cacheDirectory
 
-        // Save it
-        //preferences.customCacheDirectory = computedCacheDirectory
-        //preferences.synchronize()
         debugLog("cache to be used : \(String(describing: cacheDirectory))")
         return cacheDirectory
     }

diff --git a/Aerial/Source/Models/ErrorLog.swift b/Aerial/Source/Models/ErrorLog.swift
@@ -76,7 +76,7 @@ func Log(level: ErrorLevel, message: String) {
             }
             let string = dateFormatter.string(from: Date()) + " : " + message + "\n"
 
-            if let cacheDirectory = VideoCache.cacheDirectory {
+            if let cacheDirectory = VideoCache.appSupportDirectory {
                 var cacheFileUrl = URL(fileURLWithPath: cacheDirectory as String)
                 cacheFileUrl.appendPathComponent("AerialLog.txt")
                 let data = string.data(using: String.Encoding.utf8, allowLossyConversion: false)!
@@ -126,7 +126,7 @@ func errorLog(_ message: String) {
 }
 
 func dataLog(_ data: Data) {
-    let cacheDirectory = VideoCache.cacheDirectory!
+    let cacheDirectory = VideoCache.appSupportDirectory!
     var cacheFileUrl = URL(fileURLWithPath: cacheDirectory as String)
     cacheFileUrl.appendPathComponent("AerialData.txt")