chore: refactor for device support

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

src/cli/device/mod.rs

@@ -1,12 +1,6 @@
-use std::fmt;
-
 use clap::Subcommand;
-use serde::Serialize;
 
-use crate::{
-    camera::{Camera, ptp::hex::UsbMode},
-    usb,
-};
+use crate::{camera::devices::CameraInfoListItem, usb};
 
 #[derive(Subcommand, Debug, Clone, Copy)]
 pub enum DeviceCmd {
@@ -19,38 +13,8 @@ pub enum DeviceCmd {
     Info,
 }
 
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CameraItemRepr {
-    pub name: &'static str,
-    pub usb_id: String,
-    pub vendor_id: String,
-    pub product_id: String,
-}
-
-impl From<&Camera> for CameraItemRepr {
-    fn from(camera: &Camera) -> Self {
-        Self {
-            name: camera.name(),
-            usb_id: camera.connected_usb_id(),
-            vendor_id: format!("0x{:04x}", camera.vendor_id()),
-            product_id: format!("0x{:04x}", camera.product_id()),
-        }
-    }
-}
-
-impl fmt::Display for CameraItemRepr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{} ({}:{}) (USB ID: {})",
-            self.name, self.vendor_id, self.product_id, self.usb_id
-        )
-    }
-}
-
 fn handle_list(json: bool) -> anyhow::Result<()> {
-    let cameras: Vec<CameraItemRepr> = usb::get_connected_cameras()?
+    let cameras: Vec<CameraInfoListItem> = usb::get_connected_cameras()?
         .iter()
         .map(std::convert::Into::into)
         .collect();
@@ -65,7 +29,6 @@ fn handle_list(json: bool) -> anyhow::Result<()> {
         return Ok(());
     }
 
-    println!("Connected Cameras:");
     for d in cameras {
         println!("- {d}");
     }
@@ -73,54 +36,10 @@ fn handle_list(json: bool) -> anyhow::Result<()> {
     Ok(())
 }
 
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CameraRepr {
-    #[serde(flatten)]
-    pub device: CameraItemRepr,
-
-    pub manufacturer: String,
-    pub model: String,
-    pub device_version: String,
-    pub serial_number: String,
-    pub mode: UsbMode,
-    pub battery: u32,
-}
-
-impl fmt::Display for CameraRepr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        writeln!(f, "Name: {}", self.device.name)?;
-        writeln!(f, "USB ID: {}", self.device.usb_id)?;
-        writeln!(
-            f,
-            "Vendor ID: {}, Product ID: {}",
-            self.device.vendor_id, self.device.product_id
-        )?;
-        writeln!(f, "Manufacturer: {}", self.manufacturer)?;
-        writeln!(f, "Model: {}", self.model)?;
-        writeln!(f, "Version: {}", self.device_version)?;
-        writeln!(f, "Serial Number: {}", self.serial_number)?;
-        writeln!(f, "Mode: {}", self.mode)?;
-        write!(f, "Battery: {}%", self.battery)
-    }
-}
-
 fn handle_info(json: bool, device_id: Option<&str>) -> anyhow::Result<()> {
     let mut camera = usb::get_camera(device_id)?;
 
-    let info = camera.get_info()?;
-    let mode = camera.get_usb_mode()?;
-    let battery = camera.get_battery_info()?;
-
-    let repr = CameraRepr {
-        device: (&camera).into(),
-        manufacturer: info.manufacturer.clone(),
-        model: info.model.clone(),
-        device_version: info.device_version.clone(),
-        serial_number: info.serial_number,
-        mode,
-        battery,
-    };
+    let repr = camera.info_get()?;
 
     if json {
         println!("{}", serde_json::to_string_pretty(&repr)?);