Changeset 961

Timestamp:

Sep 29, 2006, 5:30:36 AM (16 years ago)

Author:

livings124

Message:

Torrents that have errors aren't counted in the queue, and when a torrent encounters an error the next torrent in the queue will start (even though that torrent might still be active).

Location:

trunk/macosx

Files:

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

trunk/macosx/Controller.m

@@ -1421 +1421 @@
         if ([torrent isActive])
         {
-            if (![torrent isSeeding])
+            if (![torrent isSeeding] && ![torrent isError])
             {
                 desiredActive--;
@@ -1508 +1508 @@
     Torrent * torrent;
     while ((torrent = [enumerator nextObject]))
-        if ([torrent isActive] && ![torrent isSeeding])
+        if ([torrent isActive] && ![torrent isSeeding] && ![torrent isError])
         {
             desiredActive--;

trunk/macosx/Torrent.h

@@ -50 +50 @@
     int     fStopRatioSetting;
     float   fRatioLimit;
-    BOOL    fFinishedSeeding, fWaitToStart;
+    BOOL    fFinishedSeeding, fWaitToStart, fError;
     
     int fOrderValue;

trunk/macosx/Torrent.m

@@ -262 +262 @@
     }
     
-    if( fStat->error & TR_ETRACKER )
-        [fStatusString setString: [@"Error: " stringByAppendingString:
-                        [NSString stringWithUTF8String: fStat->trackerError]]];
+    if (fStat->error & TR_ETRACKER)
+    {
+        [fStatusString setString: [@"Error: " stringByAppendingString: [NSString stringWithUTF8String: fStat->trackerError]]];
+        if (!fError && [self isActive])
+        {
+            fError = YES;
+            if (![self isSeeding])
+                [[NSNotificationCenter defaultCenter] postNotificationName: @"StoppedDownloading" object: self];
+        }
+    }
+    else
+    {
+        if (fError)
+            fError = NO;
+    }
 
     if ([self isActive])
@@ -330 +342 @@
 - (void) stopTransfer
 {
+    fError = NO;
+    
     if ([self isActive])
     {
@@ -431 +445 @@
     NSLog(@"Volume: %@", volume);
     NSLog(@"Remaining disk space: %qu (%@)", remainingSpace, [NSString stringForFileSize: remainingSpace]);
-    NSLog(@"Progress: %f", [self progress]);
-    NSLog(@"Torrent total size: %qu (%@)", [self size], [NSString stringForFileSize: [self size]]);
     NSLog(@"Torrent remaining size: %qu (%@)", torrentRemaining, [NSString stringForFileSize: torrentRemaining]);
     
@@ -791 +803 @@
     fWaitToStart = waitToStart ? [waitToStart boolValue] : [fDefaults boolForKey: @"AutoStartDownload"];
     fOrderValue = orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1;
+    fError = NO;
     
     NSString * fileType = fInfo->multifile ? NSFileTypeForHFSTypeCode('fldr') : [[self name] pathExtension];