MacGui: replace some deprecated methods

sadok · Jul 6, 2024 · 01b8fbe · 01b8fbe
1 parent b15a89b
commit 01b8fbe
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
@@ -195,6 +195,8 @@ + (void)registerUserDefaults
         HBPreferencesController.hardwareDecoderSupported = NO;
     }
 
+    NSData *moviesData = [NSKeyedArchiver archivedDataWithRootObject:moviesURL requiringSecureCoding:YES error:NULL];
+
     [defaults registerDefaults:@{
         HBShowOpenPanelAtLaunch:            @YES,
         HBShowSummaryPreview:               @YES,
@@ -205,8 +207,8 @@ + (void)registerUserDefaults
         HBAlwaysUseHardwareDecoder:         @NO,
         HBRecursiveScan:                    @NO,
         HBExcludedFileExtensions:           @[@"jpg", @"png", @"srt", @"ssa", @"ass", @"txt"],
-        HBLastDestinationDirectoryURL:      [NSKeyedArchiver archivedDataWithRootObject:moviesURL],
-        HBLastSourceDirectoryURL:           [NSKeyedArchiver archivedDataWithRootObject:moviesURL],
+        HBLastDestinationDirectoryURL:      moviesData,
+        HBLastSourceDirectoryURL:           moviesData,
         HBUseSourceFolderDestination:       @NO,
         HBDefaultAutoNaming:                @NO,
         HBAutoNamingFormat:                 @[@"{Source}", @" ", @"{Title}"],

diff --git a/macosx/HBQueue.m b/macosx/HBQueue.m
@@ -188,30 +188,35 @@ - (void)dealloc
 - (NSMutableArray *)load
 {
     NSError *error;
+    NSArray *loadedItems = nil;
 
-    NSData *queue = [NSData dataWithContentsOfURL:self.fileURL];
-    NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:queue];
-    unarchiver.requiresSecureCoding = YES;
-
-    NSSet *objectClasses = [NSSet setWithObjects:[NSMutableArray class], [HBQueueJobItem class], [HBQueueActionStopItem class], nil];
-
-    NSArray *loadedItems = [unarchiver decodeTopLevelObjectOfClasses:objectClasses
-                                                              forKey:NSKeyedArchiveRootObjectKey
-                                                               error:&error];
-
-    if (error)
+    NSData *data = [NSData dataWithContentsOfURL:self.fileURL];
+    if (data)
     {
-        [HBUtilities writeErrorToActivityLog:error];
-    }
+        NSSet *objectClasses = [NSSet setWithObjects:[NSMutableArray class], [HBQueueJobItem class], [HBQueueActionStopItem class], nil];
+        loadedItems = [NSKeyedUnarchiver unarchivedObjectOfClasses:objectClasses fromData:data error:&error];
 
-    [unarchiver finishDecoding];
+        if (loadedItems == nil && error)
+        {
+            [HBUtilities writeErrorToActivityLog:error];
+        }
+    }
 
     return loadedItems ? [loadedItems mutableCopy] : [NSMutableArray array];
 }
 
 - (void)save
 {
-    if (![NSKeyedArchiver archiveRootObject:self.itemsInternal toFile:self.fileURL.path])
+    NSError *error = nil;
+    NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self.itemsInternal requiringSecureCoding:YES error:&error];
+    if (data == nil)
+    {
+        [HBUtilities writeToActivityLog:"Failed to archive the queue"];
+        return;
+    }
+
+    BOOL result = [data writeToURL:self.fileURL atomically:YES];
+    if (result == NO)
     {
         [HBUtilities writeToActivityLog:"Failed to write the queue to disk"];
     }