Changeset 446

Timestamp:

Jun 23, 2006, 3:06:27 PM (16 years ago)

Author:

livings124

Message:

The beginning of queueing. Has some work to go, but the basic infrastructure is set up.

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (7 diffs)
• Defaults.plist (modified) (3 diffs)
• English.lproj/PrefsWindow.nib/classes.nib (modified) (4 diffs)
• English.lproj/PrefsWindow.nib/info.nib (modified) (1 diff)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.m (modified) (2 diffs)
• PrefsController.h (modified) (3 diffs)
• PrefsController.m (modified) (3 diffs)
• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (13 diffs)

trunk/macosx/Controller.h

@@ -134 +134 @@
 - (void) ratioSingleChange: (NSNotification *) notification;
 
+- (void) checkWaitingForFinished: (NSNotification *) notification;
+
 - (void) sleepCallBack: (natural_t) messageType argument:
                         (void *) messageArgument;

trunk/macosx/Controller.m

@@ -212 +212 @@
     [nc addObserver: self selector: @selector(ratioGlobalChange:)
                     name: @"RatioGlobalChange" object: nil];
+    
+    [nc addObserver: self selector: @selector(checkWaitingForFinished:)
+                    name: @"TorrentFinishedDownloading" object: nil];
 
     //timer to update the interface
@@ -318 +321 @@
     if (code == NSOKButton)
     {
+        //setup for autostart
+        NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
+        BOOL waitToStart = [startSetting isEqualToString: @"Wait"];
+        int desiredActive, active = 0;
+        if (waitToStart)
+        {
+            desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"];
+            Torrent * tempTorrent;
+            NSEnumerator * enumerator = [fTorrents objectEnumerator];
+            while ((tempTorrent = [enumerator nextObject]))
+                if ([tempTorrent isActive] && ![tempTorrent isSeeding])
+                    active++;
+        }
+    
         [torrent setDownloadFolder: [[openPanel filenames] objectAtIndex: 0]];
-        if ([fDefaults boolForKey: @"AutoStartDownload"])
+        if ((waitToStart && active < desiredActive) || [startSetting isEqualToString: @"Start"])
             [torrent startTransfer];
         [fTorrents addObject: torrent];
@@ -329 +346 @@
 }
 
