Changeset 4272

Timestamp:

06/09/06 19:37:09 (2 years ago)

Author:

morris

Message:

Make sure we don't start another download when an upload finishes and vice versa, fixes #138

Files:

• WiredClient/trunk/English.lproj/ReleaseNotes.rtf (modified) (1 diff)
• WiredClient/trunk/WCTransfer.h (modified) (1 diff)
• WiredClient/trunk/WCTransfer.m (modified) (1 diff)
• WiredClient/trunk/WCTransfers.m (modified) (12 diffs)

WiredClient/trunk/English.lproj/ReleaseNotes.rtf

@@ -40 +40 @@
-- Fix a crash when receiving an error while writing to a server\
-- Fix disabled buttons in private chat topic dialog\
+- Fix a queueing problem where a second download transfer would be started when an upload transfer finished\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-

WiredClient/trunk/WCTransfer.h

@@ -142 +142 @@
-- (NSProgressIndicator *)progressIndicator;
-
+- (BOOL)isWorking;
-- (NSString *)status;
-

WiredClient/trunk/WCTransfer.m

@@ -440 +440 @@
-#pragma mark -
-
+- (BOOL)isWorking {
+        return (_state == WCTransferListing || _state == WCTransferRunning ||
+                        _state == WCTransferStopping || _state == WCTransferStopped ||
+                        _state == WCTransferRemoving);
+}
+
+
+
-- (NSString *)status {
-        NSTimeInterval          interval;

WiredClient/trunk/WCTransfers.m

@@ -63 +63 @@
-- (WCTransfer *)_transferWithPath:(NSString *)path;
-- (WCTransfer *)_transferWithState:(WCTransferState)state;
-
+
+
-- (NSString *)_checksumForPath:(NSString *)path;
-
+- (void)_requestNextTransfer;
-- (void)_requestTransfer:(WCTransfer *)transfer;
-- (void)_requestDownload:(WCTransfer *)transfer first:(BOOL)first;
@@ -266 +268 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        NSEnumerator            *enumerator;
-        WCTransfer                      *transfer;
@@ -274 +295 @@
-
-        while((transfer = [enumerator nextObject])) {
-state] != WCTransferFinished
+type] == type && [transfer isWorking]
-                        count++;
-        }
@@ -297 +318 @@
-
-#pragma mark -
+
+- (void)_requestNextTransfer {
+        WCTransfer              *transfer = NULL;
+        unsigned int    downloads, uploads;
+        
+        if(![WCSettings boolForKey:WCQueueTransfers]) {
+                transfer        = [self _transferWithState:WCTransferLocallyQueued];
+        } else {
+                downloads       = [self _numberOfWorkingTransfersWithType:WCTransferDownload];
+                uploads         = [self _numberOfWorkingTransfersWithType:WCTransferUpload];
+                
+                if(downloads == 0 && uploads == 0)
+                        transfer = [self _transferWithState:WCTransferLocallyQueued];
+                else if(downloads == 0)
+                        transfer = [self _transferWithState:WCTransferLocallyQueued type:WCTransferDownload];
+                else if(uploads == 0)
+                        transfer = [self _transferWithState:WCTransferLocallyQueued type:WCTransferUpload];
+                
+        }
+
+        if(transfer)
+                [self _requestTransfer:transfer];
+}
+
+
-
-- (void)_requestTransfer:(WCTransfer *)transfer {
@@ -401 +447 @@
-        NSDictionary            *dictionary;
-        NSTimeInterval          interval;
-        WCTransfer                      *nextTransfer;
-        WCFile                          *file;
-        WCPreview                       *preview;
@@ -486 +531 @@
-        }
-
-
-
-
-
-
-
+
+
-        
-        [file release];
@@ -556 +597 @@
-        [_transfers addObject:transfer];
-        
-unfinishedTransferCount
-
-1
+numberOfWorkingTransfersWithType:WCTransferDownload
+
+0
-                [self showWindow:self];
-        
-1
+0
-                [transfer setState:WCTransferLocallyQueued];
-        else
@@ -658 +699 @@
-        [_transfers addObject:transfer];
-        
-unfinishedTransferCount
-
-1
+numberOfWorkingTransfersWithType:WCTransferUpload
+
+0
-                [self showWindow:self];
-        
-1
+0
-                [transfer setState:WCTransferLocallyQueued];
-        else
@@ -1257 +1298 @@
-        NSString                *path, *free;
-        NSArray                 *fields;
-, *nextTransfer
+
-
-        fields          = [[notification userInfo] objectForKey:WCArgumentsKey];
@@ -1282 +1323 @@
-                [_transfersTableView reloadData];
-
-
-
-
-
+
-        }
-
@@ -1322 +1360 @@
-        NSString                *path, *free;
-        NSArray                 *fields;
-, *nextTransfer
+
-
-        fields          = [[notification userInfo] objectForKey:WCArgumentsKey];
@@ -1347 +1385 @@
-                [_transfersTableView reloadData];
-
-
-
-
-
+
-        }
-