zhangyuheng/ClashX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: update api is unstabled now.relaunch to update config

Browse Source
This commit is contained in:
yicheng 2018-08-03 16:49:40 +08:00
parent 3deaa4eb51
commit 3c1d220667
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ClashX/AppDelegate.swift
View File

@ -15,7 +15,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
var statusItem: NSStatusItem!
static let StatusItemIconWidth: CGFloat = NSStatusItem.variableLength * 2
@IBOutlet weak var statusMenu: NSMenu!
@IBOutlet weak var proxySettingMenuItem: NSMenuItem!
@IBOutlet weak var autoStartMenuItem: NSMenuItem!
@ -25,15 +24,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
func applicationDidFinishLaunching(_ aNotification: Notification) {
signal(SIGPIPE, SIG_IGN)
_ = ProxyConfigManager.install()
PFMoveToApplicationsFolderIfNecessary()
self.startProxy()
statusItem = NSStatusBar.system.statusItem(withLength: 57)
let view = StatusItemView.create(statusItem: statusItem,statusMenu: statusMenu)
statusItem.view = view
updateMenuItem()
startProxy()
}

13
ClashX/General/ApiRequest.swift
View File

@ -30,10 +30,15 @@ class ApiRequest{
}
static func requestConfigUpdate(callback:@escaping ((Bool)->())){
request(ConfigManager.apiUrl + "/configs", method: .put).responseJSON{
data in
// response is undocumented yet.
callback(true)
// request(ConfigManager.apiUrl + "/configs", method: .put).responseJSON{
// data in
// // response is undocumented yet.
// callback(true)
// }
if let path = Bundle.main.resourceURL?.deletingLastPathComponent().deletingLastPathComponent().absoluteString {
NSLog("restart \(path)")
_ = Process.launchedProcess(launchPath: "/usr/bin/open", arguments: [path])
NSApp.terminate(self)
}
}
}