From bb6b71da89af29ddb455250fb863e618693aa7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E5=AE=87=E8=88=AA?= Date: Thu, 11 Oct 2018 11:38:17 +0800 Subject: [PATCH] sytanx refine --- ShadowsocksX-NG/NetWorkMonitor.swift | 2 +- ShadowsocksX-NG/PingClient.swift | 2 +- ShadowsocksX-NG/ProxyPreferencesController.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ShadowsocksX-NG/NetWorkMonitor.swift b/ShadowsocksX-NG/NetWorkMonitor.swift index 79c7a9f..490ff17 100755 --- a/ShadowsocksX-NG/NetWorkMonitor.swift +++ b/ShadowsocksX-NG/NetWorkMonitor.swift @@ -117,7 +117,7 @@ open class NetWorkMonitor: NSObject { let pattern = "en\\w+\\s+(\\d+)\\s+(\\d+)\\s+(\\d+)\\s+(\\d+)" do { let regex = try NSRegularExpression(pattern: pattern, options: NSRegularExpression.Options.caseInsensitive) - let results = regex.matches(in: string, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, string.characters.count)) + let results = regex.matches(in: string, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, string.count)) var upRate: Float = 0.00 var downRate: Float = 0.00 for result in results { diff --git a/ShadowsocksX-NG/PingClient.swift b/ShadowsocksX-NG/PingClient.swift index c8fe76c..d3b0ba5 100644 --- a/ShadowsocksX-NG/PingClient.swift +++ b/ShadowsocksX-NG/PingClient.swift @@ -116,7 +116,7 @@ class PingServers:NSObject{ return nil } res.removeSubrange(res.range(of: "round-trip min/avg/max/stddev = ")!) - res = String(res.characters.dropLast(3)) + res = String(res.dropLast(3)) res = res.components(separatedBy: "/")[1] let latency = Double(res) return latency diff --git a/ShadowsocksX-NG/ProxyPreferencesController.swift b/ShadowsocksX-NG/ProxyPreferencesController.swift index 5a6e3fc..168b061 100644 --- a/ShadowsocksX-NG/ProxyPreferencesController.swift +++ b/ShadowsocksX-NG/ProxyPreferencesController.swift @@ -32,7 +32,7 @@ class ProxyPreferencesController: NSWindowController, NSTableViewDataSource, NST selectedNetworkServices = NSMutableSet() } - networkServices = ProxyConfTool.networkServicesList() as NSArray! + networkServices = ProxyConfTool.networkServicesList() as NSArray tableView.reloadData() }