Changeset 9348

Timestamp:

Oct 21, 2009, 10:20:43 PM (13 years ago)

Author:

livings124

Message:

update the time machine exclude list when the file is moved through rpc

Location:

trunk/macosx

Files:

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

trunk/macosx/Controller.h

@@ -266 +266 @@
 - (void) rpcStartedStoppedTorrent: (Torrent *) torrent;
 - (void) rpcChangedTorrent: (Torrent *) torrent;
+- (void) rpcMovedTorrent: (Torrent *) torrent;
 
 @end

trunk/macosx/Controller.m

@@ -4250 +4250 @@
             break;
         
+        case TR_RPC_TORRENT_MOVED:
+            [self performSelectorOnMainThread: @selector(rpcMovedTorrent:) withObject: torrent waitUntilDone: NO];
+            break;
+        
         case TR_RPC_SESSION_CHANGED:
             [fPrefsController performSelectorOnMainThread: @selector(rpcUpdatePrefs) withObject: nil waitUntilDone: NO];
@@ -4309 +4313 @@
 }
 
+- (void) rpcMovedTorrent: (Torrent *) torrent
+{
+    [torrent update];
+    [torrent updateTimeMachineExclude];
+    
+    if ([[fTableView selectedTorrents] containsObject: torrent])
+        [fInfoController updateInfoStats];
+    
+    [torrent release];
+}
+
 @end

trunk/macosx/Torrent.h

@@ -223 +223 @@
 - (BOOL) isStalled;
 
+- (void) updateTimeMachineExclude;
+
 - (NSInteger) stateSortKey;
 - (NSString *) trackerSortKey;

trunk/macosx/Torrent.m

@@ -47 +47 @@
 - (NSString *) etaString;
 
-- (void) updateTimeMachineExclude;
 - (void) setTimeMachineExclude: (BOOL) exclude forPath: (NSString *) path;
 
@@ -1456 +1455 @@
 {
     return fStalled;
+}
+
+- (void) updateTimeMachineExclude
+{
+    NSString * newLocation = [self dataLocation];
+    
+    if (fTimeMachineExclude && newLocation && [fTimeMachineExclude isEqualToString: newLocation] && ![self allDownloaded])
+        return;
+    
+    if (fTimeMachineExclude)
+    {
+        [self setTimeMachineExclude: NO forPath: fTimeMachineExclude];
+        [fTimeMachineExclude release];
+        fTimeMachineExclude = nil;
+    }
+    
+    if (newLocation && ![self allDownloaded])
+    {
+        [self setTimeMachineExclude: YES forPath: newLocation];
+        [fTimeMachineExclude release];
+        fTimeMachineExclude = [newLocation retain];
+    }
 }
 
@@ -1735 +1756 @@
 }
 
-- (void) updateTimeMachineExclude
-{
-    NSString * newLocation = [self dataLocation];
-    
-    if (fTimeMachineExclude && newLocation && [fTimeMachineExclude isEqualToString: newLocation] && ![self allDownloaded])
-        return;
-    
-    if (fTimeMachineExclude)
-    {
-        [self setTimeMachineExclude: NO forPath: fTimeMachineExclude];
-        [fTimeMachineExclude release];
-        fTimeMachineExclude = nil;
-    }
-    
-    if (newLocation && ![self allDownloaded])
-    {
-        [self setTimeMachineExclude: YES forPath: newLocation];
-        [fTimeMachineExclude release];
-        fTimeMachineExclude = [newLocation retain];
-    }
-}
-
 - (void) setTimeMachineExclude: (BOOL) exclude forPath: (NSString *) path
 {