Changeset 7892 for trunk

Timestamp:

Feb 14, 2009, 9:15:57 PM (13 years ago)

Author:

livings124

Message:

have the mac ui use libT's ratio settings (attempt 1); when seed ratio is reached in libT, set the seed ratio setting to "seed forever"

Location:

trunk

Files:

• libtransmission/peer-mgr.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/torrent.h (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Controller.m (modified) (3 diffs)
• macosx/InfoWindowController.m (modified) (4 diffs)
• macosx/PrefsController.m (modified) (3 diffs)
• macosx/Torrent.h (modified) (4 diffs)
• macosx/Torrent.m (modified) (17 diffs)

trunk/libtransmission/peer-mgr.c

@@ -998 +998 @@
                 if( ratio >= seedRatio ) {
                     tr_torrentStop( tor );
+                    
+                    /* set to no ratio limit to allow easy restarting */
+                    tr_torrentSetRatioMode( tor, TR_RATIOLIMIT_UNLIMITED );
+                    
                     fireRatioLimitHit( tor );
                 }

trunk/libtransmission/torrent.c

@@ -218 +218 @@
 tr_torrentGetSeedRatio( const tr_torrent * tor, double * ratio )
 {
-    double r = 0;
     tr_bool isLimited;
 
@@ -225 +224 @@
         case TR_RATIOLIMIT_SINGLE:
             isLimited = TRUE;
-            r = tr_torrentGetRatioLimit( tor );
+            if( ratio )
+                *ratio = tr_torrentGetRatioLimit( tor );
             break;
 
         case TR_RATIOLIMIT_GLOBAL:
             if(( isLimited = tr_sessionIsRatioLimited( tor->session )))
-                r = tr_sessionGetRatioLimit( tor->session );
+                if( ratio )
+                    *ratio = tr_sessionGetRatioLimit( tor->session );
             break;
 
@@ -238 +239 @@
     }
 
-    *ratio = r;
     return isLimited;
 }

trunk/libtransmission/torrent.h

@@ -71 +71 @@
                                               tr_direction       direction );
 
-tr_bool     tr_torrentGetSeedRatio( const tr_torrent * tor, double * ratio );
-
 
 

trunk/libtransmission/transmission.h

@@ -573 +573 @@
 double     tr_sessionGetRatioLimit        ( const tr_session  * session);
 
+tr_bool    tr_torrentGetSeedRatio         ( const tr_torrent * tor, double * ratio );
+
 double     tr_sessionGetRawSpeed          ( const tr_session  * session,
                                            tr_direction         direction );

trunk/macosx/Controller.m

@@ -202 +202 @@
         
         tr_benc settings;
-        tr_bencInitDict(&settings, 20);
+        tr_bencInitDict(&settings, 22);
         tr_sessionGetDefaultSettings(&settings);
         
@@ -232 +232 @@
         tr_bencDictAddStr(&settings, TR_PREFS_KEY_PROXY_USERNAME,  [[fDefaults stringForKey: @"ProxyUsername"] UTF8String]);
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED,  [fDefaults boolForKey: @"RPCAuthorize"]);
+        tr_bencDictAddDouble(&settings, TR_PREFS_KEY_RATIO, [fDefaults floatForKey: @"RatioLimit"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_RATIO_ENABLED, [fDefaults boolForKey: @"RatioCheck"]);
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_RPC_ENABLED,  [fDefaults boolForKey: @"RPC"]);
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_RPC_PORT,  [fDefaults integerForKey: @"RPCPort"]);
@@ -2397 +2399 @@
 {
     [fDefaults setBool: sender == fCheckRatioItem forKey: @"RatioCheck"];
+    
+    [fPrefsController applyRatioSetting: nil];
 }
 

trunk/macosx/InfoWindowController.m

@@ -606 +606 @@
     
     //set ratio view
-    if (checkRatio == NSOnState)
+    if (checkRatio == TR_RATIOLIMIT_SINGLE)
         index = OPTION_POPUP_LIMIT;
-    else if (checkRatio == NSOffState)
+    else if (checkRatio == TR_RATIOLIMIT_UNLIMITED)
         index = OPTION_POPUP_NO_LIMIT;
-    else if (checkRatio == NSMixedState)
+    else if (checkRatio == TR_RATIOLIMIT_GLOBAL)
         index = OPTION_POPUP_GLOBAL;
     else
@@ -617 +617 @@
     [fRatioPopUp setEnabled: YES];
     
