feat(Command): add class to asyncronously execute commands

Author: ShadowApex

core/global/audio_manager.gd

@@ -18,9 +18,6 @@ enum VOLUME {
 ## Limit the maximum volume to 200%
 const volume_limit := "2.0"
 
-## Thread to run audio changes on
-var thread := load("res://core/systems/threading/thread_pool.tres")
-
 ## Current volume
 var current_volume := await _get_current_volume()
 var _muted := false
@@ -29,7 +26,6 @@ var _current_output := ""
 
 
 func _init() -> void:
-	thread.start()
 	current_volume = await _get_current_volume()
 	_output_devices = await _get_output_devices()
 
@@ -80,8 +76,11 @@ func set_volume(value: float, type: VOLUME = VOLUME.ABSOLUTE) -> int:
 			suffix = "%+"
 
 	var percent := value * 100
-	var args := ["set-volume", "--limit", volume_limit, "@DEFAULT_AUDIO_SINK@", str(percent) + suffix]
-	var code := await thread.exec(OS.execute.bind("wpctl", args)) as int
+	var args: Array[String] = ["set-volume", "--limit", volume_limit, "@DEFAULT_AUDIO_SINK@", str(percent) + suffix]
+	var cmd := Command.create("wpctl", args)
+	cmd.timeout = 5.0
+	cmd.execute()
+	var code := await cmd.finished as int
 
 	return code
 
@@ -90,7 +89,10 @@ func set_volume(value: float, type: VOLUME = VOLUME.ABSOLUTE) -> int:
 func toggle_mute() -> int:
 	_muted = !_muted
 	volume_mute_toggled.emit()
-	var code := await thread.exec(OS.execute.bind("wpctl", ["set-mute", "@DEFAULT_AUDIO_SINK@", "toggle"])) as int
+	var cmd := Command.create("wpctl", ["set-mute", "@DEFAULT_AUDIO_SINK@", "toggle"])
+	cmd.timeout = 5.0
+	cmd.execute()
+	var code := await cmd.finished as int
 	return code
 
 
@@ -116,7 +118,11 @@ func set_output_device(device: String) -> int:
 	var i := devices.find(device)
 	var device_id := ids[i]
 
-	return await thread.exec(OS.execute.bind("wpctl", ["set-default", device_id]))
+	var cmd := Command.create("wpctl", ["set-default", device_id])
+	cmd.timeout = 5.0
+	cmd.execute()
+
+	return await cmd.finished as int
 
 
 ## Returns the currently set output device
@@ -135,16 +141,16 @@ func get_current_volume() -> float:
 
 ## Fetch the volume for the current output device
 func _get_current_volume() -> float:
-	var output := []
-	var code := await thread.exec(OS.execute.bind("wpctl", ["get-volume", "@DEFAULT_AUDIO_SINK@"], output)) as int
-	if code != 0:
-		return -1
-	if output.size() == 0:
+	var cmd := Command.create("wpctl", ["get-volume", "@DEFAULT_AUDIO_SINK@"])
+	cmd.timeout = 5.0
+	cmd.execute()
+	var code := await cmd.finished as int
+	if code != OK:
 		return -1
 
 	# Parse the output of wpctl
 	# Example: Volume: 0.52
-	var text := output[0] as String
+	var text := cmd.stdout
 	var parts := text.split(" ")
 	if parts.size() < 2:
 		return -1
@@ -178,28 +184,26 @@ func _get_output_devices() -> PackedStringArray:
 
 # Inspects the given wirepipe object
 func _wpctl_inspect(id: String) -> PackedStringArray:
-	var out := PackedStringArray()
-	var output := []
-	var code := await thread.exec(OS.execute.bind("wpctl", ["inspect", id], output)) as int
-	if code != 0:
-		return out
-	if output.size() == 0:
-		return out
-	var text := output[0] as String
-	return text.split("\n")
+	var cmd := Command.create("wpctl", ["inspect", id])
+	cmd.timeout = 5.0
+	cmd.execute()
+	var code := await cmd.finished as int
+	if code != OK:
+		return PackedStringArray()
+	return cmd.stdout.split("\n")
 
 
 # Returns an array of discovered Wirepipe object IDs
 func _get_wpctl_object_ids() -> PackedStringArray:
 	var ids := PackedStringArray()
 
-	var output := []
-	var code := await thread.exec(OS.execute.bind("wpctl", ["status"], output)) as int
-	if code != 0:
-		return ids
-	if output.size() == 0:
+	var cmd := Command.create("wpctl", ["status"])
+	cmd.timeout = 5.0
+	cmd.execute()
+	var code := await cmd.finished as int
+	if code != OK:
 		return ids
-	var text := output[0] as String
+	var text := cmd.stdout
 	var parts := text.split(" ")
 	if parts.size() < 2:
 		return ids

core/global/battery_manager.gd

@@ -6,6 +6,6 @@ const INPUT_PLUMBER_PATH := "/usr/share/opengamepadui/scripts/manage_input"
 
 func execute() -> void:
 	logger.info("Starting InputPlumber")
-	var cmd := CommandSync.new(INPUT_PLUMBER_PATH, ["startInputPlumber"])
-	if cmd.execute() != OK:
+	var cmd := Command.create(INPUT_PLUMBER_PATH, ["startInputPlumber"])
+	if cmd.execute_blocking() != OK:
 		logger.warn("Failed to start InputPlumber: " + cmd.stdout)

core/global/battery_manager.tres

@@ -6,6 +6,6 @@ const POWERTOOLS_PATH := "/usr/share/opengamepadui/scripts/manage_input"
 
 func execute() -> void:
 	logger.info("Starting PowerStation")
-	var cmd := CommandSync.new(POWERTOOLS_PATH, ["startPowerStation"])
-	if cmd.execute() != OK:
+	var cmd := Command.create(POWERTOOLS_PATH, ["startPowerStation"])
+	if cmd.execute_blocking() != OK:
 		logger.warn("Failed to start PowerStation: " + cmd.stdout)

core/platform/actions/start_inputplumber.gd

@@ -3,7 +3,8 @@ class_name ActionTurboTakeover
 
 
 func execute() -> void:
-	var cmd := Command.new("/usr/share/opengamepadui/scripts/manage_input", ["turbo_takeover", "1"])
-	var code := await cmd.execute() as int
+	var cmd := Command.create("/usr/share/opengamepadui/scripts/manage_input", ["turbo_takeover", "1"])
+	cmd.execute()
+	var code := await cmd.finished as int
 	if code != OK:
-		logger.warn("Unable to take over turbo button: " + cmd.stdout)
+		logger.warn("Unable to take over turbo button: " + cmd.stdout + " " + cmd.stderr)

core/platform/actions/start_powerstation.gd

@@ -161,13 +161,11 @@ func trim_sd_card() -> Error:
 	return ERR_SCRIPT_FAILED
 
 
-func _execute_in_thread(path: String, args: Array = []) -> Array:
+func _execute_in_thread(path: String, args: Array[String] = []) -> Array:
 	block_operations = true
-	var thread_options := SharedThread.Option.NONE
-	var thread := SharedThread.new(thread_options)
-	thread.start()
-	var cmd := Command.new(path, args, thread)
-	var code := await cmd.execute() as int
-	thread.stop()
+	var cmd := Command.create(path, args)
+	if cmd.execute() != OK:
+		return ["", -1]
+	var code := await cmd.finished as int
 	block_operations = false
 	return [cmd.stdout, code]

core/platform/actions/turbo_takeover.gd

@@ -99,8 +99,8 @@ func _get_property(prop_path: String) -> String:
 
 ## Provides info on the GPU vendor, model, and capabilities.
 func _get_lscpu_info() -> PackedStringArray:
-	var cmd := CommandSync.new("lscpu")
-	if cmd.execute() != OK:
+	var cmd := Command.create("lscpu", [])
+	if cmd.execute_blocking() != OK:
 		return []
 	return cmd.stdout.split("\n")
 
@@ -111,4 +111,3 @@ func _to_string() -> String:
 		+ ") Model: (" + str(model) \
 		+ ") Core count: (" + str(core_count) \
 		+ ")>"
-