Changeset 13327

Timestamp:

May 29, 2012, 1:53:36 AM (9 years ago)

Author:

livings124

Message:

#4924 Use recycleURLs:completionHandler: to trash files

Location:

trunk/macosx

Files:

• AddWindowController.h (modified) (1 diff)
• AddWindowController.m (modified) (1 diff)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (3 diffs)

trunk/macosx/AddWindowController.h

@@ -46 +46 @@
     
     Torrent * fTorrent;
-    NSString * fDestination, * fTorrentFile;
+    NSURL * fTorrentFile;
+    NSString * fDestination;
     BOOL fLockDestination;
     

trunk/macosx/AddWindowController.m

@@ -66 +66 @@
         fController = controller;
         
-        fTorrentFile = [[torrentFile stringByExpandingTildeInPath] retain];
+        fTorrentFile = [[NSURL alloc] initFileURLWithPath: [torrentFile stringByExpandingTildeInPath]];
         
         fDeleteTorrentInitial = deleteTorrent;

trunk/macosx/Torrent.h

@@ -120 +120 @@
 - (void) setPriority: (tr_priority_t) priority;
 
-+ (void) trashFile: (NSString *) path;
++ (void) trashFile: (NSURL *) fileURL;
 - (void) moveTorrentDataFileTo: (NSString *) folder;
 - (void) copyTorrentFileTo: (NSString *) path;

trunk/macosx/Torrent.m

@@ -95 +95 @@
     @autoreleasepool
     {
+        NSLog(@"%s", filename);
         if (filename != NULL)
-            [Torrent trashFile: [NSString stringWithUTF8String: filename]];
+        {
+            [Torrent trashFile: [NSURL fileURLWithPath: [NSString stringWithUTF8String: filename]]];
+            NSLog(@"%@\n%@", [NSString stringWithUTF8String: filename], [NSURL fileURLWithPath: [NSString stringWithUTF8String: filename]]);
+        }
     }
     return 0;
@@ -115 +119 @@
     {
         if (torrentDelete && ![[self torrentLocation] isEqualToString: path])
-            [Torrent trashFile: path];
+            [Torrent trashFile: [NSURL fileURLWithPath: path]];
     }
     return self;
@@ -493 +497 @@
 }
 
-#warning when 10.6-only use recycleURLs:completionHandler:
-+ (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(@"Could not trash %@: %@", path, [error localizedDescription]);
-    }
++ (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]);
+    }];
 }