-    [fRatioLimitField setHidden: checkRatio != NSOnState];
+    [fRatioLimitField setHidden: checkRatio != TR_RATIOLIMIT_SINGLE];
     if (ratioLimit != INVALID)
         [fRatioLimitField setFloatValue: ratioLimit];
@@ -1230 +1230 @@
 {
     NSInteger setting;
+    bool single = NO;
     switch ([sender indexOfSelectedItem])
     {
         case OPTION_POPUP_LIMIT:
-            setting = NSOnState;
+            setting = TR_RATIOLIMIT_SINGLE;
+            single = YES;
             break;
         case OPTION_POPUP_NO_LIMIT:
-            setting = NSOffState;
+            setting = TR_RATIOLIMIT_UNLIMITED;
             break;
         case OPTION_POPUP_GLOBAL:
-            setting = NSMixedState;
+            setting = TR_RATIOLIMIT_GLOBAL;
             break;
         default:
@@ -1248 +1250 @@
         [torrent setRatioSetting: setting];
     
-    BOOL single = setting == NSOnState;
     [fRatioLimitField setHidden: !single];
     if (single)
     {
         [fRatioLimitField selectText: self];
-        [[self window] makeKeyAndOrderFront:self];
+        [[self window] makeKeyAndOrderFront: self];
     }
     

trunk/macosx/PrefsController.m

@@ -192 +192 @@
     
     //set stop ratio
-    [self updateRatioStopField];
+    [fRatioStopField setFloatValue: [fDefaults floatForKey: @"RatioLimit"]];
     
     //set limits
@@ -569 +569 @@
 - (void) applyRatioSetting: (id) sender
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
+    //[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
+    tr_sessionSetRatioLimited(fHandle, [fDefaults boolForKey: @"RatioCheck"]);
+    tr_sessionSetRatioLimit(fHandle, [fDefaults floatForKey: @"RatioLimit"]);
 }
 
 - (void) updateRatioStopField
 {
-    if (!fHasLoaded)
-        return;
-    
-    [fRatioStopField setFloatValue: [fDefaults floatForKey: @"RatioLimit"]];
+    if (fHasLoaded)
+        [fRatioStopField setFloatValue: [fDefaults floatForKey: @"RatioLimit"]];
     
     [self applyRatioSetting: nil];
@@ -585 +585 @@
 {
     [fDefaults setFloat: [sender floatValue] forKey: @"RatioLimit"];
+    
     [self applyRatioSetting: nil];
 }

trunk/macosx/Torrent.h

@@ -28 +28 @@
 @class FileListNode;
 
-#define INVALID -99
-
 typedef enum
 {
@@ -66 +64 @@
     NSDate * fPreviousFinishedIndexesDate;
     
-    CGFloat fRatioLimit;
-    NSInteger fRatioSetting;
     BOOL fFinishedSeeding, fWaitToStart, fStalled;
     
@@ -108 +104 @@
 
 - (CGFloat) ratio;
-- (NSInteger) ratioSetting;
-- (void) setRatioSetting: (NSInteger) setting;
+- (tr_ratiolimit) ratioSetting;
+- (void) setRatioSetting: (tr_ratiolimit) setting;
 - (CGFloat) ratioLimit;
 - (void) setRatioLimit: (CGFloat) limit;
-- (CGFloat) actualStopRatio; //returns INVALID if will not stop
+- (BOOL) seedRatioSet;
 - (CGFloat) progressStopRatio;
 
@@ -181 +177 @@
 
 - (NSInteger) eta;
-- (NSInteger) etaRatio;
 
 - (CGFloat) notAvailableDesired;

trunk/macosx/Torrent.m

@@ -35 +35 @@
         downloadFolder: (NSString *) downloadFolder
         useIncompleteFolder: (NSNumber *) useIncompleteFolder incompleteFolder: (NSString *) incompleteFolder
-        ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit
         waitToStart: (NSNumber *) waitToStart
         groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers;
@@ -48 +47 @@
 - (void) completenessChange: (NSNumber *) status;
 
+- (void) ratioLimitHit;
+
 - (void) quickPause;
 - (void) endQuickPause;
 
-- (NSString *) etaString: (NSInteger) eta;
+- (NSString *) etaString;
 
 - (void) updateAllTrackers: (NSMutableArray *) trackers;
@@ -64 +65 @@
 {
     [(Torrent *)torrentData performSelectorOnMainThread: @selector(completenessChange:)
-                withObject: [[NSNumber alloc] initWithInt: status] waitUntilDone: NO];
+        withObject: [[NSNumber alloc] initWithInt: status] waitUntilDone: NO];
+}
+
+void ratioLimitHitCallback(tr_torrent * torrent, void * torrentData)
+{
+    [(Torrent *)torrentData performSelectorOnMainThread: @selector(ratioLimitHit) withObject: nil waitUntilDone: NO];
 }
 
@@ -82 +88 @@
             downloadFolder: location
             useIncompleteFolder: nil incompleteFolder: nil
-            ratioSetting: nil ratioLimit: nil
             waitToStart: nil groupValue: nil addedTrackers: nil];
     
@@ -107 +112 @@
             downloadFolder: location
             useIncompleteFolder: nil incompleteFolder: nil
-            ratioSetting: nil ratioLimit: nil
             waitToStart: nil groupValue: nil addedTrackers: nil];
     
