Changeset 940

Timestamp:

01/15/05 16:56:39 (4 years ago)

Author:

morris

Message:

Unbreak status

Files:

• WiredServer/trunk/WCStatusController.m (modified) (5 diffs)
• WiredServer/trunk/WiredServer.xcode/project.pbxproj (modified) (1 diff)

WiredServer/trunk/WCStatusController.m

@@ -1 @@
-2 2005/01/14 15:25:52
+3 2005/01/15 15:56:39
-
-/*
@@ -284 +284 @@
-        
-        // --- update users graph
+        users = [[_status objectAtIndex:1] intValue];
+
-        if(_usersGraphView) {
-                users = [[_status objectAtIndex:1] intValue];
-                [_usersData removeObjectAtIndex:0];
-                [_usersData addObject:[NSNumber numberWithInt:users]];
@@ -298 +299 @@
-        
-        // --- update transfers graph
+        downloads = [[_status objectAtIndex:3] unsignedIntValue];
+        uploads = [[_status objectAtIndex:5] unsignedIntValue];
+
-        if(_transfersGraphView) {
-                downloads = [[_status objectAtIndex:3] unsignedIntValue];
-                uploads = [[_status objectAtIndex:5] unsignedIntValue];
-                [_downloadsData removeObjectAtIndex:0];
-                [_downloadsData addObject:[NSNumber numberWithUnsignedInt:downloads]];
@@ -321 +323 @@
-                
-        // --- update bandwidth graph
+        inBytes = [[_status objectAtIndex:8] unsignedLongLongValue];
+        outBytes = [[_status objectAtIndex:7] unsignedLongLongValue];
+        inSpeed = 0;
+        outSpeed = 0;
+        
+        if(_inBytes > 0 || _outBytes > 0) {
+                interval = [WCSettings doubleForKey:WCUpdateInterval];
+
+                if(_inBytes > 0 && inBytes > _inBytes)
+                        inSpeed = (inBytes - _inBytes) / interval;
+                
+                if(_outBytes > 0 && outBytes > _outBytes)
+                        outSpeed = (outBytes - _outBytes) / interval;
+        }
+
+        _inBytes = inBytes;
+        _outBytes = outBytes;
+
+        inSpeedString = [NSSWF:@"%@/s", [NSString humanReadableStringForSize:inSpeed]];
+        outSpeedString = [NSSWF:@"%@/s", [NSString humanReadableStringForSize:outSpeed]];
+                
-        if(_bandwidthGraphView) {
-                inBytes = [[_status objectAtIndex:8] unsignedLongLongValue];
-                outBytes = [[_status objectAtIndex:7] unsignedLongLongValue];
-                inSpeed = 0;
-                outSpeed = 0;
-                
-                if(_inBytes > 0 && _outBytes > 0) {
-                        interval = [WCSettings doubleForKey:WCUpdateInterval];
-
-                        if(_inBytes > 0 && inBytes > _inBytes)
-                                inSpeed = (inBytes - _inBytes) / interval;
-                        
-                        if(outBytes > _outBytes)
-                                outSpeed = (outBytes - _outBytes) / interval;
-                }
-
-                inSpeedString = [NSSWF:@"%@/s", [NSString humanReadableStringForSize:inSpeed]];
-                outSpeedString = [NSSWF:@"%@/s", [NSString humanReadableStringForSize:outSpeed]];
-                
-                [_inData removeObjectAtIndex:0];
-                [_inData addObject:[NSNumber numberWithUnsignedInt:inSpeed]];
@@ -353 +358 @@
-                        outSpeedString,
-                        NSLS(@"out", @"Speed out")]];
-
-                _inBytes = inBytes;
-                _outBytes = outBytes;
-        }
-

WiredServer/trunk/WiredServer.xcode/project.pbxproj

@@ -1683 +1683 @@
-                        runOnlyForDeploymentPostprocessing = 0;
-                        shellPath = /bin/sh;
-WIRED_INSTALL_PATH=\"/Library/PreferencePanes/\"\n\n$CP -rp \"$BUILD_DIR/$WRAPPER_NAME\" \"$WIRED_INSTALL_PATH
+sudo $CP -rp \"$BUILD_DIR/$WRAPPER_NAME\" \"/Library/PreferencePanes/
-                };
-                A5A349A607298E1B00A16E9A = {