Changeset 2021

Timestamp:

Jun 10, 2007, 4:00:44 AM (15 years ago)

Author:

livings124

Message:

add storing of priorities, although they can't be saved, viewed, or changed (fun :))

Location:

branches/file_selection/macosx

Files:

• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (11 diffs)

branches/file_selection/macosx/Torrent.h

@@ -165 +165 @@
 - (BOOL) isError;
 - (NSString *) errorMessage;
-- (BOOL) justFinished;
 
 - (NSArray *) peers;

branches/file_selection/macosx/Torrent.m

@@ -31 +31 @@
 #define BLANK_PIECE -99
 
+#define PRIORITY_LOW -1
+#define PRIORITY_NORMAL 0
+#define PRIORITY_HIGH 1
+
 static int static_lastid = 0;
 
@@ -50 +54 @@
 - (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings
             withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
-            fileSize: (uint64_t) size index: (int) index;
+            fileSize: (uint64_t) size index: (int) index priority: (int) priority;
 - (NSImage *) advancedBar;
 - (void) trashFile: (NSString *) path;
@@ -186 +190 @@
     [history setObject: filesShouldDownload forKey: @"FilesShouldDownload"];
     
-    #warning add priorities
+    NSMutableArray * filePriorities = [NSMutableArray arrayWithCapacity: fileCount];
+    #warning get priorities
+    [history setObject: filePriorities forKey: @"FilePriorities"];
+    
     if (fUseIncompleteFolder)
         [history setObject: fIncompleteFolder forKey: @"IncompleteFolder"];
@@ -301 +308 @@
     
     //notification when downloading finished
-    if ([self justFinished])
+    if (tr_getFinished(fHandle))
     {
         BOOL canMove = YES;
@@ -1124 +1131 @@
 }
 
-- (BOOL) justFinished
-{
-    return tr_getFinished(fHandle);
-}
-
 - (NSArray *) peers
 {
@@ -1350 +1352 @@
 - (void) setFileCheckState: (int) state forFileItem: (NSDictionary *) item
 {
+    #warning use index set
     if (![[item objectForKey: @"IsFolder"] boolValue])
         tr_torrentSetFilePriority(fHandle, [[item objectForKey: @"Index"] intValue],
@@ -1548 +1551 @@
     NSMutableArray * pathComponents;
     NSString * path;
-    BOOL shouldDownload;
+    int priority;
+    tr_priority_t actualPriority;
     
     NSMutableArray * fileList = [[NSMutableArray alloc] init];
@@ -1565 +1569 @@
             path = @"";
         
+        priority = filePriorities ? [[filesShouldDownload objectAtIndex: i] intValue] : PRIORITY_NORMAL;
         [self insertPath: pathComponents forSiblings: fileList withParent: nil previousPath: path
-                fileSize: file->length index: i];
+                fileSize: file->length index: i priority: priority];
         [pathComponents autorelease];
         
-        shouldDownload = filesShouldDownload ? [[filesShouldDownload objectAtIndex: i] boolValue] : YES;
-        #warning add priorities
-        tr_torrentSetFilePriority(fHandle, i, YES ? TR_PRI_NORMAL : TR_PRI_DND);
+        if (!filesShouldDownload || [[filesShouldDownload objectAtIndex: i] boolValue])
+        {
+            if (priority == PRIORITY_HIGH)
+                actualPriority = TR_PRI_HIGH;
+            else if (priority == PRIORITY_LOW)
+                actualPriority = TR_PRI_LOW;
+            else
+                actualPriority = TR_PRI_NORMAL;
+        }
+        else
+            actualPriority = TR_PRI_DND;
+        
+        tr_torrentSetFilePriority(fHandle, i, actualPriority);
     }
     
@@ -1580 +1595 @@
 - (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings
         withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
-        fileSize: (uint64_t) size index: (int) index
+        fileSize: (uint64_t) size index: (int) index priority: (int) priority
 {
     NSString * name = [components objectAtIndex: 0];
@@ -1613 +1628 @@
             [dict setObject: [NSNumber numberWithUnsignedLongLong: size] forKey: @"Size"];
             [dict setObject: [[NSWorkspace sharedWorkspace] iconForFileType: [name pathExtension]] forKey: @"Icon"];
+            [dict setObject: [NSNumber numberWithInt: priority] forKey: @"Priority"];
         }
         
@@ -1628 +1644 @@
         [components removeObjectAtIndex: 0];
         [self insertPath: components forSiblings: [dict objectForKey: @"Children"]
-            withParent: dict previousPath: currentPath fileSize: size index: index];
+            withParent: dict previousPath: currentPath fileSize: size index: index priority: priority];
     }
 }