Fixed: Update proxy list when reload config

Author: yichengchen

ClashX/AppDelegate.swift

@@ -26,6 +26,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @IBOutlet weak var proxyModeRuleMenuItem: NSMenuItem!
 
     @IBOutlet weak var separatorLineTop: NSMenuItem!
+    @IBOutlet weak var sepatatorLineEndProxySelect: NSMenuItem!
 
     var disposeBag = DisposeBag()
     let ssQueue = DispatchQueue(label: "com.w2fzu.ssqueue", attributes: .concurrent)
@@ -42,7 +43,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let view = StatusItemView.create(statusItem: statusItem,statusMenu: statusMenu)
         statusItem.view = view
         setupData()
-        setupProxyList()
+        updateProxyList()
 
     }
 
@@ -94,12 +95,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             }).disposed(by: disposeBag)
     }
 
-    func setupProxyList() {
+    func updateProxyList() {
         ProxyMenuItemFactory.menuItems { [unowned self] (menus) in
-            let index = self.statusMenu.items.index(of: self.separatorLineTop)! + 1
+            let startIndex = self.statusMenu.items.index(of: self.separatorLineTop)! + 1
+            let endIndex = self.statusMenu.items.index(of: self.sepatatorLineEndProxySelect)! + 1
             var items = self.statusMenu.items
+
+            for idx in startIndex+1 ..< endIndex {
+                items.remove(at: idx)
+            }
             for each in menus {
-                items.insert(each, at: index)
+                items.insert(each, at: startIndex)
             }
             self.statusMenu.removeAllItems()
             for each in items.reversed() {
@@ -124,6 +130,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
             if ConfigManager.shared.proxyPortAutoSet {
                 _ = ProxyConfigManager.setUpSystemProxy(port: config.port,socksPort: config.socketPort)
+                self.updateProxyList()
                 completeHandler?()
             }
         }

ClashX/Base.lproj/Main.storyboard

@@ -23,6 +23,7 @@
                         <outlet property="proxyModeRuleMenuItem" destination="89n-bD-JHk" id="lT1-J1-X3k"/>
                         <outlet property="proxySettingMenuItem" destination="8se-yr-wmp" id="yvm-QP-yoA"/>
                         <outlet property="separatorLineTop" destination="1fM-p6-bHd" id="NFb-qS-TKR"/>
+                        <outlet property="sepatatorLineEndProxySelect" destination="n67-fU-hLx" id="Vgv-N6-SOH"/>
                         <outlet property="statusMenu" destination="Afa-lD-EbR" id="cov-E9-WrO"/>
                     </connections>
                 </customObject>
@@ -53,6 +54,8 @@
                                 </items>
                             </menu>
                         </menuItem>
+                        <menuItem isSeparatorItem="YES" id="1fM-p6-bHd"/>
+                        <menuItem isSeparatorItem="YES" id="n67-fU-hLx"/>
                         <menuItem title="Set as system proxy" id="8se-yr-wmp">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <connections>
@@ -65,14 +68,13 @@
                                 <action selector="actionCopyExportCommand:" target="Voe-Tx-rLC" id="82r-sY-7xb"/>
                             </connections>
                         </menuItem>
-                        <menuItem isSeparatorItem="YES" id="1fM-p6-bHd"/>
-                        <menuItem isSeparatorItem="YES" id="n67-fU-hLx"/>
                         <menuItem title="Start at login" id="B1J-XB-BiZ">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <connections>
                                 <action selector="actionStartAtLogin:" target="Voe-Tx-rLC" id="aie-1F-HjZ"/>
                             </connections>
                         </menuItem>
+                        <menuItem isSeparatorItem="YES" id="UpD-DI-Smv"/>
                         <menuItem title="Config" id="JMV-Dy-CI0">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <menu key="submenu" title="Config" id="tck-zU-JKQ">
@@ -105,7 +107,7 @@
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <menu key="submenu" title="Help" id="ogW-pn-jeR">
                                 <items>
-                                    <menuItem title="check update" id="p0T-J8-Emx">
+                                    <menuItem title="Check update" id="p0T-J8-Emx">
                                         <modifierMask key="keyEquivalentModifierMask"/>
                                         <connections>
                                             <action selector="checkForUpdates:" target="fth-rt-saN" id="gaF-35-d7h"/>

ClashX/General/ProxyMenuItemFactory.swift

@@ -20,7 +20,7 @@ class ProxyMenuItemFactory {
                 let menu = NSMenuItem(title: proxyGroup.key, action: nil, keyEquivalent: "")
                 let selectedName = proxyGroup.value["now"].stringValue
                 let submenu = NSMenu(title: proxyGroup.key)
-                for proxy in proxyGroup.value["all"].arrayValue {
+                for proxy in proxyGroup.value["all"].arrayValue.reversed() {
                     let proxyItem = NSMenuItem(title: proxy.stringValue, action: #selector(ProxyMenuItemFactory.actionSelectProxy(sender:)), keyEquivalent: "")
                     proxyItem.target = ProxyMenuItemFactory.self
                     proxyItem.state = proxy.stringValue == selectedName ? .on : .off
@@ -29,7 +29,7 @@ class ProxyMenuItemFactory {
                 menu.submenu = submenu
                 menuItems.append(menu);
             }
-            completionHandler(menuItems)
+            completionHandler(menuItems.reversed())
         }
     }