@@ -121 +125 @@
                 useIncompleteFolder: [history objectForKey: @"UseIncompleteFolder"]
                 incompleteFolder: [history objectForKey: @"IncompleteFolder"]
-                ratioSetting: [history objectForKey: @"RatioSetting"]
-                ratioLimit: [history objectForKey: @"RatioLimit"]
                 waitToStart: [history objectForKey: @"WaitToStart"]
                 groupValue: [history objectForKey: @"GroupValue"]
@@ -145 +147 @@
         if ((date = [history objectForKey: @"DateCompleted"]))
             tr_torrentSetDoneDate(fHandle, [date timeIntervalSince1970]);
+        
+        //upgrading from versions < 1.60: get old stop ratio settings
+        NSNumber * ratioSetting;
+        if ((ratioSetting = [history objectForKey: @"RatioSetting"]))
+        {
+            switch ([ratioSetting intValue])
+            {
+                case NSOnState: [self setRatioSetting: TR_RATIOLIMIT_SINGLE]; break;
+                case NSOffState: [self setRatioSetting: TR_RATIOLIMIT_UNLIMITED]; break;
+                case NSMixedState: [self setRatioSetting: TR_RATIOLIMIT_GLOBAL]; break;
+            }
+        }
+        NSNumber * ratioLimit;
+        if ((ratioLimit = [history objectForKey: @"RatioLimit"]))
+            [self setRatioLimit: [ratioLimit floatValue]];
     }
     return self;
@@ -157 +174 @@
                     [NSNumber numberWithBool: fUseIncompleteFolder], @"UseIncompleteFolder",
                     [NSNumber numberWithBool: [self isActive]], @"Active",
-                    [NSNumber numberWithInt: fRatioSetting], @"RatioSetting",
-                    [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit",
                     [NSNumber numberWithBool: fWaitToStart], @"WaitToStart",
                     [NSNumber numberWithInt: fGroupValue], @"GroupValue",
@@ -280 +295 @@
     fStat = tr_torrentStat(fHandle);
     
-    //check to stop for ratio
-    CGFloat stopRatio;
-    if ([self isSeeding] && (stopRatio = [self actualStopRatio]) != INVALID && [self ratio] >= stopRatio)
-    {
-        [self setRatioSetting: NSOffState];
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentStoppedForRatio" object: self];
-        
-        [self stopTransfer];
-        fStat = tr_torrentStat(fHandle);
-        
-        fFinishedSeeding = YES;
-    }
-    
     //check if stalled (stored because based on time and needs to check if it was previously stalled)
     fStalled = [self isActive] && [fDefaults boolForKey: @"CheckStalled"]
@@ -360 +362 @@
 }
 
