Changeset 2438

Timestamp:

Jul 19, 2007, 10:12:23 PM (16 years ago)

Author:

livings124

Message:

when checking remaining space, factor in preallocated space (but for now don't factor in non-selected files)

Location:

trunk/macosx

Files:

• English.lproj/Localizable.strings (modified) (1 diff)
• Torrent.m (modified) (2 diffs)

trunk/macosx/English.lproj/Localizable.strings

@@ -512 +512 @@
 
 /* Torrent file disk space alert -> message */
-"The transfer will be paused. Clear up space on %@ to continue." = "The transfer will be paused. Clear up space on %@ to continue.";
+"The transfer will be paused. Clear up space on %@ or deselect files in the torrent inspector to continue." = "The transfer will be paused. Clear up space on %@ or deselect files in the torrent inspector to continue.";
 
 /* Removal confirm panel -> message part 1 */

trunk/macosx/Torrent.m

@@ -808 +808 @@
     if ((volumeName = [[[NSFileManager defaultManager] componentsToDisplayForPath: [self downloadFolder]] objectAtIndex: 0]))
     {
-        NSDictionary * fsAttributes = [[NSFileManager defaultManager] fileSystemAttributesAtPath: [self downloadFolder]];
-        uint64_t remainingSpace = [[fsAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue];
-        
-        #warning add  file size to remaining space and add total size
-        if (remainingSpace <= fStat->left)
+        NSDictionary * systemAttributes = [[NSFileManager defaultManager] fileSystemAttributesAtPath: [self downloadFolder]];
+        uint64_t remainingSpace = [[systemAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue];
+        
+        uint64_t existingSize = 0;
+        NSDirectoryEnumerator * enumerator;
+        if (enumerator = [[NSFileManager defaultManager] enumeratorAtPath:
+                    [[self downloadFolder] stringByAppendingPathComponent: [self name]]])
+        {
+            NSDictionary * fileAttributes; 
+            while ([enumerator nextObject])
+            {
+                fileAttributes = [enumerator fileAttributes];
+                if (![[fileAttributes objectForKey: NSFileType] isEqualTo: NSFileTypeDirectory])
+                    existingSize += [[fileAttributes objectForKey: NSFileSize] unsignedLongLongValue];
+            }
+        }
+        
+        #warning factor in checked files
+        if (remainingSpace + existingSize <= [self size])
         {
             NSAlert * alert = [[NSAlert alloc] init];
@@ -818 +832 @@
                                     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 %@ to continue.",
-                                                "Torrent file disk space alert -> message"), volumeName]];
+            [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")];