Changeset 2010

Timestamp:

Jun 9, 2007, 8:44:55 PM (15 years ago)

Author:

livings124

Message:

getting closer to working file selection gui...now it's a bit more dynamic and accurate, might be a bit slower in theory, though

Location:

branches/file_selection

Files:

• libtransmission/torrent.c (modified) (1 diff)
• macosx/FileBrowserCell.h (modified) (1 diff)
• macosx/FileBrowserCell.m (modified) (2 diffs)
• macosx/InfoWindowController.m (modified) (6 diffs)
• macosx/Torrent.h (modified) (2 diffs)
• macosx/Torrent.m (modified) (10 diffs)

branches/file_selection/libtransmission/torrent.c

@@ -600 +600 @@
 }
 
+/* !!!!!!!!!! ADD ABILITY TO DO FOR INDIVIDUAL FILES !!!!!!!!!!!!!! */
 float * tr_torrentCompletion( tr_torrent_t * tor )
 {

branches/file_selection/macosx/FileBrowserCell.h

@@ -27 +27 @@
 @interface FileBrowserCell : NSBrowserCell
 {
+    float fPercent;
 }
 
+- (void) setProgress: (float) progress;
+
 @end

branches/file_selection/macosx/FileBrowserCell.m

@@ -40 +40 @@
     [image setScalesWhenResized: YES];
     [super setImage: image];
+}
+
+- (void) setProgress: (float) progress
+{
+    fPercent = progress * 100.0;
 }
 
@@ -86 +91 @@
         
         NSString * statusString = [NSString stringWithFormat: NSLocalizedString(@"%.2f%% of %@",
-                                                                "Inspector -> Files tab -> file status string"),
-                                    100.0 * [[item objectForKey: @"Progress"] floatValue],
+                                    "Inspector -> Files tab -> file status string"), fPercent,
                                     [NSString stringForFileSize: [[item objectForKey: @"Size"] unsignedLongLongValue]]];
         

branches/file_selection/macosx/InfoWindowController.m

@@ -24 +24 @@
 
 #import "InfoWindowController.h"
+#import "FileBrowserCell.h"
 #import "StringAdditions.h"
 
@@ -429 +430 @@
 - (void) updateInfoFiles
 {
-    if ([fTorrents count] != 1)
-        return;
-    
-    if ([[fTorrents objectAtIndex: 0] updateFileProgress])
+    if ([fTorrents count] == 1)
         [fFileOutline reloadData];
 }
@@ -796 +794 @@
     
     if ([[tableColumn identifier] isEqualToString: @"Check"])
-        return [item objectForKey: @"Check"];
+        return [NSNumber numberWithInt: [[fTorrents objectAtIndex: 0] shouldDownloadItem: item]];
     else
         return item;
@@ -809 +807 @@
             return;
         
-        [cell setImage: [[item objectForKey: @"IsFolder"] boolValue] ? fFolderIcon : [item objectForKey: @"Icon"]];
+        BOOL isFolder;
+        #warning move folder icon into FileBrowserCell
+        if ((isFolder = [[item objectForKey: @"IsFolder"] boolValue]))
+            [cell setImage: fFolderIcon];
+        else
+        {
+            [cell setImage: [item objectForKey: @"Icon"]];
+            [(FileBrowserCell *)cell setProgress: [[fTorrents objectAtIndex: 0] fileProgress:
+                                                    [[item objectForKey: @"Index"] floatValue]]];
+        }
     }
     else if ([[tableColumn identifier] isEqualToString: @"Check"])
@@ -821 +828 @@
         
         [(NSButtonCell *)cell setImagePosition: NSImageOnly];
-        [cell setEnabled: [[item objectForKey: @"IsFolder"] boolValue] ? [[item objectForKey: @"Remaining"] intValue] > 0
-                                                                    : [[item objectForKey: @"Progress"] floatValue] < 1.0];
+        [cell setEnabled: [[fTorrents objectAtIndex: 0] canChangeDownloadItemCheck: item]];
     }
     else;
@@ -834 +840 @@
     
     [torrent setFileCheckState: state forFileItem: item];
-    NSMutableDictionary * topItem = [torrent resetFileCheckStateForItemParent: item];
-    
-    [fFileOutline reloadItem: topItem reloadChildren: YES];
+    [fFileOutline reloadData];
 }
 

branches/file_selection/macosx/Torrent.h

@@ -54 +54 @@
     NSMutableString * fNameString, * fProgressString, * fStatusString, * fShortStatusString, * fRemainingTimeString;
     
-    NSArray * fFileList, * fFileFlatList;
+    NSArray * fFileList;
     
     int     fUploadLimit, fDownloadLimit;
@@ -202 +202 @@
 - (NSArray *) fileList;
 - (int) fileCount;
