MetaCubeX
/
ClashX.Meta
mirror of https://github.com/MetaCubeX/ClashX.Meta
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Chore: use int.max to indicate speed test fail

This commit is contained in:
yicheng 2018-10-02 15:22:34 +08:00
parent 45d46a5494
commit 8a0281e2fe
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ClashX/General/ApiRequest.swift
View File

@ -168,7 +168,7 @@ class ApiRequest{
, method: .get , method: .get
, parameters: ["timeout":5000,"url":"http://www.gstatic.com/generate_204"]) , parameters: ["timeout":5000,"url":"http://www.gstatic.com/generate_204"])
.responseJSON { (res) in let json = JSON(res.result.value ?? []) .responseJSON { (res) in let json = JSON(res.result.value ?? [])
callback(json["delay"].int ?? -1) callback(json["delay"].int ?? Int.max)
} }
} }
} }

2
ClashX/General/ProxyMenuItemFactory.swift
View File

@ -55,7 +55,7 @@ class ProxyMenuItemFactory {
var speedText = "" var speedText = ""
let placeHolder = "\t" let placeHolder = "\t"
if let speedInfo = SpeedDataRecorder.shared.speedDict[proxy.stringValue] { if let speedInfo = SpeedDataRecorder.shared.speedDict[proxy.stringValue] {
speedText = speedInfo > 0 ?"\(placeHolder)\(speedInfo) ms" : "\(placeHolder)fail" speedText = speedInfo < Int.max ?"\(placeHolder)\(speedInfo) ms" : "\(placeHolder)fail"
} }
let proxyItem = ProxyMenuItem(title: proxy.stringValue + speedText, action: #selector(ProxyMenuItemFactory.actionSelectProxy(sender:)), keyEquivalent: "") let proxyItem = ProxyMenuItem(title: proxy.stringValue + speedText, action: #selector(ProxyMenuItemFactory.actionSelectProxy(sender:)), keyEquivalent: "")

2
ClashX/ViewControllers/SpeedTestViewController.swift
View File

@ -99,7 +99,7 @@ extension SpeedTestViewController:NSTableViewDataSource {
if (model.delay == -2) { if (model.delay == -2) {
textField.stringValue = "testing" textField.stringValue = "testing"
} else if (model.delay == -1) { } else if (model.delay == Int.max) {
textField.stringValue = "fail" textField.stringValue = "fail"
} else { } else {
textField.stringValue = "\(model.delay)" textField.stringValue = "\(model.delay)"