Changeset 1525

Show
Ignore:
Timestamp:
08/22/04 14:42:28 (4 years ago)
Author:
morris
Message:

calculate average speed from initial offset

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • WiredClient/trunk/WCTransfer.h

    r1415 r1525  
    1 /* $Id: WCTransfer.h,v 1.12 2004/08/03 19:30:55 morris Exp $ */ 
     1/* $Id: WCTransfer.h,v 1.13 2004/08/22 12:42:28 morris Exp $ */ 
    22 
    33/* 
    …… 
    5656        unsigned long long                              _size; 
    5757        unsigned long long                              _offset; 
     58        unsigned long long                              _initialOffset; 
    5859        unsigned long long                              _transferred; 
    5960 

  • WiredClient/trunk/WCTransfer.m

    r1415 r1525  
    1 /* $Id: WCTransfer.m,v 1.15 2004/08/03 19:30:55 morris Exp $ */ 
     1/* $Id: WCTransfer.m,v 1.16 2004/08/22 12:42:28 morris Exp $ */ 
    22 
    33/* 
    …… 
    4141        _type = type; 
    4242         
     43        // --- set initial offset 
     44        _initialOffset = ULLONG_MAX; 
     45         
    4346        // --- init our array of paths and files contained within 
    4447        _paths = [[NSMutableArray alloc] init]; 
    …… 
    8689        [coder decodeValueOfObjCType:@encode(unsigned long long) at:&_size]; 
    8790        [coder decodeValueOfObjCType:@encode(unsigned long long) at:&_offset]; 
     91        [coder decodeValueOfObjCType:@encode(unsigned long long) at:&_initialOffset]; 
    8892        [coder decodeValueOfObjCType:@encode(unsigned long long) at:&_transferred]; 
    8993        [coder decodeValueOfObjCType:@encode(BOOL) at:&_folder]; 
    …… 
    115119        [coder encodeValueOfObjCType:@encode(unsigned long long) at:&_size]; 
    116120        [coder encodeValueOfObjCType:@encode(unsigned long long) at:&_offset]; 
     121        [coder encodeValueOfObjCType:@encode(unsigned long long) at:&_initialOffset]; 
    117122        [coder encodeValueOfObjCType:@encode(unsigned long long) at:&_transferred]; 
    118123        [coder encodeValueOfObjCType:@encode(BOOL) at:&_folder]; 
    …… 
    183188                         
    184189                case WCTransferStateFinished: 
    185                         bytes = _transferred - _offset; 
     190                        bytes = _transferred - _initialOffset; 
    186191                        speed = _accumulatedTimeInterval > 0.0 
    187192                                ? (double) bytes / _accumulatedTimeInterval 
    …… 
    291296- (void)setOffset:(unsigned long long)value { 
    292297        _offset = value; 
     298         
     299        if(_initialOffset == ULLONG_MAX) 
     300                _initialOffset = value; 
    293301} 
    294302