switch to JSON item filter, and use UID

technicalpickles · Aug 22, 2021 · 43f13ec · 43f13ec
1 parent e2ad9d0
commit 43f13ec
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 41 deletions.
diff --git a/Sources/systemaudio/main.swift b/Sources/systemaudio/main.swift
@@ -1,5 +1,6 @@
 import ArgumentParser
 import SimplyCoreAudio
+import Foundation
 
 let simplyCA = SimplyCoreAudio()
 
@@ -11,7 +12,7 @@ struct SystemAudio: ParsableCommand {
 	var output = false
 
 	@Argument(help: "the device to use for new input or output")
-	var deviceName : String?
+	var deviceUid : String?
 
 
 	mutating func run() throws {
@@ -25,49 +26,55 @@ struct SystemAudio: ParsableCommand {
 			devices = []
 		}
 
-		if deviceName != nil {
-			let device = devices.first(where: { $0.name == deviceName })
+		if deviceUid != nil {
+			let device = devices.first(where: { $0.uid == deviceUid })
 			if input {
 				device?.isDefaultInputDevice = true
-				print(deviceName!)
+				print(device!.name)
 			} else if output {
 				device?.isDefaultOutputDevice = true
-				print(deviceName!)
+				print(device!.name)
 			} else {
 				print("confusion!")
 			}
 			return
 		}
 
-		print("<?xml version='1.0'?>")
-		print("<items>")
+		var response: [String : [Any]] = [:]
+		var items = [Any]()
 
 		for device in devices {
 			let isOutput = device.channels(scope: .output) > 0
 			let isInput = device.channels(scope: .input) > 0
 
-			let display = device.name
-			print("  <item uid='\(display)' arg='\(display)' valid='YES' autocomplete='\(display)'>")
-			print("    <title>\(display)</title>")
+			var item: [String: Any] = [:]
+			item["title"] = device.name
+			item["uid"] = device.uid
+			item["arg"] = device.uid
+			item["autocomplete"] = device.name
 
 			// add output/input to display
 			if isOutput {
-				print("  <icon>output.png</icon>")
+				item["icon"] = ["path": "output.png"]
 				if device.isDefaultOutputDevice {
-					print("  <subtitle> Currently selected </subtitle>")
+					item["subtitle"] = "Currently selected"
 				}
 			}
 
 			if isInput {
-				print("  <icon>input.png</icon>")
+				item["icon"] = ["path": "input.png"]
 				if device.isDefaultInputDevice {
-					print("  <subtitle> Currently selected </subtitle>")
+					item["subtitle"] = "Currently selected"
 				}
 			}
 
-			print("  </item>")
+			items.append(item)
 		}
-		print("<items>")
+		response["items"] = items
+
+		let jsonData = try JSONSerialization.data(withJSONObject: response, options: [])
+		let jsonString = String(data: jsonData, encoding: String.Encoding.ascii)!
+		print(jsonString)
 	}
 }
 

diff --git a/alfred/info.plist b/alfred/info.plist
@@ -147,7 +147,7 @@
 				<key>lastpathcomponent</key>
 				<false/>
 				<key>onlyshowifquerypopulated</key>
-				<true/>
+				<false/>
 				<key>removeextension</key>
 				<false/>
 				<key>text</key>
@@ -162,29 +162,6 @@
 			<key>version</key>
 			<integer>1</integer>
 		</dict>
-		<dict>
-			<key>config</key>
-			<dict>
-				<key>concurrently</key>
-				<false/>
-				<key>escaping</key>
-				<integer>102</integer>
-				<key>script</key>
-				<string>./systemaudio -o "$1"</string>
-				<key>scriptargtype</key>
-				<integer>1</integer>
-				<key>scriptfile</key>
-				<string></string>
-				<key>type</key>
-				<integer>0</integer>
-			</dict>
-			<key>type</key>
-			<string>alfred.workflow.action.script</string>
-			<key>uid</key>
-			<string>05A9889D-04A7-4901-9FC9-6DD97AB7E885</string>
-			<key>version</key>
-			<integer>2</integer>
-		</dict>
 		<dict>
 			<key>config</key>
 			<dict>
@@ -234,6 +211,29 @@
 			<key>version</key>
 			<integer>3</integer>
 		</dict>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>concurrently</key>
+				<false/>
+				<key>escaping</key>
+				<integer>102</integer>
+				<key>script</key>
+				<string>./systemaudio -o "$1"</string>
+				<key>scriptargtype</key>
+				<integer>1</integer>
+				<key>scriptfile</key>
+				<string></string>
+				<key>type</key>
+				<integer>0</integer>
+			</dict>
+			<key>type</key>
+			<string>alfred.workflow.action.script</string>
+			<key>uid</key>
+			<string>05A9889D-04A7-4901-9FC9-6DD97AB7E885</string>
+			<key>version</key>
+			<integer>2</integer>
+		</dict>
 	</array>
 	<key>readme</key>
 	<string></string>

diff --git a/dev.sh b/dev.sh
@@ -6,7 +6,7 @@ mkdir -p dev
 
 cd dev
 ln -sf ../alfred/* ./
-ln -sf ../.build/x86_64-apple-macosx/release/systemaudio .
+ln -sf ../.build/x86_64-apple-macosx/debug/systemaudio .
 
 prefs=~/Library/Preferences/com.runningwithcrayons.Alfred-Preferences.plist
 syncfolder=$(/usr/libexec/PlistBuddy -c "print :syncfolder" $prefs 2>/dev/null || echo)