Changeset 5282 for trunk/macosx/Torrent.m

Timestamp:

Mar 18, 2008, 3:20:27 AM (14 years ago)

Author:

livings124

Message:

speed up check for enough remaining space by first determining if there is enough space to download what's needed ignoring preallocation

File:

• trunk/macosx/Torrent.m (modified) (1 diff)

trunk/macosx/Torrent.m

@@ -548 +548 @@
         uint64_t remainingSpace = [[systemAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue], neededSpace = 0;
         
-        [self updateFileStat];
-        
-        //determine amount needed
-        int i;
-        for (i = 0; i < [self fileCount]; i++)
+        //if the size left is less then remaining space, then there is enough space regardless of preallocation
+        if (remainingSpace < [self sizeLeft])
         {
-            if (tr_torrentGetFileDL(fHandle, i))
+            [self updateFileStat];
+            
+            //determine amount needed
+            int i;
+            for (i = 0; i < [self fileCount]; i++)
             {
-                tr_file * file = &fInfo->files[i];
+                if (tr_torrentGetFileDL(fHandle, i))
+                {
+                    tr_file * file = &fInfo->files[i];
+                    
+                    neededSpace += file->length;
+                    
+                    NSString * path = [downloadFolder stringByAppendingPathComponent: [NSString stringWithUTF8String: file->name]];
+                    NSDictionary * fileAttributes = onLeopard ? [fileManager attributesOfItemAtPath: path error: NULL]
+                                                        : [fileManager fileAttributesAtPath: path traverseLink: NO];
+                    if (fileAttributes)
+                        neededSpace -= [[fileAttributes objectForKey: NSFileSize] unsignedLongLongValue];
+                }
+            }
+            
+            if (remainingSpace < neededSpace)
+            {
+                NSAlert * alert = [[NSAlert alloc] init];
+                [alert setMessageText: [NSString stringWithFormat:
+                                        NSLocalizedString(@"Not enough remaining disk space to download \"%@\" completely.",
+                                            "Torrent file disk space alert -> title"), [self name]]];
+                [alert setInformativeText: [NSString stringWithFormat: NSLocalizedString(@"The transfer will be paused."
+                                            " Clear up space on %@ or deselect files in the torrent inspector to continue.",
+                                            "Torrent file disk space alert -> message"), volumeName]];
+                [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file disk space alert -> button")];
+                [alert addButtonWithTitle: NSLocalizedString(@"Download Anyway", "Torrent file disk space alert -> button")];
                 
-                neededSpace += file->length;
+                if (onLeopard)
+                    [alert setShowsSuppressionButton: YES];
+                else
+                    [alert addButtonWithTitle: NSLocalizedString(@"Always Download", "Torrent file disk space alert -> button")];
+
+                NSInteger result = [alert runModal];
+                if ((onLeopard ? [[alert suppressionButton] state] == NSOnState : result == NSAlertThirdButtonReturn))
+                    [fDefaults setBool: NO forKey: @"WarningRemainingSpace"];
+                [alert release];
                 
-                NSString * path = [downloadFolder stringByAppendingPathComponent: [NSString stringWithUTF8String: file->name]];
-                NSDictionary * fileAttributes = onLeopard ? [fileManager attributesOfItemAtPath: path error: NULL]
-                                                    : [fileManager fileAttributesAtPath: path traverseLink: NO];
-                if (fileAttributes)
-                    neededSpace -= [[fileAttributes objectForKey: NSFileSize] unsignedLongLongValue];
+                return result != NSAlertFirstButtonReturn;
             }
-        }
-        
-        if (remainingSpace < neededSpace)
-        {
-            NSAlert * alert = [[NSAlert alloc] init];
-            [alert setMessageText: [NSString stringWithFormat:
-                                    NSLocalizedString(@"Not enough remaining disk space to download \"%@\" completely.",
-                                        "Torrent file disk space alert -> title"), [self name]]];
-            [alert setInformativeText: [NSString stringWithFormat: NSLocalizedString(@"The transfer will be paused."
-                                        " Clear up space on %@ or deselect files in the torrent inspector to continue.",
-                                        "Torrent file disk space alert -> message"), volumeName]];
-            [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file disk space alert -> button")];
-            [alert addButtonWithTitle: NSLocalizedString(@"Download Anyway", "Torrent file disk space alert -> button")];
-            
-            if (onLeopard)
-                [alert setShowsSuppressionButton: YES];
-            else
-                [alert addButtonWithTitle: NSLocalizedString(@"Always Download", "Torrent file disk space alert -> button")];
-
-            NSInteger result = [alert runModal];
-            if ((onLeopard ? [[alert suppressionButton] state] == NSOnState : result == NSAlertThirdButtonReturn))
-                [fDefaults setBool: NO forKey: @"WarningRemainingSpace"];
-            [alert release];
-            
-            return result != NSAlertFirstButtonReturn;
         }
     }