From d48d5904623074caff0a8b692ee8c51378065aa3 Mon Sep 17 00:00:00 2001 From: Serg Date: Mon, 9 Apr 2018 17:32:27 +0700 Subject: [PATCH] AppleScript and battery items --- MTMR.xcodeproj/project.pbxproj | 5 ++++ MTMR/AppleScriptTouchBarItem.swift | 37 ++++++++++++++++++++++++++++++ MTMR/TouchBarController.swift | 16 ++++--------- 3 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 MTMR/AppleScriptTouchBarItem.swift diff --git a/MTMR.xcodeproj/project.pbxproj b/MTMR.xcodeproj/project.pbxproj index fa95f8f..edea1c7 100644 --- a/MTMR.xcodeproj/project.pbxproj +++ b/MTMR.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 36C2ECD7207B6DAE003CDA33 /* TimeTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */; }; + 36C2ECD9207B74B4003CDA33 /* AppleScriptTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECD8207B74B4003CDA33 /* AppleScriptTouchBarItem.swift */; }; B059D622205E03F5006E6B86 /* TouchBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B059D621205E03F5006E6B86 /* TouchBarController.swift */; }; B059D624205E04F3006E6B86 /* TouchBarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = B059D623205E04F3006E6B86 /* TouchBarItems.swift */; }; B059D62D205F11E8006E6B86 /* DFRFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B059D62C205F11E8006E6B86 /* DFRFoundation.framework */; }; @@ -43,6 +44,7 @@ /* Begin PBXFileReference section */ 36C2ECD2207B3B1D003CDA33 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeTouchBarItem.swift; sourceTree = ""; }; + 36C2ECD8207B74B4003CDA33 /* AppleScriptTouchBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleScriptTouchBarItem.swift; sourceTree = ""; }; B059D621205E03F5006E6B86 /* TouchBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchBarController.swift; sourceTree = ""; }; B059D623205E04F3006E6B86 /* TouchBarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchBarItems.swift; sourceTree = ""; }; B059D629205E13E5006E6B86 /* TouchBarPrivateApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TouchBarPrivateApi.h; sourceTree = ""; }; @@ -134,6 +136,7 @@ B082B256205C7D8000BC04DC /* Assets.xcassets */, B0A7E9A9205D6AA400EEF070 /* KeyPress.swift */, B059D623205E04F3006E6B86 /* TouchBarItems.swift */, + 36C2ECD8207B74B4003CDA33 /* AppleScriptTouchBarItem.swift */, 36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */, B059D621205E03F5006E6B86 /* TouchBarController.swift */, B0C1CFC9205C97D30021C862 /* WindowController.swift */, @@ -305,12 +308,14 @@ buildActionMask = 2147483647; files = ( B059D622205E03F5006E6B86 /* TouchBarController.swift in Sources */, + 36C2ECD9207B74B4003CDA33 /* AppleScriptTouchBarItem.swift in Sources */, B082B255205C7D8000BC04DC /* ViewController.swift in Sources */, B0C1CFCA205C97D30021C862 /* WindowController.swift in Sources */, B0F8771A207AC1EA00D6E430 /* TouchBarSupport.m in Sources */, B082B253205C7D8000BC04DC /* AppDelegate.swift in Sources */, B059D624205E04F3006E6B86 /* TouchBarItems.swift in Sources */, B0A7E9AA205D6AA400EEF070 /* KeyPress.swift in Sources */, + 36C2ECD7207B6DAE003CDA33 /* TimeTouchBarItem.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MTMR/AppleScriptTouchBarItem.swift b/MTMR/AppleScriptTouchBarItem.swift new file mode 100644 index 0000000..7e10d53 --- /dev/null +++ b/MTMR/AppleScriptTouchBarItem.swift @@ -0,0 +1,37 @@ +import Foundation + +class AppleScriptTouchBarItem: NSCustomTouchBarItem { + let script: NSAppleScript + private var timer: Timer! + private let button = NSButton(title: "", target: nil, action: nil) + + init?(identifier: NSTouchBarItem.Identifier, appleScript: String, interval: TimeInterval) { + guard let script = NSAppleScript(source: appleScript) else { + return nil + } + self.script = script + super.init(identifier: identifier) + timer = Timer.scheduledTimer(timeInterval: interval, target: self, selector: #selector(refresh), userInfo: nil, repeats: true) + self.view = button + button.bezelColor = .clear + refresh() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + @objc func refresh() { + self.button.title = self.execute() + } + + func execute() -> String { + var error: NSDictionary? + let output = script.executeAndReturnError(&error) + if let error = error { + print(error) + return "error" + } + return output.stringValue ?? "empty value" + } +} diff --git a/MTMR/TouchBarController.swift b/MTMR/TouchBarController.swift index 59d852e..34868ee 100644 --- a/MTMR/TouchBarController.swift +++ b/MTMR/TouchBarController.swift @@ -87,6 +87,10 @@ class TouchBarController: NSObject, NSTouchBarDelegate { case .next: return CustomButtonTouchBarItem(identifier: identifier, title: "⏩", HIDKeycode: NX_KEYTYPE_NEXT) + case .battery: + let url = Bundle.main.url(forResource: "battery", withExtension: "scpt")! + let script = try! String.init(contentsOf: url) + return AppleScriptTouchBarItem(identifier: identifier, appleScript: script, interval: 60) case .time: return TimeTouchBarItem(identifier: identifier, formatTemplate: "HH:mm") @@ -94,18 +98,6 @@ class TouchBarController: NSObject, NSTouchBarDelegate { return nil } } - -// func getBattery() { -// var error: NSDictionary? -// if let scriptObject = NSAppleScript(source: <#T##String#>) { -// if let output: NSAppleEventDescriptor = scriptObject.executeAndReturnError( -// &error) { -// print(output.stringValue) -// } else if (error != nil) { -// print("error: \(error)") -// } -// } -// } }