feat: add missing is_enabled and priority fields to CLI output

vpetersson · vpetersson · commit 0d9f047e7f0b · 2025-07-14T22:12:06.000+01:00
Fixes #240 - Add is_enabled and priority columns to Screens and Playlists formatters - Display boolean fields with visual indicators (✅ for true, ❌ for false) - Update test expectations to match new output format - Refactor boolean formatting logic to eliminate code duplication - Apply clippy fixes for improved code quality The v3 API documentation indicates these fields should be returned, but they were missing from the CLI table output. Now users can see the complete object information as specified in the API docs.
diff --git a/build.rs b/build.rs
@@ -27,7 +27,7 @@ fn main() {
     };
     fs::write(
         dest_path,
-        format!("pub const API_BASE_URL: &str = \"{}\";", api_server),
+        format!("pub const API_BASE_URL: &str = \"{api_server}\";"),
     )
     .unwrap();
     println!("cargo:rerun-if-changed=build.rs");
diff --git a/src/api/asset.rs b/src/api/asset.rs
@@ -24,8 +24,7 @@ impl Api {
         Ok(serde_json::from_value(commands::get(
             &self.authentication,
             &format!(
-                "v4/assets?select=signature&app_id=eq.{}&app_revision=eq.{}&type=eq.edge-app-file",
-                app_id, revision
+                "v4/assets?select=signature&app_id=eq.{app_id}&app_revision=eq.{revision}&type=eq.edge-app-file"
             ),
         )?)?)
     }
