Changeset 13334 for trunk/macosx/Torrent.m

Timestamp:

Jun 3, 2012, 11:29:39 PM (9 years ago)

Author:

livings124

Message:

revert 13327 (#4924)

File:

• trunk/macosx/Torrent.m (modified) (3 diffs)

trunk/macosx/Torrent.m

@@ -95 +95 @@
     @autoreleasepool
     {
-        NSLog(@"%s", filename);
         if (filename != NULL)
-        {
-            [Torrent trashFile: [NSURL fileURLWithPath: [NSString stringWithUTF8String: filename]]];
-            NSLog(@"%@\n%@", [NSString stringWithUTF8String: filename], [NSURL fileURLWithPath: [NSString stringWithUTF8String: filename]]);
+            [Torrent trashFile: [NSString stringWithUTF8String: filename]];
         }
     }
@@ -119 +116 @@
     {
         if (torrentDelete && ![[self torrentLocation] isEqualToString: path])
-            [Torrent trashFile: [NSURL fileURLWithPath: path]];
+            [Torrent trashFile: path];
     }
     return self;
@@ -497 +494 @@
 }
 
-+ (void) trashFile: (NSURL *) fileURL
-{
-    [[NSWorkspace sharedWorkspace] recycleURLs: [NSArray arrayWithObject: fileURL] completionHandler: ^(NSDictionary * newURLs, NSError * error) {
-        if (error)
-            NSLog(@"Could not trash %@: %@", [fileURL path], [error localizedDescription]);
-    }];
++ (void) trashFile: (NSString *) path
+{
+    //attempt to move to trash
+    if (![[NSWorkspace sharedWorkspace] performFileOperation: NSWorkspaceRecycleOperation
+                                                      source: [path stringByDeletingLastPathComponent] destination: @""
+                                                       files: [NSArray arrayWithObject: [path lastPathComponent]] tag: nil])
+    {
+        //if cannot trash, just delete it (will work if it's on a remote volume)
+        NSError * error;
+        if (![[NSFileManager defaultManager] removeItemAtPath: path error: &error])
+            NSLog(@"old Could not trash %@: %@", path, [error localizedDescription]);
+        else {NSLog(@"old removed %@", path);}
+    }
 }