-- (BOOL) updateFileProgress;
-- (void) setFileCheckState: (int) state forFileItem: (NSMutableDictionary *) item;
-- (NSMutableDictionary *) resetFileCheckStateForItemParent: (NSMutableDictionary *) originalChild;
+- (float) fileProgress: (int) index;
+- (int) shouldDownloadItem: (NSDictionary *) item;
+- (BOOL) canChangeDownloadItemCheck: (NSDictionary *) item;
+- (void) setFileCheckState: (int) state forFileItem: (NSDictionary *) item;
 
 - (NSDate *) dateAdded;

branches/file_selection/macosx/Torrent.m

@@ -49 +49 @@
 - (void) createFileListShouldDownload: (NSArray *) filesShouldDownload priorities: (NSArray *) filePriorities;
 - (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings
-        withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
-        fileSize: (uint64_t) size state: (int) state flatList: (NSMutableArray *) flatList;
+            withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
+            fileSize: (uint64_t) size index: (int) index;
 - (NSImage *) advancedBar;
 - (void) trashFile: (NSString *) path;
@@ -175 +175 @@
                     nil];
     
-    NSMutableArray * filesShouldDownload = [NSMutableArray arrayWithCapacity: [fFileFlatList count]];
-    NSEnumerator * enumerator = [fFileFlatList objectEnumerator];
-    NSDictionary * file;
-    while ((file = [enumerator nextObject]))
-        [filesShouldDownload addObject: [file objectForKey: @"Check"]];
+    //set file priorities
+    int fileCount = [self fileCount];
+    NSMutableArray * filesShouldDownload = [NSMutableArray arrayWithCapacity: fileCount];
+    
+    tr_priority_t * priorities = tr_torrentGetFilePriorities(fHandle);
+    int i;
+    for (i = 0; i < fileCount; i++)
+        [filesShouldDownload addObject: [NSNumber numberWithInt: priorities[i]]];
+    free(priorities);
     [history setObject: filesShouldDownload forKey: @"FilesShouldDownload"];
     
@@ -237 +241 @@
         
         [fFileList release];
-        [fFileFlatList release];
         
         [fBitmap release];
@@ -1303 +1306 @@
 }
 
