From 42d3d29e0d3d97380e9d45d77348bb8512feb930 Mon Sep 17 00:00:00 2001
From: ad <daniel.apatin@gmail.com>
Date: Thu, 17 May 2018 13:21:58 +0300
Subject: [PATCH] Remove "Reload Preset" and fix reloading preset

---
 MTMR/AppDelegate.swift        | 19 +++++++++++--------
 MTMR/TouchBarController.swift | 14 +++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/MTMR/AppDelegate.swift b/MTMR/AppDelegate.swift
index 051be3f..4af19f7 100644
--- a/MTMR/AppDelegate.swift
+++ b/MTMR/AppDelegate.swift
@@ -28,7 +28,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         
     }
     
-    @objc func openPrefereces(_ sender: Any?) {
+    @objc func openPreferences(_ sender: Any?) {
         let task = Process()
         let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR")
         let presetPath = appSupportDirectory.appending("/items.json")
@@ -37,9 +37,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         task.launch()
     }
     
-    @objc func updatePreset(_ sender: Any?) {
-        TouchBarController.shared.createAndUpdatePreset()
-    }
+//    @objc func updatePreset(_ sender: Any?) {
+//        TouchBarController.shared.createAndUpdatePreset()
+//    }
     
     @objc func toggleControlStrip(_ sender: Any?) {
         TouchBarController.shared.controlStripState = !TouchBarController.shared.controlStripState
@@ -83,15 +83,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 let jsonData = path.fileData
                 let jsonItems = jsonData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
                 
-                TouchBarController.shared.createAndUpdatePreset(jsonItems: jsonItems)
+                TouchBarController.shared.createAndUpdatePreset(newJsonItems: jsonItems)
             }
         }
     }
     
     func createMenu() {
         let menu = NSMenu()
-        menu.addItem(withTitle: "Preferences", action: #selector(openPrefereces(_:)), keyEquivalent: ",")
-        menu.addItem(withTitle: "Reload Preset", action: #selector(updatePreset(_:)), keyEquivalent: "r")
+        menu.addItem(withTitle: "Preferences", action: #selector(openPreferences(_:)), keyEquivalent: ",")
+//        menu.addItem(withTitle: "Reload Preset", action: #selector(updatePreset(_:)), keyEquivalent: "r")
         menu.addItem(withTitle: "Open Preset", action: #selector(openPreset(_:)), keyEquivalent: "O")
         menu.addItem(withTitle: TouchBarController.shared.controlStripState ? "Hide Control Strip" : "Show Control Strip" , action: #selector(toggleControlStrip(_:)), keyEquivalent: "T")
         menu.addItem(withTitle: "Toggle blackList current app" , action: #selector(toggleBlackListedApp(_:)), keyEquivalent: "B")
@@ -110,7 +110,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         self.fileSystemSource?.setEventHandler(handler: {
             print("Config changed, reloading...")
             DispatchQueue.main.async {
-                TouchBarController.shared.createAndUpdatePreset()
+                let jsonData = file.path.fileData
+                let jsonItems = jsonData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
+                
+                TouchBarController.shared.createAndUpdatePreset(newJsonItems: jsonItems)
             }
         })
         
diff --git a/MTMR/TouchBarController.swift b/MTMR/TouchBarController.swift
index 290ee8a..41bdd2c 100644
--- a/MTMR/TouchBarController.swift
+++ b/MTMR/TouchBarController.swift
@@ -54,6 +54,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
 
     var touchBar: NSTouchBar!
 
+    var jsonItems: [BarItemDefinition]?
     var itemDefinitions: [NSTouchBarItem.Identifier: BarItemDefinition] = [:]
     var items: [NSTouchBarItem.Identifier: NSTouchBarItem] = [:]
     var leftIdentifiers: [NSTouchBarItem.Identifier] = []
@@ -95,22 +96,25 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         createAndUpdatePreset()
     }
     
-    func createAndUpdatePreset(jsonItems: [BarItemDefinition]? = nil) {
+    func createAndUpdatePreset(newJsonItems: [BarItemDefinition]? = nil) {
         if let oldBar = self.touchBar {
             NSTouchBar.minimizeSystemModalFunctionBar(oldBar)
         }
         self.touchBar = NSTouchBar()
-        var jsonItems = jsonItems
+        if (newJsonItems != nil) {
+            self.jsonItems = newJsonItems
+        }
         self.itemDefinitions = [:]
         self.items = [:]
         self.leftIdentifiers = []
         self.centerItems = []
         self.rightIdentifiers = []
         
-        if (jsonItems == nil) {
-            jsonItems = readConfig()
+        if (self.jsonItems == nil) {
+            self.jsonItems = readConfig()
         }
-        loadItemDefinitions(jsonItems: jsonItems!)
+        
+        loadItemDefinitions(jsonItems: self.jsonItems!)
         createItems()
         
         centerItems = centerIdentifiers.compactMap({ (identifier) -> NSTouchBarItem? in