@@ -38,8 +37,7 @@ impl Api {
         let response = commands::get(
             &self.authentication,
             &format!(
-                "v4/assets?select=status,processing_error,title&app_id=eq.{}&app_revision=eq.{}&status=neq.finished",
-                app_id, revision
+                "v4/assets?select=status,processing_error,title&app_id=eq.{app_id}&app_revision=eq.{revision}&status=neq.finished"
             ),
         )?;
 
diff --git a/src/api/edge_app/app.rs b/src/api/edge_app/app.rs
@@ -53,15 +53,15 @@ impl Api {
     pub fn delete_app(&self, app_id: &str) -> Result<(), CommandError> {
         commands::delete(
             &self.authentication,
-            &format!("v4/edge-apps?id=eq.{}", app_id),
+            &format!("v4/edge-apps?id=eq.{app_id}"),
         )?;
         Ok(())
     }
 
     pub fn update_app(&self, app_id: &str, name: &str) -> Result<(), CommandError> {
         commands::patch(
             &self.authentication,
-            &format!("v4/edge-apps?select=name&id=eq.{}", app_id),
+            &format!("v4/edge-apps?select=name&id=eq.{app_id}"),
             &json!({ "name": name }),
         )?;
         Ok(())
@@ -70,14 +70,13 @@ impl Api {
     pub fn get_app(&self, app_id: &str) -> Result<EdgeApp, CommandError> {
         let response = commands::get(
             &self.authentication,
-            &format!("v4/edge-apps?select=name&id=eq.{}", app_id),
+            &format!("v4/edge-apps?select=name&id=eq.{app_id}"),
         )?;
 
         let apps = serde_json::from_value::<Vec<EdgeApp>>(response)?;
         if apps.is_empty() {
             Err(CommandError::AppNotFound(format!(
-                "Edge app with ID '{}' not found.",
-                app_id
+                "Edge app with ID '{app_id}' not found."
             )))
         } else {
             Ok(apps[0].clone())
diff --git a/src/api/edge_app/channel.rs b/src/api/edge_app/channel.rs
@@ -16,8 +16,7 @@ impl Api {
         let response = commands::patch(
             &self.authentication,
             &format!(
-                "v4/edge-apps/channels?select=channel,app_revision&channel=eq.{}&app_id=eq.{}",
-                channel, app_id
+                "v4/edge-apps/channels?select=channel,app_revision&channel=eq.{channel}&app_id=eq.{app_id}"
             ),
             &json!(
             {
diff --git a/src/api/edge_app/installation.rs b/src/api/edge_app/installation.rs
@@ -21,8 +21,7 @@ impl Api {
         let response = commands::get(
             &self.authentication,
             &format!(
-                "v4.1/edge-apps/installations?select=name&id=eq.{}",
-                installation_id
+                "v4.1/edge-apps/installations?select=name&id=eq.{installation_id}"
             ),
         )?;
 
@@ -43,8 +42,7 @@ impl Api {
         let response = commands::get(
             &self.authentication,
             &format!(
-                "v4/edge-apps/installations?select=id,name&app_id=eq.{}",
-                app_id
+                "v4/edge-apps/installations?select=id,name&app_id=eq.{app_id}"
             ),
         )?;
 
@@ -56,7 +54,7 @@ impl Api {
     pub fn delete_installation(&self, installation_id: &str) -> Result<(), CommandError> {
         commands::delete(
             &self.authentication,
-            &format!("v4.1/edge-apps/installations?id=eq.{}", installation_id),
+            &format!("v4.1/edge-apps/installations?id=eq.{installation_id}"),
         )?;
         Ok(())
     }
@@ -71,7 +69,7 @@ impl Api {
         });
         commands::patch(
             &self.authentication,
-            &format!("v4.1/edge-apps/installations?id=eq.{}", installation_id),
+            &format!("v4.1/edge-apps/installations?id=eq.{installation_id}"),
             &payload,
         )?;
         Ok(())
diff --git a/src/api/edge_app/setting.rs b/src/api/edge_app/setting.rs
@@ -173,8 +173,7 @@ where
     match SettingType::from_str(&s.to_lowercase()) {
         Ok(setting_type) => Ok(setting_type),
         Err(_) => Err(serde::de::Error::custom(format!(
-            "Setting type should be one of the following:\n{}",
-            valid_setting_types
+            "Setting type should be one of the following:\n{valid_setting_types}"
         ))),
     }
 }
@@ -212,8 +211,7 @@ impl Api {
         Ok(deserialize_settings_from_array(commands::get(
             &self.authentication,
             &format!(
-                "v4.1/edge-apps/settings?select=name,type,default_value,optional,title,help_text&app_id=eq.{}&order=name.asc",
-                app_id,
+                "v4.1/edge-apps/settings?select=name,type,default_value,optional,title,help_text&app_id=eq.{app_id}&order=name.asc",
             ),
         )?)?)
     }
@@ -222,8 +220,7 @@ impl Api {
         let response = commands::get(
             &self.authentication,
             &format!(
-                "v4.1/edge-apps/settings?select=is_global&app_id=eq.{}&name=eq.{}",
-                app_id, setting_key,
+                "v4.1/edge-apps/settings?select=is_global&app_id=eq.{app_id}&name=eq.{setting_key}",
             ),
         )?;
 
@@ -247,8 +244,7 @@ impl Api {
         // TODO: test values are returned properly when there are several installations. Most likely need to feed installation_id to the request.
         // installation_id=is.null or installation_id=eq.smth
         let app_settings: Vec<HashMap<String, serde_json::Value>> = serde_json::from_value(commands::get(&self.authentication,
-            &format!("v4.1/edge-apps/settings?select=name,type,default_value,optional,title,help_text,edge_app_setting_values(value)&app_id=eq.{}&order=name.asc",
-                app_id,
+            &format!("v4.1/edge-apps/settings?select=name,type,default_value,optional,title,help_text,edge_app_setting_values(value)&app_id=eq.{app_id}&order=name.asc",
             ))?)?;
 
         Ok(EdgeAppSettings::new(serde_json::to_value(app_settings)?))
@@ -262,8 +258,7 @@ impl Api {
         let response = commands::get(
             &self.authentication,
             &format!(
-                "v4.1/edge-apps/settings?select=name,type,edge_app_setting_values(value)&app_id=eq.{}&edge_app_setting_values.app_id=eq.{}&name=eq.{}",
-                app_id, app_id, setting_key
+                "v4.1/edge-apps/settings?select=name,type,edge_app_setting_values(value)&app_id=eq.{app_id}&edge_app_setting_values.app_id=eq.{app_id}&name=eq.{setting_key}"
             ),
         )?;
         let settings = serde_json::from_value::<Vec<SettingValue>>(response)?;
@@ -282,8 +277,7 @@ impl Api {
         let response = commands::get(
             &self.authentication,
             &format!(
-                "v4.1/edge-apps/settings?select=name,type,edge_app_setting_values(value)&edge_app_setting_values.installation_id=eq.{}&name=eq.{}&app_id=eq.{}",
-                installation_id, setting_key, app_id
+                "v4.1/edge-apps/settings?select=name,type,edge_app_setting_values(value)&edge_app_setting_values.installation_id=eq.{installation_id}&name=eq.{setting_key}&app_id=eq.{app_id}"
             ),
         )?;
 
@@ -388,8 +382,7 @@ impl Api {
         commands::patch(
             &self.authentication,
             &format!(
-                "v4.1/edge-apps/settings/values?app_id=eq.{}&name=eq.{}&installation_id=is.null",
-                app_id, setting_key
+                "v4.1/edge-apps/settings/values?app_id=eq.{app_id}&name=eq.{setting_key}&installation_id=is.null"
             ),
             &json!({
                 "value": setting_value,
@@ -408,8 +401,7 @@ impl Api {
         commands::patch(
             &self.authentication,
             &format!(
-                "v4.1/edge-apps/settings/values?installation_id=eq.{}&name=eq.{}",
-                installation_id, setting_key
+                "v4.1/edge-apps/settings/values?installation_id=eq.{installation_id}&name=eq.{setting_key}"
             ),
             &json!({
                 "value": setting_value,
diff --git a/src/api/edge_app/version.rs b/src/api/edge_app/version.rs
@@ -14,8 +14,7 @@ impl Api {
         let get_response = commands::get(
             &self.authentication,
             &format!(
-                "v4/edge-apps/versions?select=revision&app_id=eq.{}&revision=eq.{}",
-                app_id, revision
+                "v4/edge-apps/versions?select=revision&app_id=eq.{app_id}&revision=eq.{revision}"
             ),
         )?;
         let version =
@@ -54,8 +53,7 @@ impl Api {
         let response = commands::get(
             &self.authentication,
             &format!(
-                "v4/edge-apps/versions?select=file_tree&app_id=eq.{}&revision=eq.{}",
-                app_id, revision
+                "v4/edge-apps/versions?select=file_tree&app_id=eq.{app_id}&revision=eq.{revision}"
             ),
         )?;
 
@@ -75,8 +73,7 @@ impl Api {
         commands::patch(
             &self.authentication,
             &format!(
-                "v4/edge-apps/versions?app_id=eq.{}&revision=eq.{}",
-                app_id, revision
+                "v4/edge-apps/versions?app_id=eq.{app_id}&revision=eq.{revision}"
             ),
             &json!({"published": true}),
         )?;
diff --git a/src/api/version.rs b/src/api/version.rs
@@ -30,8 +30,7 @@ impl Api {
         let response = commands::get(
             &self.authentication,
             &format!(
-                "v4.1/edge-apps/versions?select=user_version,description,icon,author,homepage_url,revision,ready_signal&app_id=eq.{}&order=revision.desc&limit=1",
-                app_id
+                "v4.1/edge-apps/versions?select=user_version,description,icon,author,homepage_url,revision,ready_signal&app_id=eq.{app_id}&order=revision.desc&limit=1"
             ),
         )?;
 
diff --git a/src/authentication.rs b/src/authentication.rs
@@ -130,7 +130,7 @@ pub fn verify_and_store_token(
 
 fn verify_token(token: &str, api_url: &str) -> anyhow::Result<(), AuthenticationError> {
     // Using uuid of non existing playlist. If we get 404 it means we authenticated successfully.
-    let url = format!("{}/v3/groups/11CF9Z3GZR0005XXKH00F8V20R/", api_url);
+    let url = format!("{api_url}/v3/groups/11CF9Z3GZR0005XXKH00F8V20R/");
     let secret = format!("Token {token}");
     let client = reqwest::blocking::Client::builder().build()?;
 
diff --git a/src/cli.rs b/src/cli.rs
@@ -612,7 +612,7 @@ pub fn handle_cli_playlist_command(command: &PlaylistCommands) {
             match playlist_file {
                 Ok(playlist) => {
                     let pretty_playlist_file = serde_json::to_string_pretty(&playlist).unwrap();
-                    println!("{}", pretty_playlist_file);
+                    println!("{pretty_playlist_file}");
                 }
                 Err(e) => {
                     eprintln!("Error occurred when getting playlist: {e:?}")
@@ -864,8 +864,7 @@ pub fn handle_cli_edge_app_command(command: &EdgeAppCommands) {
         } => match edge_app_command.deploy(path.clone(), *delete_missing_settings) {
             Ok(revision) => {
                 println!(
-                    "Edge app successfully deployed. Revision: {revision}.",
-                    revision = revision
+                    "Edge app successfully deployed. Revision: {revision}."
                 );
             }
             Err(e) => {
@@ -883,7 +882,7 @@ pub fn handle_cli_edge_app_command(command: &EdgeAppCommands) {
                         println!("Edge app setting successfully set.");
                     }
                     Err(e) => {
-                        eprintln!("Failed to set edge app setting: {}", e);
+                        eprintln!("Failed to set edge app setting: {e}");
                         std::process::exit(1);
                     }
                 }
@@ -1136,7 +1135,7 @@ pub fn handle_cli_edge_app_command(command: &EdgeAppCommands) {
                             }
                         },
                         Err(e) => {
-                            eprintln!("Failed to delete edge app instance. {:?}", e);
+                            eprintln!("Failed to delete edge app instance. {e:?}");
                             std::process::exit(1);
                         }
                     };
diff --git a/src/commands/edge_app/app.rs b/src/commands/edge_app/app.rs
@@ -465,7 +465,7 @@ impl EdgeAppCommand {
         }
 
         let prompt = format!("It seems like the setting \"{}\" is absent in the YAML file, but it exists on the server. If you wish to skip deletion, you can leave the input blank. Warning, deleting the setting will drop all the associated values. To proceed with deletion, please confirm the setting name by writing it down: ", setting.name);
-        println!("{}", prompt);
+        println!("{prompt}");
         io::stdin()
             .read_line(&mut input_name)
             .expect("Failed to read input");
diff --git a/src/commands/edge_app/instance_manifest.rs b/src/commands/edge_app/instance_manifest.rs
@@ -68,8 +68,7 @@ where
     match s.as_str() {
         INSTANCE_MANIFEST_VERSION => Ok(s),
         invalid => Err(serde::de::Error::custom(format!(
-            "Invalid syntax: {}. Only 'instance_v1' is accepted.",
-            invalid
+            "Invalid syntax: {invalid}. Only 'instance_v1' is accepted."
         ))),
     }
 }
diff --git a/src/commands/edge_app/manifest.rs b/src/commands/edge_app/manifest.rs
@@ -141,8 +141,7 @@ where
         "basic" => Ok(AuthType::Basic),
         "bearer" => Ok(AuthType::Bearer),
         _ => Err(serde::de::Error::custom(format!(
-            "Invalid auth type: {}",
-            s
+            "Invalid auth type: {s}"
         ))),
     }
 }
@@ -155,8 +154,7 @@ where
     match s.as_str() {
         MANIFEST_VERSION => Ok(s),
         invalid => Err(serde::de::Error::custom(format!(
-            "Invalid syntax: {}. Only 'manifest_v1' is accepted.",
-            invalid
+            "Invalid syntax: {invalid}. Only 'manifest_v1' is accepted."
         ))),
     }
 }
diff --git a/src/commands/edge_app/server.rs b/src/commands/edge_app/server.rs
@@ -80,7 +80,7 @@ pub async fn run_server(
 
     tokio::task::spawn(server_future);
 
-    Ok(format!("http://{}/edge/1", addr))
+    Ok(format!("http://{addr}/edge/1"))
 }
 
 #[derive(Debug)]
@@ -134,7 +134,7 @@ async fn generate_content(
     let data: MockData = match serde_yaml::from_str(&content) {
         Ok(data) => data,
         Err(e) => {
-            eprintln!("Failed to parse mock data: {}", e);
+            eprintln!("Failed to parse mock data: {e}");
             return Err(warp::reject::not_found());
         }
     };
@@ -202,19 +202,19 @@ fn format_section(name: &str, items: &[(String, Value)]) -> String {
     let content = items
         .iter()
         .map(|(k, v)| match v {
-            Value::Str(s) => format!("        \"{}\": \"{}\"", k, s),
+            Value::Str(s) => format!("        \"{k}\": \"{s}\""),
             Value::Array(arr) => format!(
                 "        \"{}\": [{}]",
                 k,
                 arr.iter()
-                    .map(|item| format!("\"{}\"", item))
+                    .map(|item| format!("\"{item}\""))
                     .collect::<Vec<_>>()
                     .join(", ")
             ),
         })
         .collect::<Vec<_>>()
         .join(",\n");
-    format!("    {}: {{\n{}\n    }}", name, content)
+    format!("    {name}: {{\n{content}\n    }}")
 }
 
 impl EdgeAppCommand {
@@ -246,7 +246,7 @@ impl EdgeAppCommand {
                 "{}/index.html",
                 address_shared.lock().unwrap().as_ref().unwrap()
             )) {
-                eprintln!("{}", e);
+                eprintln!("{e}");
             }
 
             loop {
diff --git a/src/commands/edge_app/setting.rs b/src/commands/edge_app/setting.rs
@@ -98,7 +98,7 @@ impl EdgeAppCommand {
         if setting.edge_app_setting_values.len() == 1
             && setting.edge_app_setting_values[0].get("value").unwrap() == setting_value
         {
-            println!("Setting value is already set to {}", setting_value);
+            println!("Setting value is already set to {setting_value}");
             return Ok(());
         }
 
diff --git a/src/commands/edge_app/utils.rs b/src/commands/edge_app/utils.rs
@@ -137,7 +137,7 @@ pub fn collect_paths_for_upload(path: &Path) -> Result<Vec<EdgeAppFile>, Command
     let mut files = Vec::new();
 
     let ignore = Ignorer::new(path).map_err(|e| {
-        CommandError::IgnoreError(format!("Failed to initialize ignore module: {}", e))
+        CommandError::IgnoreError(format!("Failed to initialize ignore module: {e}"))
     })?;
 
     for entry in WalkDir::new(path)
diff --git a/src/commands/ignorer.rs b/src/commands/ignorer.rs
@@ -23,7 +23,7 @@ impl Ignorer {
                 } else if pattern.contains('*') {
                     // Convert wildcard '*' to regex '.*'
                     let converted = pattern.replace('.', r"\.").replace('*', r".*");
-                    patterns.push(format!("^{}$", converted));
+                    patterns.push(format!("^{converted}$"));
                 } else {
                     patterns.push(format!("^{}$", regex::escape(pattern)));
                 }
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
diff --git a/src/commands/screen.rs b/src/commands/screen.rs
diff --git a/src/commands/serde_utils.rs b/src/commands/serde_utils.rs

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ fn main() {`
`27`	`27`	`};`
`28`	`28`	`fs::write(`
`29`	`29`	`dest_path,`
`30`		`- format!("pub const API_BASE_URL: &str = \"{}\";", api_server),`
	`30`	`+ format!("pub const API_BASE_URL: &str = \"{api_server}\";"),`
`31`	`31`	`)`
`32`	`32`	`.unwrap();`
`33`	`33`	`println!("cargo:rerun-if-changed=build.rs");`
Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ pub fn handle_cli_playlist_command(command: &PlaylistCommands) {`
`612`	`612`	`match playlist_file {`
`613`	`613`	`Ok(playlist) => {`
`614`	`614`	`let pretty_playlist_file = serde_json::to_string_pretty(&playlist).unwrap();`
`615`		`- println!("{}", pretty_playlist_file);`
	`615`	`+ println!("{pretty_playlist_file}");`
`616`	`616`	`}`
`617`	`617`	`Err(e) => {`
`618`	`618`	`eprintln!("Error occurred when getting playlist: {e:?}")`
`@@ -864,8 +864,7 @@ pub fn handle_cli_edge_app_command(command: &EdgeAppCommands) {`
`864`	`864`	`} => match edge_app_command.deploy(path.clone(), *delete_missing_settings) {`
`865`	`865`	`Ok(revision) => {`
`866`	`866`	`println!(`
`867`		`- "Edge app successfully deployed. Revision: {revision}.",`
`868`		`- revision = revision`
	`867`	`+ "Edge app successfully deployed. Revision: {revision}."`
`869`	`868`	`);`
`870`	`869`	`}`
`871`	`870`	`Err(e) => {`
`@@ -883,7 +882,7 @@ pub fn handle_cli_edge_app_command(command: &EdgeAppCommands) {`
`883`	`882`	`println!("Edge app setting successfully set.");`
`884`	`883`	`}`
`885`	`884`	`Err(e) => {`
`886`		`- eprintln!("Failed to set edge app setting: {}", e);`
	`885`	`+ eprintln!("Failed to set edge app setting: {e}");`
`887`	`886`	`std::process::exit(1);`
`888`	`887`	`}`
`889`	`888`	`}`
`@@ -1136,7 +1135,7 @@ pub fn handle_cli_edge_app_command(command: &EdgeAppCommands) {`
`1136`	`1135`	`}`
`1137`	`1136`	`},`
`1138`	`1137`	`Err(e) => {`
`1139`		`- eprintln!("Failed to delete edge app instance. {:?}", e);`
	`1138`	`+ eprintln!("Failed to delete edge app instance. {e:?}");`
`1140`	`1139`	`std::process::exit(1);`
`1141`	`1140`	`}`
`1142`	`1141`	`};`