Changeset 3353

Timestamp:

09/06/06 21:45:15 (2 years ago)

Author:

timothy

Message:

Fixed the grossly erroneous file transfer rate. #600

Files:

• trunk/Chat Core/MVIRCFileTransfer.m (modified) (3 diffs)
• trunk/Colloquy.xcodeproj/project.pbxproj (modified) (2 diffs)
• trunk/Controllers/MVFileTransferController.h (modified) (1 diff)
• trunk/Controllers/MVFileTransferController.m (modified) (16 diffs)

trunk/Chat Core/MVIRCFileTransfer.m

@@ -35 +35 @@
-}
-
-/*static void MVFileTransferClosed( FILE_DCC_REC *dcc ) {
-        MVFileTransfer *self = [MVFileTransfer _transferForDCCFileRecord:dcc];
-        if( ! self ) return;
-
-        if( [self status] == MVFileTransferStoppedStatus ) {
-                // nothing to do
-        } else if( [self finalSize] != [self transfered] ) {
-                NSDictionary *info = [[NSDictionary allocWithZone:nil] initWithObjectsAndKeys:@"The file transfer terminated unexpectedly.", NSLocalizedDescriptionKey, nil];
-                NSError *error = [[NSError allocWithZone:nil] initWithDomain:MVFileTransferErrorDomain code:MVFileTransferUnexpectedlyEndedError userInfo:info];
-                [self performSelectorOnMainThread:@selector( _postError: ) withObject:error waitUntilDone:NO];
-                [error release];
-                [info release];
-        } else {
-                [self _setStatus:MVFileTransferDoneStatus];
-                NSNotification *note = [NSNotification notificationWithName:MVFileTransferFinishedNotification object:self];
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThread:note];
-        }
-}
-
-static void MVFileTransferErrorConnect( FILE_DCC_REC *dcc ) {
-        MVFileTransfer *self = [MVFileTransfer _transferForDCCFileRecord:dcc];
-        if( ! self ) return;
-
-        [self performSelector:@selector( _destroying )];
-
-        NSDictionary *info = [[NSDictionary allocWithZone:nil] initWithObjectsAndKeys:@"The file transfer connection could not be made.", NSLocalizedDescriptionKey, nil];
-        NSError *error = [[NSError allocWithZone:nil] initWithDomain:MVFileTransferErrorDomain code:MVFileTransferConnectionError userInfo:info];
-        [self performSelectorOnMainThread:@selector( _postError: ) withObject:error waitUntilDone:NO];
-        [error release];
-        [info release];
-}
-
-static void MVFileTransferErrorFileCreate( FILE_DCC_REC *dcc, char *filename ) {
-        MVFileTransfer *self = [MVFileTransfer _transferForDCCFileRecord:dcc];
-        if( ! self ) return;
-
-        [self performSelector:@selector( _destroying )];
-
-        NSDictionary *info = [[NSDictionary allocWithZone:nil] initWithObjectsAndKeys:@"The file %@ could not be created, please make sure you have write permissions in the %@ folder.", NSLocalizedDescriptionKey, nil];
-        NSError *error = [[NSError allocWithZone:nil] initWithDomain:MVFileTransferErrorDomain code:MVFileTransferFileCreationError userInfo:info];
-        [self performSelectorOnMainThread:@selector( _postError: ) withObject:error waitUntilDone:NO];
-        [error release];
-        [info release];
-}
-
-static void MVFileTransferErrorFileOpen( FILE_DCC_REC *dcc, char *filename, int errno ) {
-        MVFileTransfer *self = [MVFileTransfer _transferForDCCFileRecord:dcc];
-        if( ! self ) return;
-
-        [self performSelector:@selector( _destroying )];
-
-        NSError *ferror = [[NSError allocWithZone:nil] initWithDomain:NSPOSIXErrorDomain code:errno userInfo:nil];
-        NSDictionary *info = [[NSDictionary allocWithZone:nil] initWithObjectsAndKeys:@"The file %@ could not be opened, please make sure you have read permissions for this file.", NSLocalizedDescriptionKey, ferror, @"NSUnderlyingErrorKey", nil];
-        NSError *error = [[NSError allocWithZone:nil] initWithDomain:MVFileTransferErrorDomain code:MVFileTransferFileOpenError userInfo:info];
-        [self performSelectorOnMainThread:@selector( _postError: ) withObject:error waitUntilDone:NO];
-        [error release];
-        [ferror release];
-        [info release];
-}
-
-static void MVFileTransferErrorSendExists( FILE_DCC_REC *dcc, char *nick, char *filename ) {
-        MVFileTransfer *self = [MVFileTransfer _transferForDCCFileRecord:dcc];
-        if( ! self ) return;
-
-        [self performSelector:@selector( _destroying )];
-
-        NSDictionary *info = [[NSDictionary allocWithZone:nil] initWithObjectsAndKeys:@"The file %@ is already being offerend to %@.", NSLocalizedDescriptionKey, nil];
-        NSError *error = [[NSError allocWithZone:nil] initWithDomain:MVFileTransferErrorDomain code:MVFileTransferAlreadyExistsError userInfo:info];
-        [self performSelectorOnMainThread:@selector( _postError: ) withObject:error waitUntilDone:NO];
-        [error release];
-        [info release];
-} */
-
-@implementation MVIRCUploadFileTransfer
-+ (id) transferWithSourceFile:(NSString *) path toUser:(MVChatUser *) user passively:(BOOL) passive {
@@ -218 +145 @@
-- (void) socket:(AsyncSocket *) sock didConnectToHost:(NSString *) host port:(UInt16) port {
-        [self _setStatus:MVFileTransferNormalStatus];
+        [self _setStartDate:[NSDate date]];
+
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVFileTransferStartedNotification object:self];
-
@@ -475 +404 @@
-- (void) socket:(AsyncSocket *) sock didConnectToHost:(NSString *) host port:(UInt16) port {
-        [self _setStatus:MVFileTransferNormalStatus];
+        [self _setStartDate:[NSDate date]];
-
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVFileTransferStartedNotification object:self];

trunk/Colloquy.xcodeproj/project.pbxproj

@@ -1911 +1911 @@
-                        isa = PBXProject;
-                        buildConfigurationList = 1C041A700854E97700A5A5BA /* Build configuration list for PBXProject "Colloquy" */;
+                        compatibilityVersion = "Xcode 2.4";
-                        hasScannedForEncodings = 1;
-                        knownRegions = (
@@ -1960 +1961 @@
-                        );
-                        projectRoot = "";
+                        shouldCheckCompatibility = 1;
-                        targets = (
-                                1CB2CCF5052DDC560094AAA4 /* Colloquy (Application) */,

trunk/Controllers/MVFileTransferController.h

@@ -23 +23 @@
-
-- (void) downloadFileAtURL:(NSURL *) url toLocalFile:(NSString *) path;
-id
+MVFileTransfer *
-
-- (IBAction) stopSelectedTransfer:(id) sender;

trunk/Controllers/MVFileTransferController.m

@@ -42 +42 @@
-        val = (unsigned int) ( secs / (float) stop );
-        use = ( val > 1 ? plural : desc );
-d
+u
-        if( longFormat && i > 0 ) {
-                unsigned int rest = (unsigned int) ( (unsigned int) secs % stop );
@@ -49 +49 @@
-                if( rest > 0 ) {
-                        use = ( rest > 1 ? plural : desc );
-d
+u
-                }
-        }
@@ -251 +251 @@
-
-        NSMutableDictionary *info = [NSMutableDictionary dictionary];
-
-UnsignedInt:0
-
+Long
+Double:0.
+Long
-        [info setObject:download forKey:@"controller"];
-        [info setObject:url forKey:@"url"];
@@ -266 +266 @@
-}
-
-id
+MVFileTransfer *
-        NSParameterAssert( transfer != nil );
-
@@ -272 +272 @@
-        NSMutableDictionary *info = nil;
-        while( ( info = [enumerator nextObject] ) )
-transf
+controll
-                        return;
-
-        info = [NSMutableDictionary dictionary];
-
-
+
+
+
-        [info setObject:[NSNumber numberWithUnsignedLongLong:[transfer finalSize]] forKey:@"size"];
-        if( [transfer isDownload] ) [info setObject:[(MVDownloadFileTransfer *)transfer destination] forKey:@"path"];
-        else if( [transfer isUpload] ) [info setObject:[(MVUploadFileTransfer *)transfer source] forKey:@"path"];
-        [info setObject:transfer forKey:@"controller"];
-
-        [_transferStorage addObject:info];
@@ -296 +296 @@
-                info = [self _infoForTransferAtIndex:[currentFiles selectedRow]];
-                [[info objectForKey:@"controller"] cancel];
-Int
+Long
-        }
-
@@ -330 +330 @@
-
-- (IBAction) revealSelectedFile:(id) sender {
-        NSDictionary *info = nil;
-        if( [currentFiles numberOfSelectedRows] == 1 ) {
-
+NSDictionary *
-                [[NSWorkspace sharedWorkspace] selectFile:[info objectForKey:@"path"] inFileViewerRootedAtPath:@""];
-        }
@@ -344 +343 @@
-        NSMutableString *string = [NSMutableString string];
-        id row = nil;
-
+
-        [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,NSStringPboardType,nil] owner:self];
+
-        while( ( row = [enumerator nextObject] ) ) {
-
+unsigned 
-                [array addObject:[[self _infoForTransferAtIndex:i] objectForKey:@"path"]];
-                [string appendString:[[[self _infoForTransferAtIndex:i] objectForKey:@"path"] lastPathComponent]];
-                if( ! [[[enumerator allObjects] lastObject] isEqual:row] ) [string appendString:@"\n"];
-        }
+
-        [[NSPasteboard generalPasteboard] setPropertyList:array forType:NSFilenamesPboardType];
-        [[NSPasteboard generalPasteboard] setString:string forType:NSStringPboardType];
@@ -387 +388 @@
-                [cell setMainText:[[NSFileManager defaultManager] displayNameAtPath:path]];
-        } else if( [[column identifier] isEqual:@"status"] ) {
-
-
+
+
+
-                NSString *imageName = @"pending";
-                if( status == MVFileTransferErrorStatus ) imageName = @"error";
@@ -531 +533 @@
-        while( ( info = [enumerator nextObject] ) ) {
-                if( [info objectForKey:@"controller"] == download ) {
-
+Long
-
-                        unsigned long size = [response expectedContentLength];
@@ -555 +557 @@
-                if( [info objectForKey:@"controller"] == download ) {
-                        NSTimeInterval timeslice = [[info objectForKey:@"started"] timeIntervalSinceNow] * -1;
-Int
-
-Int
-
+LongLong
+
+Long
+Long
-
-                        if( transfered > [[info objectForKey:@"size"] unsignedLongLongValue] )
-
+Long
-
-                        if( transfered != [[info objectForKey:@"size"] unsignedLongLongValue] )
@@ -587 +589 @@
-        while( ( info = [enumerator nextObject] ) ) {
-                if( [info objectForKey:@"controller"] == download ) {
-Int
+Long
-
-                        [[NSWorkspace sharedWorkspace] noteFileSystemChanged:[info objectForKey:@"path"]];
@@ -613 +615 @@
-        while( ( info = [enumerator nextObject] ) ) {
-                if( [info objectForKey:@"controller"] == download ) {
-Int
+Long
-                        [currentFiles reloadData];
-                        break;
@@ -773 +775 @@
-                while( ( info = [enumerator nextObject] ) ) {
-                        if( [info objectForKey:@"controller"] == download ) {
-Int
+Long
-                                break;
-                        }
@@ -806 +808 @@
-        while( ( info = [enumerator nextObject] ) ) {
-                id controller = [info objectForKey:@"controller"];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else if( [controller isKindOfClass:[WebDownload class]] ) {
-                        totalSizeDown += [[info objectForKey:@"size"] unsignedLongValue];
@@ -904 +905 @@
-        if( [[info objectForKey:@"controller"] isKindOfClass:[MVFileTransfer class]] ) {
-                MVFileTransfer *transfer = [info objectForKey:@"controller"];
-
-
+
-                [info setObject:[transfer user] forKey:@"user"];
-        }