Changeset 6141

Timestamp:

Jun 11, 2008, 4:28:33 PM (15 years ago)

Author:

livings124

Message:

store the completed pieces of the pieces bar as an index set

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• macosx/Controller.m (modified) (1 diff)
• macosx/Torrent.h (modified) (2 diffs)
• macosx/Torrent.m (modified) (2 diffs)
• macosx/TorrentCell.m (modified) (4 diffs)

trunk/NEWS

@@ -14 +14 @@
    + Option to only show the add window when manually adding transfers
    + Status strings are toggled from the action button (they are no longer clickable)
-   + Colors in pieces bar and pieces view more accurately reflect their corresponding values
+   + Colors in pieces bar and pieces box more accurately reflect their corresponding values
 - GTK+
    + Add preferences options to inhibit hibernation and to toggle the tray icon

trunk/macosx/Controller.m

@@ -2004 +2004 @@
     enumerator = [previousTorrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
-        [torrent setPreviousAmountFinished: NULL];
+        [torrent setPreviousFinishedPieces: nil];
     
     //place torrents into groups

trunk/macosx/Torrent.h

@@ -58 +58 @@
     NSArray * fFileList;
     
-    float * fPreviousFinishedPieces;
-    NSDate * fFinishedPiecesDate;
+    NSIndexSet * fPreviousFinishedIndexes;
+    NSDate * fPreviousFinishedIndexesDate;
     
     float fRatioLimit;
@@ -88 +88 @@
 - (void) getAvailability: (int8_t *) tab size: (int) size;
 - (void) getAmountFinished: (float *) tab size: (int) size;
-- (float *) getPreviousAmountFinished;
--(void) setPreviousAmountFinished: (float *) tab;
+- (NSIndexSet *) previousFinishedPieces;
+-(void) setPreviousFinishedPieces: (NSIndexSet *) indexes;
 
 - (void) update;

trunk/macosx/Torrent.m

@@ -169 +169 @@
         tr_torrentFilesFree(fFileStat, [self fileCount]);
     
-    tr_free(fPreviousFinishedPieces);
-    [fFinishedPiecesDate release];
+    [fPreviousFinishedIndexes release];
+    [fPreviousFinishedIndexesDate release];
     
     [fNameString release];
@@ -240 +240 @@
 }
 
-- (float *) getPreviousAmountFinished
-{
-    //if the torrent hasn't been seen in a bit, and therefore hasn't been refreshed, return NULL
-    if (fFinishedPiecesDate && [fFinishedPiecesDate timeIntervalSinceNow] > -2.0)
-        return fPreviousFinishedPieces;
+- (NSIndexSet *) previousFinishedPieces
+{
+    //if the torrent hasn't been seen in a bit, and therefore hasn't been refreshed, return nil
+    if (fPreviousFinishedIndexesDate && [fPreviousFinishedIndexesDate timeIntervalSinceNow] > -2.0)
+        return fPreviousFinishedIndexes;
     else
-        return NULL;
-}
-
--(void) setPreviousAmountFinished: (float *) tab
-{
-    tr_free(fPreviousFinishedPieces);
-    fPreviousFinishedPieces = tab;
-    
-    [fFinishedPiecesDate release];
-    fFinishedPiecesDate = tab != NULL ? [[NSDate alloc] init] : nil;
+        return nil;
+}
+
+-(void) setPreviousFinishedPieces: (NSIndexSet *) indexes
+{
+    [fPreviousFinishedIndexes release];
+    fPreviousFinishedIndexes = [indexes retain];
+    
+    [fPreviousFinishedIndexesDate release];
+    fPreviousFinishedIndexesDate = indexes != nil ? [[NSDate alloc] init] : nil;
 }
 

trunk/macosx/TorrentCell.m

@@ -590 +590 @@
     else
     {
-        [[self representedObject] setPreviousAmountFinished: NULL];
+        [[self representedObject] setPreviousFinishedPieces: nil];
         
         [self drawRegularBar: barRect];
@@ -736 +736 @@
     
     int pieceCount = MIN([torrent pieceCount], MAX_PIECES);
-    float * piecesPercent = malloc(pieceCount * sizeof(float)),
-        * previousPiecePercent = [torrent getPreviousAmountFinished];
+    float * piecesPercent = malloc(pieceCount * sizeof(float));
     [torrent getAmountFinished: piecesPercent size: pieceCount];
     
@@ -744 +743 @@
                                     isPlanar: NO colorSpaceName: NSCalibratedRGBColorSpace bytesPerRow: 0 bitsPerPixel: 0];
     
+    NSIndexSet * previousFinishedIndexes = [torrent previousFinishedPieces];
+    NSMutableIndexSet * finishedIndexes = [NSMutableIndexSet indexSet];
+    
     int i;
     for (i = 0; i < pieceCount; i++)
     {
         NSColor * pieceColor;
-        if (piecesPercent[i] == 1.0 && previousPiecePercent != NULL && previousPiecePercent[i] < 1.0)
-            pieceColor = [NSColor orangeColor];
+        if (piecesPercent[i] == 1.0)
+        {
+            if (previousFinishedIndexes && ![previousFinishedIndexes containsIndex: i])
+                pieceColor = [NSColor orangeColor];
+            else
+                pieceColor = fBluePieceColor;
+            [finishedIndexes addIndex: i];
+        }
         else
             pieceColor = [[NSColor whiteColor] blendedColorWithFraction: piecesPercent[i] ofColor: fBluePieceColor];
@@ -757 +765 @@
     }
     
-    [torrent setPreviousAmountFinished: piecesPercent]; //holds onto piecePercent, so no need to release it here
+    free(piecesPercent);
+    
+    [torrent setPreviousFinishedPieces: [finishedIndexes count] > 0 ? finishedIndexes : nil]; //don't bother saving if none are complete
     
     //actually draw image
     [bitmap drawInRect: barRect];
-    
     [bitmap release];
 }