Changeset 9350

Timestamp:

Oct 21, 2009, 11:13:02 PM (13 years ago)

Author:

livings124

Message:

more efficient time machine location check

File:

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

trunk/macosx/Torrent.m

@@ -254 +254 @@
     
     //when the data first appears, update time machine exclusion
-    #warning perhaps always check to get if the file is moved through rpc
     if (!fTimeMachineExclude)
         [self updateTimeMachineExclude];
@@ -481 +480 @@
         [alert release];
     }
+    
+    [self updateTimeMachineExclude];
 }
 
@@ -1460 +1461 @@
 - (void) updateTimeMachineExclude
 {
-    NSString * newLocation = [self dataLocation];
-    
-    if (fTimeMachineExclude && newLocation && [fTimeMachineExclude isEqualToString: newLocation] && ![self allDownloaded])
-        return;
+    NSString * newLocation = nil;
+    BOOL checkedNewLocation = NO;
     
     if (fTimeMachineExclude)
     {
+        //long-winded way of saying "return if the locations are the same and not all is downloaded"
+        if (![self allDownloaded])
+        {
+            newLocation = [self dataLocation];
+            checkedNewLocation = YES;
+            
+            if ([fTimeMachineExclude isEqualToString: newLocation])
+                return;
+        }
+        
         [self setTimeMachineExclude: NO forPath: fTimeMachineExclude];
         [fTimeMachineExclude release];
@@ -1472 +1481 @@
     }
     
-    if (newLocation && ![self allDownloaded])
-    {
-        [self setTimeMachineExclude: YES forPath: newLocation];
-        [fTimeMachineExclude release];
-        fTimeMachineExclude = [newLocation retain];
+    if (![self allDownloaded])
+    {
+        if (!checkedNewLocation)
+        {
+            newLocation = [self dataLocation];
+            checkedNewLocation = YES;
+        }
+        
+        if (newLocation)
+        {
+            [self setTimeMachineExclude: YES forPath: newLocation];
+            [fTimeMachineExclude release];
+            fTimeMachineExclude = [newLocation retain];
+        }
     }
 }
@@ -1716 +1734 @@
     fStat = tr_torrentStat(fHandle); //don't call update yet to avoid auto-stop
     
-    BOOL canMove;
     switch ([status intValue])
     {