Changeset 166

Timestamp:

Mar 28, 2006, 6:26:13 AM (17 years ago)

Author:

titer

Message:

Finder-independent trashPath: method

File:

• trunk/macosx/Torrent.m (modified) (1 diff)

trunk/macosx/Torrent.m

@@ -371 +371 @@
 - (void) trashPath: (NSString *) path
 {
-    NSString * string;
-    NSAppleScript * appleScript;
-    NSDictionary * error;
-
-    string = [NSString stringWithFormat:
-        @"tell application \"Finder\"\n"
-         "  move (POSIX file \"%@\") to trash\n"
-         "end tell", path];
-    
-    appleScript = [[NSAppleScript alloc] initWithSource: string];
-    if( ![appleScript executeAndReturnError: &error] )
-    {
-        printf( "trashPath failed\n" );
-    }
-    [appleScript release];
+    if( ![[NSWorkspace sharedWorkspace] performFileOperation:
+           NSWorkspaceRecycleOperation source:
+           [path stringByDeletingLastPathComponent]
+           destination: @""
+           files: [NSArray arrayWithObject: [path lastPathComponent]]
+           tag: nil] )
+    {
+        /* We can't move it to the trash, let's try just to delete it
+           (will work if it is on a remote volume) */
+        if( ![[NSFileManager defaultManager]
+                removeFileAtPath: path handler: nil] )
+        {
+            printf( "Could not trash `%s'\n", [path UTF8String] );
+        }
+    }
 }