Changeset 1012 for trunk/macosx/Controller.m

Timestamp:

Oct 16, 2006, 2:35:42 AM (16 years ago)

Author:

livings124

Message:

Don't auto-import torrents after they have been auto-imported. Useful for removing a transfer without it instantly being re-added.

File:

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

trunk/macosx/Controller.m

@@ -114 +114 @@
     [fFilterType release];
     
+    if (fAutoImportedNames)
+        [fAutoImportedNames release];
+    
     tr_close(fLib);
     [super dealloc];
@@ -321 +324 @@
                     name: @"AutoSpeedLimitChange" object: nil];
     
-    [nc addObserver: self selector: @selector(checkAutoImportDirectory)
+    [nc addObserver: self selector: @selector(changeAutoImport)
                     name: @"AutoImportSettingChange" object: nil];
     
@@ -1559 +1562 @@
 }
 
+- (void) changeAutoImport
+{
+    if (fAutoImportedNames)
+    {
+        [fAutoImportedNames release];
+        fAutoImportedNames = nil;
+    }
+    
+    if ([fDefaults boolForKey: @"AutoImport"])
+        [self checkAutoImportDirectory];
+}
+
 - (void) checkAutoImportDirectory
 {
@@ -1570 +1585 @@
         return;
     
-    NSEnumerator * enumerator = [importedNames objectEnumerator];
+    //only import those that have not been imported yet
+    NSMutableArray * newNames = [importedNames mutableCopy];
+    [newNames removeObjectsInArray: fAutoImportedNames];
+    if (fAutoImportedNames)
+        [fAutoImportedNames release];
+    fAutoImportedNames = [importedNames retain];
+    
+    NSEnumerator * enumerator = [newNames objectEnumerator];
     NSString * file;
     unsigned oldCount;
     while ((file = [enumerator nextObject]))
+    {
         if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
         {
@@ -1584 +1607 @@
                     notificationName: GROWL_AUTO_ADD iconData: nil priority: 0 isSticky: NO clickContext: nil];
         }
+    }
+    
+    [newNames release];
 }