CLI: use the presets from the sandbox container folder if they more recent.

diff --git a/libhb/platform/macosx/config.m b/libhb/platform/macosx/config.m
index c30f34c4a5088122af27f0e8c837fce90a36ea6a..54c0df52e1b5e2c4f769c2c3d5c2b329bab90dda 100644 (file)
--- a/libhb/platform/macosx/config.m
+++ b/libhb/platform/macosx/config.m
@@ -1,18 +1,49 @@
 #import <Foundation/Foundation.h>
 
-int osx_get_user_config_directory(char path[512])
+static NSURL * macOS_last_modified_url(NSURL *url1, NSURL* url2)
+{
+    NSString *presetFile = @"HandBrake/UserPresets.json";
+
+    NSURL *presetsUrl1 = [url1 URLByAppendingPathComponent:presetFile isDirectory:NO];
+    NSURL *presetsUrl2 = [url2 URLByAppendingPathComponent:presetFile isDirectory:NO];
+    
+    NSDate *date1 = nil;
+    [presetsUrl1 getResourceValue:&date1 forKey:NSURLAttributeModificationDateKey error:nil];
+
+    NSDate *date2 = nil;
+    [presetsUrl2 getResourceValue:&date2 forKey:NSURLAttributeModificationDateKey error:nil];
+
+    return presetsUrl2 && (date1 == nil || [date2 compare:date1] == NSOrderedDescending) ? url2 : url1;
+}
+
+static NSURL * macOS_get_application_support_url()
+{
+    NSFileManager *fileManager = NSFileManager.defaultManager;
+    NSArray<NSURL *> *applicationSupportUrls = [fileManager URLsForDirectory:NSApplicationSupportDirectory
+                                                                   inDomains:NSUserDomainMask];
+
+    NSURL *appSupportURL = applicationSupportUrls.firstObject;
+
+    NSArray<NSURL *> *libraryUrls = [fileManager URLsForDirectory:NSLibraryDirectory
+                                                        inDomains:NSUserDomainMask];
+    NSString *sandboxPath = @"Containers/fr.handbrake.HandBrake/Data/Library/Application Support";
+    NSURL *sandboxAppSupportURL = [libraryUrls.firstObject URLByAppendingPathComponent:sandboxPath isDirectory:YES];
+
+    return macOS_last_modified_url(appSupportURL, sandboxAppSupportURL);
+}
+
+int macOS_get_user_config_directory(char path[512])
 {
     @autoreleasepool
     {
-        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,
-                                                             NSUserDomainMask, YES);
-        NSString  *dir = paths.firstObject;
-        if (dir.UTF8String == nil)
+        NSURL *url = macOS_get_application_support_url();
+
+        if (url == nil)
         {
             return -1;
         }
 
-        strncpy(path, dir.UTF8String, 511);
+        strncpy(path, url.fileSystemRepresentation, 511);
         path[511] = 0;
         return 0;
     }

diff --git a/libhb/ports.c b/libhb/ports.c
index 917da62b9807b65cfc7d5eb8fa3015760f28619f..cfdaf9ddc7d1dddfed711611698db7e9e936711c 100644 (file)
--- a/libhb/ports.c
+++ b/libhb/ports.c
@@ -573,7 +573,7 @@ void hb_get_user_config_directory( char path[512] )
         return;
     }
 #elif defined( __APPLE__ )
-    if (osx_get_user_config_directory(path) == 0)
+    if (macOS_get_user_config_directory(path) == 0)
     {
         return;
     }