chore: refactor impl

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

src/cli/backup/mod.rs

@@ -20,30 +20,28 @@ pub enum BackupCmd {
     },
 }
 
-fn handle_export(device_id: Option<&str>, output: &Output) -> Result<(), anyhow::Error> {
-    let camera = usb::get_camera(device_id)?;
-    let mut ptp = camera.ptp_session()?;
+fn handle_export(device_id: Option<&str>, output: &Output) -> anyhow::Result<()> {
+    let mut camera = usb::get_camera(device_id)?;
 
     let mut writer = output.get_writer()?;
-    let backup = camera.export_backup(&mut ptp)?;
+    let backup = camera.export_backup()?;
     writer.write_all(&backup)?;
 
     Ok(())
 }
 
-fn handle_import(device_id: Option<&str>, input: &Input) -> Result<(), anyhow::Error> {
-    let camera = usb::get_camera(device_id)?;
-    let mut ptp = camera.ptp_session()?;
+fn handle_import(device_id: Option<&str>, input: &Input) -> anyhow::Result<()> {
+    let mut camera = usb::get_camera(device_id)?;
 
     let mut reader = input.get_reader()?;
-    let mut buffer = Vec::new();
-    reader.read_to_end(&mut buffer)?;
-    camera.import_backup(&mut ptp, &buffer)?;
+    let mut backup = Vec::new();
+    reader.read_to_end(&mut backup)?;
+    camera.import_backup(&backup)?;
 
     Ok(())
 }
 
-pub fn handle(cmd: BackupCmd, device_id: Option<&str>) -> Result<(), anyhow::Error> {
+pub fn handle(cmd: BackupCmd, device_id: Option<&str>) -> anyhow::Result<()> {
     match cmd {
         BackupCmd::Export { output_file } => handle_export(device_id, &output_file),
         BackupCmd::Import { input_file } => handle_import(device_id, &input_file),

src/cli/common/file.rs

@@ -18,7 +18,7 @@ impl FromStr for Input {
 }
 
 impl Input {
-    pub fn get_reader(&self) -> Result<Box<dyn io::Read>, anyhow::Error> {
+    pub fn get_reader(&self) -> anyhow::Result<Box<dyn io::Read>> {
         match self {
             Self::Stdin => Ok(Box::new(io::stdin())),
             Self::Path(path) => Ok(Box::new(File::open(path)?)),
@@ -44,7 +44,7 @@ impl FromStr for Output {
 }
 
 impl Output {
-    pub fn get_writer(&self) -> Result<Box<dyn io::Write>, anyhow::Error> {
+    pub fn get_writer(&self) -> anyhow::Result<Box<dyn io::Write>> {
         match self {
             Self::Stdout => Ok(Box::new(io::stdout())),
             Self::Path(path) => Ok(Box::new(File::create(path)?)),

src/cli/device/mod.rs

@@ -4,7 +4,7 @@ use clap::Subcommand;
 use serde::Serialize;
 
 use crate::{
-    hardware::{CameraImpl, UsbMode},
+    camera::{Camera, UsbMode},
     usb,
 };
 
@@ -21,19 +21,19 @@ pub enum DeviceCmd {
 
 #[derive(Serialize)]
 pub struct CameraItemRepr {
-    pub name: String,
-    pub id: String,
+    pub name: &'static str,
+    pub usb_id: String,
     pub vendor_id: String,
     pub product_id: String,
 }
 
-impl From<&Box<dyn CameraImpl>> for CameraItemRepr {
-    fn from(camera: &Box<dyn CameraImpl>) -> Self {
+impl From<&Camera> for CameraItemRepr {
+    fn from(camera: &Camera) -> Self {
         Self {
-            id: camera.usb_id(),
-            name: camera.id().name.to_string(),
-            vendor_id: format!("0x{:04x}", camera.id().vendor),
-            product_id: format!("0x{:04x}", camera.id().product),
+            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()),
         }
     }
 }
@@ -42,14 +42,14 @@ impl fmt::Display for CameraItemRepr {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "{} ({}:{}) (ID: {})",
-            self.name, self.vendor_id, self.product_id, self.id
+            "{} ({}:{}) (USB ID: {})",
+            self.name, self.vendor_id, self.product_id, self.usb_id
         )
     }
 }
 
-fn handle_list(json: bool) -> Result<(), anyhow::Error> {
-    let cameras: Vec<CameraItemRepr> = usb::get_connected_camers()?
+fn handle_list(json: bool) -> anyhow::Result<()> {
+    let cameras: Vec<CameraItemRepr> = usb::get_connected_cameras()?
         .iter()
         .map(std::convert::Into::into)
         .collect();
@@ -88,7 +88,7 @@ pub struct CameraRepr {
 impl fmt::Display for CameraRepr {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         writeln!(f, "Name: {}", self.device.name)?;
-        writeln!(f, "ID: {}", self.device.id)?;
+        writeln!(f, "USB ID: {}", self.device.usb_id)?;
         writeln!(
             f,
             "Vendor ID: {}, Product ID: {}",
@@ -103,15 +103,12 @@ impl fmt::Display for CameraRepr {
     }
 }
 
-fn handle_info(json: bool, device_id: Option<&str>) -> Result<(), anyhow::Error> {
-    let camera = usb::get_camera(device_id)?;
-    let mut ptp = camera.ptp();
+fn handle_info(json: bool, device_id: Option<&str>) -> anyhow::Result<()> {
+    let mut camera = usb::get_camera(device_id)?;
 
-    let info = camera.get_info(&mut ptp)?;
-
-    let mut ptp = camera.open_session(ptp)?;
-    let mode = camera.get_usb_mode(&mut ptp)?;
-    let battery = camera.get_battery_info(&mut ptp)?;
+    let info = camera.get_info()?;
+    let mode = camera.get_usb_mode()?;
+    let battery = camera.get_battery_info()?;
 
     let repr = CameraRepr {
         device: (&camera).into(),
@@ -132,7 +129,7 @@ fn handle_info(json: bool, device_id: Option<&str>) -> Result<(), anyhow::Error>
     Ok(())
 }
 
-pub fn handle(cmd: DeviceCmd, json: bool, device_id: Option<&str>) -> Result<(), anyhow::Error> {
+pub fn handle(cmd: DeviceCmd, json: bool, device_id: Option<&str>) -> anyhow::Result<()> {
     match cmd {
         DeviceCmd::List => handle_list(json),
         DeviceCmd::Info => handle_info(json, device_id),