Changeset 951 for trunk/macosx/Torrent.m

Timestamp:

Sep 28, 2006, 5:17:07 PM (16 years ago)

Author:

livings124

Message:

more logging and an extra check

File:

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

trunk/macosx/Torrent.m

@@ -420 +420 @@
         return YES;
     
-    NSDictionary * fsAttributes = [[NSFileManager defaultManager] fileSystemAttributesAtPath: [self dataLocation]];
+    NSString * location = [self dataLocation],
+                * volume = [[[NSFileManager defaultManager] componentsToDisplayForPath: location] objectAtIndex: 0];
+    NSDictionary * fsAttributes = [[NSFileManager defaultManager] fileSystemAttributesAtPath: location];
     uint64_t remainingSpace = [[fsAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue],
             torrentRemaining = [self size] * (uint64_t)(1.0 - [self progress]);
     
-    NSLog(@"Volume: %@", [[[NSFileManager defaultManager] componentsToDisplayForPath: [self dataLocation]] objectAtIndex: 0]);
+    NSLog(@"Volume: %@", volume);
     NSLog(@"Remaining disk space: %qu (%@)", remainingSpace, [NSString stringForFileSize: remainingSpace]);
     NSLog(@"Torrent remaining size: %qu (%@)", torrentRemaining, [NSString stringForFileSize: torrentRemaining]);
     
-    if (remainingSpace <= torrentRemaining)
+    if (volume && remainingSpace <= torrentRemaining)
     {
         NSAlert * alert = [[NSAlert alloc] init];
@@ -434 +436 @@
                                     [self name]]];
         [alert setInformativeText: [NSString stringWithFormat:
-                        @"The transfer has been paused. Clear up space on %@ to continue.",
-                        [[[NSFileManager defaultManager] componentsToDisplayForPath: [self dataLocation]] objectAtIndex: 0]]];
+                        @"The transfer has been paused. Clear up space on %@ to continue.", volume]];
         [alert runModal];