-- (void) application: (NSApplication *) sender
-         openFiles: (NSArray *) filenames
-{
-    BOOL autoStart = [fDefaults boolForKey: @"AutoStartDownload"];
-    
+- (void) application: (NSApplication *) sender openFiles: (NSArray *) filenames
+{
     NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"], * torrentPath;
+    
+    //setup for autostart
+    NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
+    BOOL waitToStart = [startSetting isEqualToString: @"Wait"];
+    int desiredActive, active = 0;
+    if (waitToStart && ![downloadChoice isEqualToString: @"Ask"])
+    {
+        desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"];
+        Torrent * tempTorrent;
+        NSEnumerator * enumerator = [fTorrents objectEnumerator];
+        while ((tempTorrent = [enumerator nextObject]))
+            if ([tempTorrent isActive] && ![tempTorrent isSeeding])
+                active++;
+    }
+    
     Torrent * torrent;
     NSEnumerator * enumerator = [filenames objectEnumerator];
@@ -342 +371 @@
             continue;
 
-        /* Add it to the "File > Open Recent" menu */
+        //add it to the "File > Open Recent" menu
         [[NSDocumentController sharedDocumentController]
             noteNewRecentDocumentURL: [NSURL fileURLWithPath: torrentPath]];
@@ -371 +400 @@
 
             [torrent setDownloadFolder: folder];
-            if (autoStart)
+            #warning should check if transfer was already done
+            if ((waitToStart && active < desiredActive) || [startSetting isEqualToString: @"Start"])
+            {
                 [torrent startTransfer];
+                active++;
+            }
             [fTorrents addObject: torrent];
         }
@@ -503 +536 @@
             active++;
 
-    if( active > 0 && [fDefaults boolForKey: @"CheckRemove"] )
+    if (active > 0 && [fDefaults boolForKey: @"CheckRemove"])
     {
         NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys:
@@ -911 +944 @@
 }
 
+- (void) checkWaitingForFinished: (NSNotification *) notification
+{
+    //don't try to start a transfer if there should be none waiting
+    if (![[fDefaults stringForKey: @"StartSetting"] isEqualToString: @"Wait"])
+        return;
+
+    int desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"], active = 0;
+    
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
+    Torrent * torrent, * torrentToStart = nil;
+    while ((torrent = [enumerator nextObject]))
+    {
+        //ignore the torrent just stopped; for some reason it is not marked instantly as not active
+        if (torrent == [notification object])
+            continue;
+    
+        if ([torrent isActive])
+        {
+            if (![torrent isSeeding])
+            {
+                active++;
+                if (active >= desiredActive)
+                    return;
+            }
+        }
+        else
+        {
+            if (!torrentToStart && [torrent waitingToStart])
+                torrentToStart = torrent;
+        }
+    }
+    
+    //since it hasn't returned, the queue amount has not been met
+    if (torrentToStart)
+    {
+        [torrentToStart startTransfer];
+        [self updateUI: nil];
+    }
+}
+
 - (int) numberOfRowsInTableView: (NSTableView *) t
 {

trunk/macosx/Defaults.plist

@@ -3 +3 @@
 <plist version="1.0">
 <dict>
-        <key>AutoStartDownload</key>
-        <true/>
         <key>BadgeDownloadRate</key>
         <false/>
@@ -51 +49 @@
         <key>Sort</key>
         <string>Date</string>
+        <key>StartSetting</key>
+        <string>Start</string>
         <key>StatusBar</key>
         <true/>
@@ -59 +59 @@
         <key>UseAdvancedBar</key>
         <false/>
+        <key>WaitToStartNumber</key>
+        <integer>3</integer>
 </dict>
 </plist>

trunk/macosx/English.lproj/PrefsWindow.nib/classes.nib

@@ -6 +6 @@
             ACTIONS = {
                 folderSheetShow = id; 
-                setAutoStart = id; 
                 setBadge = id; 
                 setDownloadLocation = id; 
@@ -16 +15 @@
                 setRatioCheck = id; 
                 setShowMessage = id; 
+                setStartSetting = id; 
                 setUpdate = id; 
+                setWaitToStart = id; 
             }; 
             CLASS = PrefsController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                fAutoStartCheck = NSButton; 
                 fBadgeDownloadRateCheck = NSButton; 
                 fBadgeUploadRateCheck = NSButton; 
@@ -36 +36 @@
                 fRatioField = NSTextField; 
                 fRemoveCheck = NSButton; 
+                fStartMatrix = NSMatrix; 
                 fTransfersView = NSView; 
                 fUpdatePopUp = NSPopUpButton; 
@@ -41 +42 @@
                 fUploadCheck = NSButton; 
                 fUploadField = NSTextField; 
+                fWaitToStartField = NSTextField; 
             }; 
             SUPERCLASS = NSWindowController; 

trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>28</key>
-                <string>195 461 462 212 0 0 1152 842 </string>
+                <string>321 472 535 212 0 0 1152 842 </string>
                 <key>41</key>
-                <string>345 427 462 306 0 0 1152 842 </string>
+                <string>286 392 535 345 0 0 1152 842 </string>
                 <key>66</key>
-                <string>345 526 462 104 0 0 1152 842 </string>
+                <string>321 526 535 104 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>
         <string>446.1</string>
-        <key>IBOpenObjects</key>
-        <array>
-                <integer>41</integer>
-        </array>
         <key>IBSystem Version</key>
         <string>8I127</string>

trunk/macosx/InfoWindowController.m

@@ -409 +409 @@
 - (void) setRatioCheck: (id) sender
 {
-    NSButtonCell * selected = [fRatioMatrix selectedCell];
-    int ratioSetting;
-    if (selected == [fRatioMatrix cellWithTag: RATIO_CHECK_TAG])
+    int ratioSetting, tag = [[fRatioMatrix selectedCell] tag];
+    if (tag == RATIO_CHECK_TAG)
         ratioSetting = RATIO_CHECK;
-    else if (selected == [fRatioMatrix cellWithTag: RATIO_NO_CHECK_TAG])
+    else if (tag == RATIO_NO_CHECK_TAG)
         ratioSetting = RATIO_NO_CHECK;
     else
@@ -424 +423 @@
     
     [self setRatioLimit: fRatioLimitField];
-    [fRatioLimitField setEnabled: selected == [fRatioMatrix cellWithTag: RATIO_CHECK_TAG]];
+    [fRatioLimitField setEnabled: tag == RATIO_CHECK_TAG];
 }
 

trunk/macosx/PrefsController.h

@@ -37 +37 @@
     IBOutlet NSButton       * fQuitCheck, * fRemoveCheck,
                             * fBadgeDownloadRateCheck, * fBadgeUploadRateCheck,
-                            * fAutoStartCheck, * fCopyTorrentCheck, * fDeleteOriginalTorrentCheck;
+                            * fCopyTorrentCheck, * fDeleteOriginalTorrentCheck;
     IBOutlet NSPopUpButton  * fUpdatePopUp;
 
@@ -45 +45 @@
     IBOutlet NSButton       * fRatioCheck;
     IBOutlet NSTextField    * fRatioField;
+    
+    IBOutlet NSMatrix       * fStartMatrix;
+    IBOutlet NSTextField    * fWaitToStartField;
     
     IBOutlet SUUpdater      * fUpdater;
@@ -58 +61 @@
 - (void) setUpdate:             (id) sender;
 - (void) checkUpdate;
-- (void) setAutoStart:          (id) sender;
+
+
+- (void) setStartSetting:   (id) sender;
+- (void) setWaitToStart:    (id) sender;
+
 - (void) setMoveTorrent:        (id) sender;
 - (void) setDownloadLocation:   (id) sender;

trunk/macosx/PrefsController.m

@@ -31 +31 @@
 #define DOWNLOAD_FOLDER     0
 #define DOWNLOAD_TORRENT    2
-#define DOWNLOAD_ASK        3
+#define DOWNLOAD_ASK    3
+
+#define START_YES_CHECK_TAG     0
+#define START_WAIT_CHECK_TAG    1
+#define START_NO_CHECK_TAG      2
 
 #define UPDATE_DAILY    0
@@ -143 +147 @@
     [fBadgeUploadRateCheck setState: [fDefaults boolForKey: @"BadgeUploadRate"]];
     
-    //set auto start
-    [fAutoStartCheck setState: [fDefaults boolForKey: @"AutoStartDownload"]];
+    //set start setting
+    NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
+    int tag;
+    if ([startSetting isEqualToString: @"Start"])
+        tag = START_YES_CHECK_TAG;
+    else if ([startSetting isEqualToString: @"Wait"])
+        tag = START_WAIT_CHECK_TAG;
+    else
+        tag = START_NO_CHECK_TAG;
+    
+    [fStartMatrix selectCellWithTag: tag];
+    [fWaitToStartField setEnabled: tag == START_WAIT_CHECK_TAG];
+    [fWaitToStartField setIntValue: [fDefaults integerForKey: @"WaitToStartNumber"]];
     
     //set private torrents
@@ -408 +423 @@
 }
 
