Changeset 8843

Timestamp:

Jul 20, 2009, 12:40:01 AM (13 years ago)

Author:

livings124

Message:

#2287 Remove options to delete torrent file when removing, and remove internal storing of torrent file location

Location:

trunk/macosx

Files:

• AddWindowController.h (modified) (2 diffs)
• AddWindowController.m (modified) (2 diffs)
• Controller.m (modified) (3 diffs)
• Torrent.h (modified) (5 diffs)
• Torrent.m (modified) (15 diffs)

trunk/macosx/AddWindowController.h

@@ -41 +41 @@
     
     Torrent * fTorrent;
-    NSString * fDestination;
+    NSString * fDestination, * fTorrentFile;
     BOOL fLockDestination;
     
@@ -51 +51 @@
 
 - (id) initWithTorrent: (Torrent *) torrent destination: (NSString *) path lockDestination: (BOOL) lockDestination
-    controller: (Controller *) controller deleteTorrent: (torrentFileState) deleteTorrent;
+    controller: (Controller *) controller torrentFile: (NSString *) torrentFile
+    deleteTorrent: (BOOL) deleteTorrent canToggleDelete: (BOOL) canToggleDelete;
 
 - (Torrent *) torrent;

trunk/macosx/AddWindowController.m

@@ -50 +50 @@
 
 - (id) initWithTorrent: (Torrent *) torrent destination: (NSString *) path lockDestination: (BOOL) lockDestination
-    controller: (Controller *) controller deleteTorrent: (torrentFileState) deleteTorrent
+    controller: (Controller *) controller torrentFile: (NSString *) torrentFile
+    deleteTorrent: (BOOL) deleteTorrent canToggleDelete: (BOOL) canToggleDelete
 {
     if ((self = [super initWithWindowNibName: @"AddWindow"]))
     {
         fTorrent = torrent;
-        if (path)
-            fDestination = [[path stringByExpandingTildeInPath] retain];
+        fDestination = [[path stringByExpandingTildeInPath] retain];
         fLockDestination = lockDestination;
         
         fController = controller;
         
-        fDeleteTorrent = deleteTorrent == TORRENT_FILE_DELETE || (deleteTorrent == TORRENT_FILE_DEFAULT
-                            && [[NSUserDefaults standardUserDefaults] boolForKey: @"DeleteOriginalTorrent"]);
-        fDeleteEnable = deleteTorrent == TORRENT_FILE_DEFAULT;
+        fTorrentFile = [[torrentFile stringByExpandingTildeInPath] retain];
+        
+        fDeleteTorrent = deleteTorrent;
+        fDeleteEnable = canToggleDelete;
         
         fGroupValue = [torrent groupValue];
@@ -239 +240 @@
     [fTorrent setGroupValue: fGroupValue];
     
-    if ([fDeleteCheck state] == NSOnState)
-        [fTorrent trashTorrent];
+    if (fTorrentFile && [fDeleteCheck state] == NSOnState)
+        [Torrent trashFile: fTorrentFile];
     
     [fFileController setTorrent: nil]; //avoid a crash when window tries to update

trunk/macosx/Controller.m

@@ -777 +777 @@
     }
     
-    torrentFileState deleteTorrentFile;
+    BOOL deleteTorrentFile, canToggleDelete = NO;
     switch (type)
     {
         case ADD_CREATED:
-            deleteTorrentFile = TORRENT_FILE_SAVE;
+            deleteTorrentFile = NO;
             break;
         case ADD_URL:
-            deleteTorrentFile = TORRENT_FILE_DELETE;
+            deleteTorrentFile = YES;
             break;
         default:
-            deleteTorrentFile = TORRENT_FILE_DEFAULT;
+            deleteTorrentFile = [fDefaults boolForKey: @"DeleteOriginalTorrent"];
+            canToggleDelete = YES;
     }
     
@@ -839 +840 @@
         Torrent * torrent;
         if (!(torrent = [[Torrent alloc] initWithPath: torrentPath location: location
-                            deleteTorrentFile: showWindow ? TORRENT_FILE_SAVE : deleteTorrentFile lib: fLib]))
+                            deleteTorrentFile: showWindow ? NO : deleteTorrentFile lib: fLib]))
             continue;
         
