Address comemnts

Author: cymbalrush

backends/apple/coreml/runtime/delegate/ETCoreMLAssetManager.mm

@@ -259,10 +259,21 @@ BOOL is_asset_alive(NSMapTable<NSString *, ETCoreMLAsset *> *assets_in_use_map,
                                     NSURL *directoryURL,
                                     NSFileManager *fileManager,
                                     NSError * __autoreleasing *error) {
+    if (!url) {
+        ETCoreMLLogErrorAndSetNSError(error, ETCoreMLErrorInternalError, "Move operation failed: source URL is nil.");
+        return nil;
+    }
+
+    if (!directoryURL) {
+        ETCoreMLLogErrorAndSetNSError(error, ETCoreMLErrorInternalError, "Move operation failed: destination URL is nil.");
+        return nil;
+    }
+
     NSURL *dstURL = [directoryURL URLByAppendingPathComponent:[NSUUID UUID].UUIDString];
     if (![fileManager moveItemAtURL:url toURL:dstURL error:error]) {
         return nil;
     }
+
     return dstURL;
 }
 
@@ -317,9 +328,6 @@ - (nullable instancetype)initWithDatabase:(const std::shared_ptr<Database>&)data
         return nil;
     }
 
-    // Remove any existing contents in the staging directory by moving them to the trash directory,
-    // then recreate a clean staging directory for new use.
-    move_to_directory([assetsDirectoryURL URLByAppendingPathComponent:@"staging"], managedTrashDirectoryURL, fileManager, nil);
     NSURL *managedStagingDirectoryURL = ::create_directory_if_needed(assetsDirectoryURL, @"staging", fileManager, error);
     if (!managedStagingDirectoryURL) {
         return nil;
@@ -367,20 +375,14 @@ - (nullable instancetype)initWithDatabaseURL:(NSURL *)databaseURL
                             error:error];
 }
 
-- (nullable NSURL *)moveURL:(NSURL *)url
-     toUniqueURLInDirectory:(NSURL *)directoryURL
-                      error:(NSError * __autoreleasing *)error {
-    return move_to_directory(url, directoryURL, self.fileManager, error);
-}
-
 - (void)withTemporaryDirectory:(void (^)(NSURL *directoryURL))block {
     NSURL *dstURL = [self.stagingDirectoryURL URLByAppendingPathComponent:[NSUUID UUID].UUIDString];
     block(dstURL);
     if (![self.fileManager fileExistsAtPath:dstURL.path]) {
         return;
     }
 
-    [self moveURL:dstURL toUniqueURLInDirectory:self.trashDirectoryURL error:nil];
+    move_to_directory(dstURL, self.trashDirectoryURL, self.fileManager, nil);
     [self cleanupTrashDirectory];
 }
 
@@ -434,9 +436,8 @@ - (nullable ETCoreMLAsset *)_storeAssetAtURL:(NSURL *)srcURL
             return false;
         }
 
-        // If an asset exists move it,
-        [self moveURL:dstURL toUniqueURLInDirectory:self.trashDirectoryURL error:nil];
-        
+        // If a file already exists at `dstURL`, move it to the trash for removal.
+        move_to_directory(dstURL, self.trashDirectoryURL, self.fileManager, nil);
         // Move the asset to assets directory.
         if (![self.fileManager moveItemAtURL:srcURL toURL:dstURL error:error]) {
             return false;
@@ -584,7 +585,7 @@ - (BOOL)_removeAssetWithIdentifier:(NSString *)identifier
 
         NSURL *assetURL = ::get_asset_url(assetValue);
         if ([self.fileManager fileExistsAtPath:assetURL.path] &&
-            ![self moveURL:assetURL toUniqueURLInDirectory:self.trashDirectoryURL error:error]) {
+            !move_to_directory(assetURL, self.trashDirectoryURL, self.fileManager, error)) {
             return false;
         }
 
@@ -741,7 +742,7 @@ - (BOOL)_purge:(NSError * __autoreleasing *)error {
         }
 
         // Move the the whole assets directory to the temp directory.
-        if (![self moveURL:self.assetsDirectoryURL toUniqueURLInDirectory:self.trashDirectoryURL error:error]) {
+        if (!move_to_directory(self.assetsDirectoryURL, self.trashDirectoryURL, self.fileManager, error)) {
             return false;
         }
 

backends/apple/coreml/runtime/delegate/ETCoreMLModelManager.mm

@@ -803,10 +803,8 @@ - (BOOL)executeModelWithHandle:(ModelHandle *)handle
         }
     }
 
-    if (!result) {
-        if (error) {
-            *error = localError;
-        }
+    if (localError && error) {
+        *error = localError;
     }
 
     return result;