-- (void) setAutoStart: (id) sender
-{
-    [fDefaults setBool: [sender state] forKey: @"AutoStartDownload"];
+- (void) setStartSetting: (id) sender
+{
+    NSString * startSetting;
+
+    int tag = [[fStartMatrix selectedCell] tag];
+    if (tag == START_YES_CHECK_TAG)
+        startSetting = @"Start";
+    else if (tag == START_WAIT_CHECK_TAG)
+        startSetting = @"Wait";
+    else
+        startSetting = @"Manual";
+    
+    [fDefaults setObject: startSetting forKey: @"StartSetting"];
+    
+    [self setWaitToStart: fWaitToStartField];
+    [fWaitToStartField setEnabled: tag == START_WAIT_CHECK_TAG];
+}
+
+- (void) setWaitToStart: (id) sender
+{
+    int waitNumber = [sender intValue];
+    if (![[sender stringValue] isEqualToString: [NSString stringWithInt: waitNumber]] || waitNumber < 1)
+    {
+        NSBeep();
+        waitNumber = [fDefaults floatForKey: @"WaitToStartNumber"];
+        [sender setIntValue: waitNumber];
+    }
+    else
+        [fDefaults setInteger: waitNumber forKey: @"WaitToStartNumber"];
+    
+    #warning notification recheck
 }
 

trunk/macosx/Torrent.h

@@ -50 +50 @@
     int     fStopRatioSetting;
     float   fRatioLimit;
-    BOOL    fFinishedSeeding;
+    BOOL    fFinishedSeeding, fWaitToStart;
 }
 
@@ -74 +74 @@
 - (float)       ratioLimit;
 - (void)        setRatioLimit: (float) limit;