@@ -860 +861 @@
         {
             AddWindowController * addController = [[AddWindowController alloc] initWithTorrent: torrent destination: location
-                                                    lockDestination: lockDestination controller: self deleteTorrent: deleteTorrentFile];
+                                                    lockDestination: lockDestination controller: self torrentFile: torrentPath
+                                                    deleteTorrent: deleteTorrentFile canToggleDelete: canToggleDelete];
             [addController showWindow: self];
         }

trunk/macosx/Torrent.h

@@ -28 +28 @@
 @class FileListNode;
 
-typedef enum
-{
-    TORRENT_FILE_DELETE,
-    TORRENT_FILE_SAVE,
-    TORRENT_FILE_DEFAULT
-} torrentFileState;
-
 #define STAT_TIME_NONE -1
 #define STAT_TIME_NOW -2
@@ -48 +41 @@
     BOOL fUseIncompleteFolder;
     NSString * fDownloadFolder, * fIncompleteFolder;
-    
-    BOOL fPublicTorrent;
-    NSString * fPublicTorrentLocation;
         
     NSUserDefaults * fDefaults;
@@ -73 +63 @@
 }
 
-- (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (torrentFileState) torrentDelete
+- (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (BOOL) torrentDelete
         lib: (tr_session *) lib;
 - (id) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_session *) lib;
@@ -128 +118 @@
 
 - (void) revealData;
-- (void) revealPublicTorrent;
++ (void) trashFile: (NSString *) path;
 - (void) trashData;
-- (void) trashTorrent;
 - (void) moveTorrentDataFileTo: (NSString *) folder;
 - (void) copyTorrentFileTo: (NSString *) path;
@@ -171 +160 @@
 
 - (NSString *) torrentLocation;
-- (NSString *) publicTorrentLocation;
 - (NSString *) dataLocation;
-
-- (BOOL) publicTorrent;
 
 - (CGFloat) progress;

trunk/macosx/Torrent.m

@@ -32 +32 @@
 
 - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
-        publicTorrent: (NSNumber *) publicTorrent publicTorrentLocation: (NSString *) publicTorrentLoc
         downloadFolder: (NSString *) downloadFolder
         useIncompleteFolder: (NSNumber *) useIncompleteFolder incompleteFolder: (NSString *) incompleteFolder
@@ -56 +55 @@
 - (void) updateAllTrackers: (NSMutableArray *) trackers;
 
-+ (void) trashFile: (NSString *) path;
-
 - (void) setTimeMachineExclude: (BOOL) exclude forPath: (NSString *) path;
 
@@ -81 +78 @@
 @implementation Torrent
 
-- (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (torrentFileState) torrentDelete
+- (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (BOOL) torrentDelete
         lib: (tr_session *) lib
 {
     self = [self initWithPath: path hash: nil torrentStruct: NULL lib: lib
-            publicTorrent: torrentDelete != TORRENT_FILE_DEFAULT ? [NSNumber numberWithBool: torrentDelete == TORRENT_FILE_SAVE] : nil
-            publicTorrentLocation: path
             downloadFolder: location
             useIncompleteFolder: nil incompleteFolder: nil
@@ -93 +88 @@
     if (self)
     {
-        //if the public and private torrent files are the same, then there is no public torrent
-        if ([[self torrentLocation] isEqualToString: path])
-        {
-            fPublicTorrent = NO;
-            [fPublicTorrentLocation release];
-            fPublicTorrentLocation = nil;
-        }
-        else if (!fPublicTorrent)
+        if (torrentDelete && [[self torrentLocation] isEqualToString: path])
             [Torrent trashFile: path];
-        else;
     }
     return self;
@@ -110 +97 @@
 {
     self = [self initWithPath: nil hash: nil torrentStruct: torrentStruct lib: lib
-            publicTorrent: [NSNumber numberWithBool: NO] publicTorrentLocation: nil
             downloadFolder: location
             useIncompleteFolder: nil incompleteFolder: nil
@@ -123 +109 @@
                 hash: [history objectForKey: @"TorrentHash"]
                 torrentStruct: NULL lib: lib
-                publicTorrent: [history objectForKey: @"PublicCopy"]
-                publicTorrentLocation: [history objectForKey: @"TorrentPath"]
                 downloadFolder: [history objectForKey: @"DownloadFolder"]
                 useIncompleteFolder: [history objectForKey: @"UseIncompleteFolder"]
@@ -174 +158 @@
                     [self torrentLocation], @"InternalTorrentPath",
                     [self hashString], @"TorrentHash",
-                    [NSNumber numberWithBool: fPublicTorrent], @"PublicCopy",
                     fDownloadFolder, @"DownloadFolder",
                     [NSNumber numberWithBool: fUseIncompleteFolder], @"UseIncompleteFolder",
@@ -184 +167 @@
     if (fIncompleteFolder)
         [history setObject: fIncompleteFolder forKey: @"IncompleteFolder"];
-
-    if (fPublicTorrent)
-        [history setObject: [self publicTorrentLocation] forKey: @"TorrentPath"];
         
     return history;
@@ -206 +186 @@
     [fDownloadFolder release];
     [fIncompleteFolder release];
-    
-    [fPublicTorrentLocation release];
     
     [fIcon release];
@@ -464 +442 @@
 }
 
-- (void) revealPublicTorrent
-{
-    if (fPublicTorrent)
-        [[NSWorkspace sharedWorkspace] selectFile: fPublicTorrentLocation inFileViewerRootedAtPath: nil];
+#warning should be somewhere else?
++ (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]);
+    }
 }
 
@@ -473 +460 @@
 {
     tr_torrentDeleteLocalData(fHandle, trashDataFile);
-}
-
-- (void) trashTorrent
-{
-    if (fPublicTorrent)
-    {
-        [Torrent trashFile: fPublicTorrentLocation];
-        [fPublicTorrentLocation release];
-        fPublicTorrentLocation = nil;
-        
-        fPublicTorrent = NO;
-    }
 }
 
@@ -879 +854 @@
 }
 
-- (NSString *) publicTorrentLocation
-{
-    return fPublicTorrentLocation;
-}
-
 - (NSString *) dataLocation
 {
     return [[self downloadFolder] stringByAppendingPathComponent: [self name]];
-}
-
-- (BOOL) publicTorrent
-{
-    return fPublicTorrent;
 }
 
@@ -1596 +1561 @@
 
 - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
-        publicTorrent: (NSNumber *) publicTorrent publicTorrentLocation: (NSString *) publicTorrentLoc
         downloadFolder: (NSString *) downloadFolder
         useIncompleteFolder: (NSNumber *) useIncompleteFolder incompleteFolder: (NSString *) incompleteFolder
@@ -1606 +1570 @@
     
     fDefaults = [NSUserDefaults standardUserDefaults];
-
-    fPublicTorrent = publicTorrentLoc && (publicTorrent ? [publicTorrent boolValue] : ![fDefaults boolForKey: @"DeleteOriginalTorrent"]);
-    if (fPublicTorrent)
-        fPublicTorrentLocation = [publicTorrentLoc retain];
     
     fDownloadFolder = downloadFolder ? downloadFolder : [fDefaults stringForKey: @"DownloadFolder"];
@@ -1953 +1913 @@
 }
 
-+ (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) setTimeMachineExclude: (BOOL) exclude forPath: (NSString *) path
 {