Merge remote-tracking branch 'upstream/master'

MTMR/AppleScriptTouchBarItem.swift

@@ -35,7 +35,7 @@ class AppleScriptTouchBarItem: CustomButtonTouchBarItem {
     
     func refreshAndSchedule() {
         #if DEBUG
-            print("refresh happened")
+            print("refresh happened (interval \(self.interval)), self \(self.identifier.rawValue))")
         #endif
         let scriptResult = self.execute()
         DispatchQueue.main.async {

MTMR/TouchBarController.swift

@@ -50,7 +50,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
 
     static let shared = TouchBarController()
 
-    let touchBar = NSTouchBar()
+    var touchBar: NSTouchBar!
 
     var itemDefinitions: [NSTouchBarItem.Identifier: BarItemDefinition] = [:]
     var items: [NSTouchBarItem.Identifier: NSTouchBarItem] = [:]
@@ -69,6 +69,10 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     }
     
     func createAndUpdatePreset(jsonItems: [BarItemDefinition]? = nil) {
+        if let oldBar = self.touchBar {
+            NSTouchBar.minimizeSystemModalFunctionBar(oldBar)
+        }
+        self.touchBar = NSTouchBar()
         var jsonItems = jsonItems
         self.itemDefinitions = [:]
         self.items = [:]
@@ -110,8 +114,11 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     }
     
     func loadItemDefinitions(jsonItems: [BarItemDefinition]) {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "HH-mm-ss"
+        let time = dateFormatter.string(from: Date())
         for item in jsonItems {
-            let identifierString = item.type.identifierBase.appending(UUID().uuidString)
+            let identifierString = item.type.identifierBase.appending(time + "--" + UUID().uuidString)
             let identifier = NSTouchBarItem.Identifier(identifierString)
             itemDefinitions[identifier] = item
             if item.align == .left {

MTMR/defaultPreset.json

@@ -73,6 +73,7 @@
   { "type": "volumeDown", "width": 34, "align": "right" },
   { "type": "volume", "width": 60, "align": "right" },
   { "type": "volumeUp", "width": 34, "align": "right" },
+  { "type": "inputsource", "align": "right" },
   { "type": "battery", "align": "right" },
   { "type": "timeButton", "align": "right" }
 ]