Merge branch 'development'

Author: anselanza

src/model.rs

@@ -645,6 +645,7 @@ pub fn attempt_connection(model: &mut Model) {
     match model.tether_interface.connect(
         model.should_quit.clone(),
         model.settings.tether_host.as_deref(),
+        model.settings.tether_subscribe_id.as_deref(),
     ) {
         Ok(_) => {
             model.tether_status = TetherStatus::Connected;

src/settings.rs

@@ -48,6 +48,11 @@ pub struct Cli {
     #[arg(long = "tether.noAutoConnect")]
     pub tether_disable_autoconnect: bool,
 
+    /// Optionally set an ID/group for lighting-related Input Plugs (macros, scenes); useful for separating messages.
+    /// Essentially defaults to wildcard (+) if omitted. Does NOT affect Tether MIDI subscriptions.
+    #[arg(long = "tether.subscribe.id")]
+    pub tether_subscribe_id: Option<String>,
+
     /// Host/IP for Tether MQTT Broker
     #[arg(long = "tether.host")]
     pub tether_host: Option<String>,

src/tether_interface.rs

@@ -97,6 +97,7 @@ impl TetherInterface {
         &mut self,
         should_quit: Arc<Mutex<bool>>,
         tether_host: Option<&str>,
+        lighting_id: Option<&str>,
     ) -> Result<(), anyhow::Error> {
         info!("Attempt to connect Tether Agent...");
 
@@ -117,10 +118,12 @@ impl TetherInterface {
                 .expect("failed to create Input Plug");
 
             let input_macros = PlugOptionsBuilder::create_input("macros")
+                .id(lighting_id)
                 .build(&mut tether_agent)
                 .expect("failed to create Input Plug");
 
             let input_scenes = PlugOptionsBuilder::create_input("scenes")
+                .id(lighting_id)
                 .build(&mut tether_agent)
                 .expect("failed to create Input Plug");