v0.20.1

Stable AppleScript

MTMR.xcodeproj/project.pbxproj

@@ -46,6 +46,7 @@
 		B082B253205C7D8000BC04DC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B082B252205C7D8000BC04DC /* AppDelegate.swift */; };
 		B082B257205C7D8000BC04DC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B082B256205C7D8000BC04DC /* Assets.xcassets */; };
 		B082B25A205C7D8000BC04DC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B082B258205C7D8000BC04DC /* Main.storyboard */; };
+		B0846A752220C968000288A7 /* NetworkBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0846A742220C968000288A7 /* NetworkBarItem.swift */; };
 		B09EB1E4207C082000D5C1E0 /* HapticFeedback.swift in Sources */ = {isa = PBXBuildFile; fileRef = B09EB1E3207C082000D5C1E0 /* HapticFeedback.swift */; };
 		B09EB1E6207C0F8E00D5C1E0 /* MultitouchSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B09EB1E5207C0F8E00D5C1E0 /* MultitouchSupport.framework */; };
 		B0A7E9AA205D6AA400EEF070 /* KeyPress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0A7E9A9205D6AA400EEF070 /* KeyPress.swift */; };
@@ -126,6 +127,7 @@
 		B082B25C205C7D8000BC04DC /* MTMR.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MTMR.entitlements; sourceTree = "<group>"; };
 		B082B261205C7D8000BC04DC /* MTMRTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MTMRTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		B082B267205C7D8000BC04DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B0846A742220C968000288A7 /* NetworkBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkBarItem.swift; sourceTree = "<group>"; };
 		B09EB1E3207C082000D5C1E0 /* HapticFeedback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticFeedback.swift; sourceTree = "<group>"; };
 		B09EB1E5207C0F8E00D5C1E0 /* MultitouchSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MultitouchSupport.framework; path = ../../../../../System/Library/PrivateFrameworks/MultitouchSupport.framework; sourceTree = "<group>"; };
 		B0A7E9A9205D6AA400EEF070 /* KeyPress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPress.swift; sourceTree = "<group>"; };
@@ -276,19 +278,20 @@
 		B0B88A07208CD12000A2C160 /* Widgets */ = {
 			isa = PBXGroup;
 			children = (
-				36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */,
-				6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */,
-				6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */,
-				B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */,
-				607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */,
-				607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */,
 				6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */,
+				B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */,
+				6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */,
+				607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */,
+				B081732B213739FE005D4908 /* DnDBarItem.swift */,
+				60669B4220AD8FA80074E817 /* GroupBarItem.swift */,
 				60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */,
 				60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */,
-				60669B4220AD8FA80074E817 /* GroupBarItem.swift */,
+				B0846A742220C968000288A7 /* NetworkBarItem.swift */,
 				B08173262135F02B005D4908 /* NightShiftBarItem.swift */,
-				B081732B213739FE005D4908 /* DnDBarItem.swift */,
 				B08126EE217BD0B900A98970 /* PomodoroBarItem.swift */,
+				36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */,
+				6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */,
+				607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */,
 				B08126F0217BE19000A98970 /* WidgetProtocol.swift */,
 			);
 			path = Widgets;
@@ -437,6 +440,7 @@
 				B059D622205E03F5006E6B86 /* TouchBarController.swift in Sources */,
 				B05600D32083E9BB00EB218D /* CustomSlider.swift in Sources */,
 				36C2ECD9207B74B4003CDA33 /* AppleScriptTouchBarItem.swift in Sources */,
+				B0846A752220C968000288A7 /* NetworkBarItem.swift in Sources */,
 				B0F8771A207AC1EA00D6E430 /* TouchBarSupport.m in Sources */,
 				B08126F1217BE19000A98970 /* WidgetProtocol.swift in Sources */,
 				B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */,
@@ -626,7 +630,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = D6D8BR2QNB;

MTMR.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>BuildSystemType</key>
-	<string>Latest</string>
+	<string>Original</string>
 </dict>
 </plist>

MTMR/AppleScriptTouchBarItem.swift

@@ -9,13 +9,19 @@ class AppleScriptTouchBarItem: CustomButtonTouchBarItem {
         self.interval = interval
         super.init(identifier: identifier, title: "⏳")
         forceHideConstraint = view.widthAnchor.constraint(equalToConstant: 0)
-        guard let script = source.appleScript else {
-            title = "no script"
-            return
-        }
-        self.script = script
-        isBordered = false
+        title = "scheduled"
         DispatchQueue.appleScriptQueue.async {
+            guard let script = source.appleScript else {
+                DispatchQueue.main.async {
+                    self.title = "no script"
+                }
+                return
+            }
+            self.script = script
+            DispatchQueue.main.async {
+                self.isBordered = false
+            }
+            
             var error: NSDictionary?
             guard script.compileAndReturnError(&error) else {
                 #if DEBUG

MTMR/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.19.4</string>
+	<string>0.20.1</string>
 	<key>CFBundleVersion</key>
-	<string>140</string>
+	<string>185</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

MTMR/ItemsParsing.swift

@@ -338,6 +338,7 @@ enum ItemType: Decodable {
     case nightShift()
     case dnd()
     case pomodoro(workTime: Double, restTime: Double)
+    case network(flip: Bool)
 
     private enum CodingKeys: String, CodingKey {
         case type
@@ -358,6 +359,7 @@ enum ItemType: Decodable {
         case items
         case workTime
         case restTime
+        case flip
     }
 
     enum ItemTypeRaw: String, Decodable {
@@ -376,6 +378,7 @@ enum ItemType: Decodable {
         case nightShift
         case dnd
         case pomodoro
+        case network
     }
 
     init(from decoder: Decoder) throws {
@@ -444,6 +447,10 @@ enum ItemType: Decodable {
             let workTime = try container.decodeIfPresent(Double.self, forKey: .workTime) ?? 1500.0
             let restTime = try container.decodeIfPresent(Double.self, forKey: .restTime) ?? 600.0
             self = .pomodoro(workTime: workTime, restTime: restTime)
+            
+        case .network:
+            let flip = try container.decodeIfPresent(Bool.self, forKey: .flip) ?? false
+            self = .network(flip: flip)
         }
     }
 }

MTMR/TouchBarController.swift

@@ -49,6 +49,8 @@ extension ItemType {
             return "com.toxblh.mtmr.dnd."
         case .pomodoro(interval: _):
             return PomodoroBarItem.identifier
+        case .network(flip: _):
+            return NetworkBarItem.identifier
         }
     }
 }
@@ -279,6 +281,8 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
             barItem = DnDBarItem(identifier: identifier)
         case let .pomodoro(workTime: workTime, restTime: restTime):
             barItem = PomodoroBarItem(identifier: identifier, workTime: workTime, restTime: restTime)
+        case let .network(flip: flip):
+            barItem = NetworkBarItem(identifier: identifier, flip: flip)
         }
 
         if let action = self.action(forItem: item), let item = barItem as? CustomButtonTouchBarItem {

MTMR/Widgets/NetworkBarItem.swift

@@ -0,0 +1,147 @@
+//
+//  NetworkBarItem.swift
+//  MTMR
+//
+//  Created by Anton Palgunov on 23/02/2019.
+//  Copyright © 2019 Anton Palgunov. All rights reserved.
+//
+
+import Foundation
+
+class NetworkBarItem: CustomButtonTouchBarItem, Widget {
+    static var name: String = "network"
+    static var identifier: String = "com.toxblh.mtmr.network"
+    
+    private let flip: Bool
+    
+    init(identifier: NSTouchBarItem.Identifier, flip: Bool = false) {
+        self.flip = flip
+        super.init(identifier: identifier, title: " ")
+        startMonitoringProcess()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func startMonitoringProcess() {
+        var pipe: Pipe
+        var outputHandle: FileHandle
+        var bandwidthProcess: Process?
+        var dSpeed: UInt64?
+        var uSpeed: UInt64?
+        var curr: Array<Substring>?
+        var dataAvailable: NSObjectProtocol!
+
+        pipe = Pipe()
+        bandwidthProcess = Process()
+        bandwidthProcess?.launchPath = "/usr/bin/env"
+        bandwidthProcess?.arguments = ["netstat", "-w1", "-l", "en0"]
+        bandwidthProcess?.standardOutput = pipe
+
+        outputHandle = pipe.fileHandleForReading
+        outputHandle.waitForDataInBackgroundAndNotify(forModes: [RunLoop.Mode.common])
+
+        dataAvailable = NotificationCenter.default.addObserver(
+            forName: NSNotification.Name.NSFileHandleDataAvailable,
+            object: outputHandle,
+            queue: nil
+        ) { _ -> Void in
+            let data = pipe.fileHandleForReading.availableData
+            if data.count > 0 {
+                if let str = NSString(data: data, encoding: String.Encoding.utf8.rawValue) {
+                    curr = [""]
+                    curr = str
+                        .replacingOccurrences(of: "  ", with: " ")
+                        .split(separator: " ")
+                    if curr == nil || (curr?.count)! < 6 {} else {
+                        if Int64(curr![2]) == nil {} else {
+                            dSpeed = UInt64(curr![2])
+                            uSpeed = UInt64(curr![5])
+
+                            self.setTitle(up: self.getHumanizeSize(speed: uSpeed!), down: self.getHumanizeSize(speed: dSpeed!))
+                        }
+                    }
+                }
+                outputHandle.waitForDataInBackgroundAndNotify()
+            } else {
+                NotificationCenter.default.removeObserver(dataAvailable)
+            }
+        }
+
+        var dataReady: NSObjectProtocol!
+        dataReady = NotificationCenter.default.addObserver(
+            forName: Process.didTerminateNotification,
+            object: outputHandle,
+            queue: nil
+        ) { _ -> Void in
+            print("Task terminated!")
+            NotificationCenter.default.removeObserver(dataReady)
+        }
+
+        bandwidthProcess?.launch()
+    }
+
+    func getHumanizeSize(speed: UInt64) -> String {
+        let humanText: String
+
+        if speed < 1024 {
+            humanText = String(format: "%.0f", Double(speed)) + " B/s"
+        } else if speed < (1024 * 1024) {
+            humanText = String(format: "%.1f", Double(speed) / 1024) + " KB/s"
+        } else if speed < (1024 * 1024 * 1024) {
+            humanText = String(format: "%.1f", Double(speed) / (1024 * 1024)) + " MB/s"
+        } else {
+            humanText = String(format: "%.2f", Double(speed) / (1024 * 1024 * 1024)) + " GB/s"
+        }
+
+        return humanText
+    }
+    
+    func appendUpSpeed(appendString: NSMutableAttributedString, up: String, titleFont: NSFont, newStr: Bool = false) {
+        appendString.append(NSMutableAttributedString(
+            string: newStr ? "\n↑" : "↑",
+            attributes: [
+                NSAttributedString.Key.foregroundColor: NSColor.blue,
+                NSAttributedString.Key.font: titleFont,
+                ]))
+        
+        appendString.append(NSMutableAttributedString(
+            string: up,
+            attributes: [
+                NSAttributedString.Key.font: titleFont,
+                ]))
+    }
+    
+    func appendDownSpeed(appendString: NSMutableAttributedString, down: String, titleFont: NSFont, newStr: Bool = false) {
+        appendString.append(NSMutableAttributedString(
+            string: newStr ? "\n↓" : "↓",
+            attributes: [
+                NSAttributedString.Key.foregroundColor: NSColor.red,
+                NSAttributedString.Key.font: titleFont,
+                ]))
+            
+            appendString.append(NSMutableAttributedString(
+                string: down,
+                attributes: [
+                    NSAttributedString.Key.font: titleFont
+                ]))
+    }
+    
+    func setTitle(up: String, down: String) {
+        let titleFont = NSFont.monospacedDigitSystemFont(ofSize: 12, weight: NSFont.Weight.light)
+        
+        let newTitle: NSMutableAttributedString = NSMutableAttributedString(string: "")
+        
+        if (self.flip) {
+            appendUpSpeed(appendString: newTitle, up: up, titleFont: titleFont)
+            appendDownSpeed(appendString: newTitle, down: down, titleFont: titleFont, newStr: true)
+        } else {
+            appendDownSpeed(appendString: newTitle, down: down, titleFont: titleFont)
+            appendUpSpeed(appendString: newTitle, up: up, titleFont: titleFont, newStr: true)
+        }
+        
+        
+        self.attributedTitle = newTitle
+    }
+}

MTMR/Widgets/WidgetProtocol.swift

@@ -9,5 +9,4 @@
 protocol Widget {
     static var name: String { get }
     static var identifier: String { get }
-    static var decoder: ParametersDecoder { get }
 }

README.md

@@ -31,6 +31,17 @@ My idea is to create a platform for creating plugins to customize the TouchBar.
 - Download lastest [release](https://github.com/Toxblh/MTMR/releases) from github
 - Or via Homebrew `brew cask install mtmr`
 
+## Troubleshooting 
+Problems:
+- "After the last update my mtmr is not working anymore!"
+- "Buttons sometimes do not trigger action"
+- "ESC don't work"
+- "Gestures don't work"
+
+Re-tick or check a tick for access 🍏→ System Preferences → Security and Privacy → tab Privacy → Accessibility → MTMR
+
+<img width="450" alt="screenshot 2019-02-24 at 23 19 20" src="https://user-images.githubusercontent.com/2198153/53307057-2b078200-388c-11e9-8212-8c2b1aff0aa6.png">
+
 ## Built-in button types:
 > Buttons
 - escape
@@ -53,6 +64,7 @@ My idea is to create a platform for creating plugins to customize the TouchBar.
 - nightShift
 - dnd (Don't disturb)
 - pomodoro
+- network
 
 > Media Keys
 - previous
@@ -171,6 +183,14 @@ To close a group, use the button:
 },
 ```
 
+#### `network`
+> Network plugin. The plugin to show usage a network
+```js
+{
+  "type": "network",
+},
+```
+
 ## Actions:
 - `hidKey`
 > https://github.com/aosm/IOHIDFamily/blob/master/IOHIDSystem/IOKit/hidsystem/ev_keymap.h use only numbers

test.sh

@@ -1,8 +1,30 @@
-killall MTMR
+
+NAME='MTMR'
+killall $NAME
+
+rm -r Release 2>/dev/null
+
+# xcodebuild \
+#     -workspace ./MTMR.xcodeproj/project.xcworkspace \
+#     -scheme MTMR \
+#     -configuration Release CONFIGURATION_BUILD_DIR=./build/Release
+
+xcodebuild archive \
+	-scheme "$NAME" \
+	-archivePath Release/App.xcarchive
 
 xcodebuild \
-    -workspace ./MTMR.xcodeproj/project.xcworkspace \
-    -scheme MTMR \
-    -configuration Release CONFIGURATION_BUILD_DIR=./build/Release
+	-exportArchive \
+	-archivePath Release/App.xcarchive \
+	-exportOptionsPlist export-options.plist \
+	-exportPath Release
 
-open ./build/Release/MTMR.app
+cd Release
+rm -r App.xcarchive
+
+# Prerequisite: npm i -g create-dmg
+NAME_DMG="${NAME}.app"
+echo $NAME_DMG
+create-dmg $NAME_DMG
+
+open ./$NAME.app