fix(nettop): make the nettop-line more robust

foamzou · Jul 10, 2021 · a876f20 · a876f20
1 parent 51d415a
commit a876f20
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/ITrafficMonitorForMac.xcodeproj/project.pbxproj b/ITrafficMonitorForMac.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
 				CODE_SIGN_ENTITLEMENTS = ITrafficMonitorForMac/ITrafficMonitorForMac.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"ITrafficMonitorForMac/Preview Content\"";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = ITrafficMonitorForMac/Info.plist;
@@ -364,7 +364,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.1.3;
+				MARKETING_VERSION = 0.1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.foamzou.ITrafficMonitorForMac;
 				PRODUCT_NAME = ITraffic;
 				SWIFT_VERSION = 5.0;
@@ -379,7 +379,7 @@
 				CODE_SIGN_ENTITLEMENTS = ITrafficMonitorForMac/ITrafficMonitorForMac.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"ITrafficMonitorForMac/Preview Content\"";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = ITrafficMonitorForMac/Info.plist;
@@ -388,7 +388,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.1.3;
+				MARKETING_VERSION = 0.1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.foamzou.ITrafficMonitorForMac;
 				PRODUCT_NAME = ITraffic;
 				SWIFT_VERSION = 5.0;

diff --git a/ITrafficMonitorForMac/Network.swift b/ITrafficMonitorForMac/Network.swift
@@ -99,7 +99,6 @@ class Network {
         task.executableURL = URL(fileURLWithPath: "/bin/bash")
         task.arguments = ["-c"] + args
 
-        var firstLoad = true
         var buffer = Data()
         let outHandle = pipe.fileHandleForReading
         var str = ""
@@ -112,14 +111,9 @@ class Network {
                 str = String(data: buffer, encoding: String.Encoding.utf8) ?? ""
                 if str.last?.isNewline == true {
                     buffer.removeAll()
-                    // There is wrong info when first load, skip it
-                    if (firstLoad) {
-                        firstLoad = false
-                    } else {
-                        onData?(str)
-                    }
+                    onData?(str)
                 }
-                outHandle.waitForDataInBackgroundAndNotify() // todo memory leak here. Maybe should restart the sub-process in a while
+                outHandle.waitForDataInBackgroundAndNotify() // todo it seems that memory leak here. Not sure how to fix it now.
             } else {
                 buffer.removeAll()
             }

diff --git a/ITrafficMonitorForMac/dependence-resource/nettop-line b/ITrafficMonitorForMac/dependence-resource/nettop-line
diff --git a/README.md b/README.md
@@ -2,12 +2,21 @@
 Monitor for displaying process traffic on Mac Status bar
 
 ## MacOS version required
-The macOS version should >= 10.15, since the project use swiftui `View`
+The macOS version should >= 10.15, since the project use swiftUI
 
 ## Feature
 1. Show network speed by process
 2. Adapt dark mode
 3. Use nettop's delta mode to make statistics more accurate
 
+## Install
+One of the following way is fine
+
+1. Download the zip file from [the latest page](https://github.com/foamzou/ITraffic-monitor-for-mac/releases/latest)
+2. Use Homebrew: `brew install itraffic`
+
 ## Snapshot
 <img src="./snapshot.png" width="600" />
+
+## Thanks
+- [eul](https://github.com/gao-sun/eul): Use some code of the project Coz I'm a newer of swift