-- (BOOL) updateFileProgress
-{
-    BOOL change = NO;
+- (float) fileProgress: (int) index
+{
+    #warning redo for single
     float * progress = tr_torrentCompletion(fHandle);
-    NSNumber * progressNum;
-    NSMutableDictionary * item, * dict;
-    
-    int i, fileCount = [self fileCount];
-    for (i = 0; i < fileCount; i++)
-    {
-        if (!(progressNum = [[fFileFlatList objectAtIndex: i] objectForKey: @"Progress"])
-                || [progressNum floatValue] != progress[i])
-        {
-            item = [fFileFlatList objectAtIndex: i];
-            [item setObject: [NSNumber numberWithFloat: progress[i]] forKey: @"Progress"];
-            change = YES;
-            
-            if (progress[i] == 1.0)
-            {
-                dict = item;
-                while ((dict = [dict objectForKey: @"Parent"]))
-                    [dict setObject: [NSNumber numberWithInt: [[dict objectForKey: @"Remaining"] intValue]-1]
-                            forKey: @"Remaining"];
-                
-                [item setObject: [NSNumber numberWithInt: NSOnState] forKey: @"Check"];
-                [self resetFileCheckStateForItemParent: item];
-            }
-        }
-    }
-    
+    float fileProgress = progress[index];
     free(progress);
     
-    return change;
-}
-
-- (void) setFileCheckState: (int) state forFileItem: (NSMutableDictionary *) item
-{
-    [item setObject: [NSNumber numberWithInt: state] forKey: @"Check"];
-    
+    return fileProgress;
+}
+
+- (int) shouldDownloadItem: (NSDictionary *) item
+{
+    if ([[item objectForKey: @"IsFolder"] boolValue])
+    {
+        #warning do
+        return NSOnState;
+    }
+    else
+    {
+        int index = [[item objectForKey: @"Index"] intValue];
+        return tr_torrentGetFilePriority(fHandle, index) != TR_PRI_DND || [self fileProgress: index] >= 1.0
+                ? NSOnState : NSOffState;
+    }
+}
+
+- (BOOL) canChangeDownloadItemCheck: (NSDictionary *) item
+{
+    if ([[item objectForKey: @"IsFolder"] boolValue])
+    {
+        #warning do
+        return YES;
+    }
+    else
+    {
+        #warning why is this happening?
+        float progress = [self fileProgress: [[item objectForKey: @"Index"] intValue]];
+        if (progress < 1.0)
+            NSLog(@"hi %f", progress);
+        else
+            NSLog(@"asdgagh %f", progress);
+        return [self fileProgress: [[item objectForKey: @"Index"] intValue]] < 1.0;
+    }
+}
+
+- (void) setFileCheckState: (int) state forFileItem: (NSDictionary *) item
+{
     if (![[item objectForKey: @"IsFolder"] boolValue])
-        return;
-    
-    NSMutableDictionary * child;
-    NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
-    while ((child = [enumerator nextObject]))
-        if (state != [[child objectForKey: @"Check"] intValue])
+        tr_torrentSetFilePriority(fHandle, [[item objectForKey: @"Index"] intValue],
+                                    state == NSOnState ? TR_PRI_NORMAL : TR_PRI_DND);
+    else
+    {
+        NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
+        NSDictionary * child;
+        while ((child = [enumerator nextObject]))
             [self setFileCheckState: state forFileItem: child];
-}
-
-- (NSMutableDictionary *) resetFileCheckStateForItemParent: (NSMutableDictionary *) originalChild
-{
-    NSMutableDictionary * item;
-    if (!(item = [originalChild objectForKey: @"Parent"]))
-        return originalChild;
-    
-    int state = INVALID;
-    
-    NSMutableDictionary * child;
-    NSEnumerator * enumerator = [[item objectForKey: @"Children"] objectEnumerator];
-    while ((child = [enumerator nextObject]))
-    {
-        if (state == INVALID)
-        {
-            state = [[child objectForKey: @"Check"] intValue];
-            if (state == NSMixedState)
-                break;
-        }
-        else if (state != [[child objectForKey: @"Check"] intValue])
-        {
-            state = NSMixedState;
-            break;
-        }
-        else;
-    }
-    
-    if (state != [[item objectForKey: @"Check"] intValue])
-    {
-        [item setObject: [NSNumber numberWithInt: state] forKey: @"Check"];
-        return [self resetFileCheckStateForItemParent: item];
-    }
-    else
-        return originalChild;
+    }
 }
 
@@ -1575 +1552 @@
     int shouldDownload;
     
-    NSMutableArray * fileList = [[NSMutableArray alloc] init],
-                    * fileFlatList = [[NSMutableArray alloc] initWithCapacity: count];
+    NSMutableArray * fileList = [[NSMutableArray alloc] init];
     
     for (i = 0; i < count; i++)
@@ -1590 +1566 @@
         else
             path = @"";
+        
+        [self insertPath: pathComponents forSiblings: fileList withParent: nil previousPath: path
+                fileSize: file->length index: i];
+        [pathComponents autorelease];
         
         shouldDownload = filesShouldDownload ? [[filesShouldDownload objectAtIndex: i] intValue] : NSOnState;
         #warning add priorities
         tr_torrentSetFilePriority(fHandle, i, shouldDownload == NSOnState ? TR_PRI_NORMAL : TR_PRI_DND);
-        
-        [self insertPath: pathComponents forSiblings: fileList withParent: nil previousPath: path
-                fileSize: file->length state: shouldDownload flatList: fileFlatList];
-        [pathComponents autorelease];
     }
     
     fFileList = [[NSArray alloc] initWithArray: fileList];
     [fileList release];
-    fFileFlatList = [[NSArray alloc] initWithArray: fileFlatList];
-    [fileFlatList release];
 }
 
 - (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings
         withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
-        fileSize: (uint64_t) size state: (int) state flatList: (NSMutableArray *) flatList
+        fileSize: (uint64_t) size index: (int) index
 {
     NSString * name = [components objectAtIndex: 0];
@@ -1634 +1608 @@
         {
             [dict setObject: [NSMutableArray array] forKey: @"Children"];
-            [dict setObject: [NSNumber numberWithInt: 1] forKey: @"Remaining"];
         }
         else
         {
-            [flatList addObject: dict];
+            [dict setObject: [NSNumber numberWithInt: index] forKey: @"Index"];
             [dict setObject: [NSNumber numberWithUnsignedLongLong: size] forKey: @"Size"];
             [dict setObject: [[NSWorkspace sharedWorkspace] iconForFileType: [name pathExtension]] forKey: @"Icon"];
@@ -1645 +1618 @@
         if (parent)
             [dict setObject: parent forKey: @"Parent"];
-        [dict setObject: [NSNumber numberWithInt: state] forKey: @"Check"];
     }
     else
@@ -1651 +1623 @@
         if (isFolder)
             [dict setObject: [NSNumber numberWithInt: [[dict objectForKey: @"Remaining"] intValue]+1] forKey: @"Remaining"];
-        
-        int dictState = [[dict objectForKey: @"Check"] intValue];
-        if (dictState != NSMixedState && dictState != state)
-            [dict setObject: [NSNumber numberWithInt: NSMixedState] forKey: @"Check"];
     }
     
@@ -1661 +1629 @@
         [components removeObjectAtIndex: 0];
         [self insertPath: components forSiblings: [dict objectForKey: @"Children"]
-            withParent: dict previousPath: currentPath fileSize: size state: state flatList: flatList];
+            withParent: dict previousPath: currentPath fileSize: size index: index];
     }
 }