+
+- (void) setWaitToStart: (BOOL) wait;
+- (BOOL) waitingToStart;
 
 - (void)    revealData;

trunk/macosx/Torrent.m

@@ -31 +31 @@
         privateTorrent: (NSNumber *) privateTorrent publicTorrent: (NSNumber *) publicTorrent
         date: (NSDate *) date stopRatioSetting: (NSNumber *) stopRatioSetting
-        ratioLimit: (NSNumber *) ratioLimit;
+        ratioLimit: (NSNumber *) ratioLimit waitToStart: (NSNumber *) waitToStart;
 
 - (void) trashFile: (NSString *) path;
@@ -43 +43 @@
 {
     self = [self initWithHash: nil path: path lib: lib privateTorrent: nil publicTorrent: nil
-            date: nil stopRatioSetting: nil ratioLimit: nil];
+            date: nil stopRatioSetting: nil ratioLimit: nil waitToStart: nil];
     
     if (self)
@@ -61 +61 @@
                 date: [history objectForKey: @"Date"]
                 stopRatioSetting: [history objectForKey: @"StopRatioSetting"]
-                ratioLimit: [history objectForKey: @"RatioLimit"]];
+                ratioLimit: [history objectForKey: @"RatioLimit"]
+                waitToStart: [history objectForKey: @"WaitToStart"]];
     
     if (self)
@@ -86 +87 @@
                     [self date], @"Date",
                     [NSNumber numberWithInt: fStopRatioSetting], @"StopRatioSetting",
-                    [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit", nil];
+                    [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit",
+                    [NSNumber numberWithBool: fWaitToStart], @"WaitToStart", nil];
             
     if (fPrivateTorrent)
@@ -159 +161 @@
     {
         case TR_STATUS_PAUSE:
-            [fStatusString setString: fFinishedSeeding ? @"Seeding Complete" : @"Paused"];
+            if (fFinishedSeeding)
+                [fStatusString setString: @"Seeding complete"];
+            else if (fWaitToStart)
+                [fStatusString setString: [@"Waiting to start" stringByAppendingEllipsis]];
+            else
+                [fStatusString setString: @"Paused"];
             break;
 
@@ -222 +229 @@
     {
         tr_torrentStart(fHandle);
+
         fFinishedSeeding = NO;
+        fWaitToStart = NO;
     }
 }
@@ -229 +238 @@
 {
     if ([self isActive])
+    {
+        BOOL wasSeeding = [self isSeeding];
+    
         tr_torrentStop(fHandle);
+        
+        if (!wasSeeding)
+            [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self];
+    }
 }
 
@@ -241 +257 @@
 {
     if ((fResumeOnWake = [self isActive]))
-        [self stopTransfer];
+        tr_torrentStop(fHandle);
 }
 
@@ -247 +263 @@
 {
     if (fResumeOnWake)
-        [self startTransfer];
+        tr_torrentStart(fHandle);
 }
 
@@ -275 +291 @@
     if (limit >= 0)
         fRatioLimit = limit;
+}
+
+- (void) setWaitToStart: (BOOL) wait
+{
+    fWaitToStart = wait;
+}
+
+- (BOOL) waitingToStart
+{
+    return fWaitToStart;
 }
 
@@ -425 +451 @@
 - (BOOL) justFinished
 {
-    return tr_getFinished(fHandle);
+    BOOL finished = tr_getFinished(fHandle);
+    if (finished)
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self];
+    
+    return finished;
 }
 
@@ -529 +559 @@
         privateTorrent: (NSNumber *) privateTorrent publicTorrent: (NSNumber *) publicTorrent
         date: (NSDate *) date stopRatioSetting: (NSNumber *) stopRatioSetting
-        ratioLimit: (NSNumber *) ratioLimit
+        ratioLimit: (NSNumber *) ratioLimit waitToStart: (NSNumber *) waitToStart
 {
     if (!(self = [super init]))
@@ -564 +594 @@
     fRatioLimit = ratioLimit ? [ratioLimit floatValue] : [fDefaults floatForKey: @"RatioLimit"];
     fFinishedSeeding = NO;
+    
+    fWaitToStart = waitToStart ? [waitToStart boolValue]
+                    : [[fDefaults stringForKey: @"StartSetting"] isEqualToString: @"Wait"];
     
     NSString * fileType = fInfo->multifile ? NSFileTypeForHFSTypeCode('fldr') : [[self name] pathExtension];