-- (NSInteger) ratioSetting
-{
-    return fRatioSetting;
-}
-
-- (void) setRatioSetting: (NSInteger) setting
-{
-    fRatioSetting = setting;
+- (tr_ratiolimit) ratioSetting
+{
+    return tr_torrentGetRatioMode(fHandle);
+}
+
+- (void) setRatioSetting: (tr_ratiolimit) setting
+{
+    tr_torrentSetRatioMode(fHandle, setting);
 }
 
 - (CGFloat) ratioLimit
 {
-    return fRatioLimit;
+    return tr_torrentGetRatioLimit(fHandle);
 }
 
 - (void) setRatioLimit: (CGFloat) limit
 {
-    if (limit >= 0)
-        fRatioLimit = limit;
-}
-
-- (CGFloat) actualStopRatio
-{
-    if (fRatioSetting == NSOnState)
-        return fRatioLimit;
-    else if (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"])
-        return [fDefaults floatForKey: @"RatioLimit"];
-    else
-        return INVALID;
-}
-
+    NSAssert(limit >= 0, @"Ratio cannot be negative");
+    tr_torrentSetRatioLimit(fHandle, limit);
+}
+
+- (BOOL) seedRatioSet
+{
+    return tr_torrentGetSeedRatio(fHandle, NULL);
+}
+
+#warning move to libtransmission
 - (CGFloat) progressStopRatio
 {
-    CGFloat stopRatio, ratio;
-    if ((stopRatio = [self actualStopRatio]) == INVALID || (ratio = [self ratio]) >= stopRatio)
+    double stopRatio, ratio;
+    if (!tr_torrentGetSeedRatio(fHandle, &stopRatio) || (ratio = [self ratio]) >= stopRatio)
         return 1.0;
     else if (stopRatio > 0.0)
@@ -904 +902 @@
 }
 
-- (NSInteger) etaRatio
-{
-    if (![self isSeeding])
-        return TR_ETA_UNKNOWN;
-    
-    CGFloat uploadRate = [self uploadRate];
-    if (uploadRate < 0.1)
-        return TR_ETA_UNKNOWN;
-    
-    CGFloat stopRatio = [self actualStopRatio], ratio = [self ratio];
-    if (stopRatio == INVALID || ratio >= stopRatio)
-        return TR_ETA_UNKNOWN;
-    
-    CGFloat haveDownloaded = (CGFloat)([self downloadedTotal] > 0 ? [self downloadedTotal] : [self haveVerified]);
-    CGFloat needUploaded = haveDownloaded * (stopRatio - ratio);
-    return needUploaded / uploadRate / 1024.0;
-}
-
 - (CGFloat) notAvailableDesired
 {
@@ -1087 +1067 @@
     
     //add time when downloading
-    if (fStat->activity == TR_STATUS_DOWNLOAD || ([self isSeeding]
-        && (fRatioSetting == NSOnState || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"]))))
-    {
-        NSInteger eta = fStat->activity == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];
-        string = [string stringByAppendingFormat: @" - %@", [self etaString: eta]];
-    }
+    if (fStat->activity == TR_STATUS_DOWNLOAD || ([self isSeeding] && [self seedRatioSet]))
+        string = [string stringByAppendingFormat: @" - %@", [self etaString]];
     
     return string;
@@ -1230 +1206 @@
 - (NSString *) remainingTimeString
 {
-    if (![self isActive] || ([self isSeeding]
-        && !(fRatioSetting == NSOnState || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"]))))
+    if (fStat->activity == TR_STATUS_DOWNLOAD || ([self isSeeding] && [self seedRatioSet]))
+        return [self etaString];
+    else
         return [self shortStatusString];
-    
-    return [self etaString: [self isSeeding] ? [self etaRatio] : [self eta]];
 }
 
@@ -1603 +1578 @@
         downloadFolder: (NSString *) downloadFolder
         useIncompleteFolder: (NSNumber *) useIncompleteFolder incompleteFolder: (NSString *) incompleteFolder
-        ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit
         waitToStart: (NSNumber *) waitToStart
         groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers
@@ -1683 +1657 @@
     
     tr_torrentSetCompletenessCallback(fHandle, completenessChangeCallback, self);
+    tr_torrentSetRatioLimitHitCallback(fHandle, ratioLimitHitCallback, self);
     
     fNameString = [[NSString alloc] initWithUTF8String: fInfo->name];
     fHashString = [[NSString alloc] initWithUTF8String: fInfo->hashString];
         
-    fRatioSetting = ratioSetting ? [ratioSetting intValue] : NSMixedState;
-    fRatioLimit = ratioLimit ? [ratioLimit floatValue] : [fDefaults floatForKey: @"RatioLimit"];
     fFinishedSeeding = NO;
     
@@ -1879 +1852 @@
     
     [self update];
-} 
+}
+
+- (void) ratioLimitHit
+{
+    fStat = tr_torrentStat(fHandle);
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentStoppedForRatio" object: self];
+    
+    fFinishedSeeding = YES;
+}
 
 - (void) quickPause
@@ -1912 +1894 @@
 }
 
-- (NSString *) etaString: (NSInteger) eta
-{
+- (NSString *) etaString
+{
+    const NSInteger eta = [self eta];
     switch (eta)
     {