wip: refactor info command

Signed-off-by: George Cosma <george.cosma@wyliodrin.com>

Author: George Cosma

tockloader-lib/src/command_impl/probers/info.rs

@@ -0,0 +1,30 @@
+use crate::attributes::app_attributes::AppAttributes;
+use crate::attributes::general_attributes::GeneralAttributes;
+use crate::attributes::system_attributes::SystemAttributes;
+use crate::board_settings::BoardSettings;
+use crate::connection::{Connection, ProbeRSConnection};
+use crate::errors::TockloaderError;
+use crate::CommandInfo;
+
+impl CommandInfo for ProbeRSConnection {
+    async fn info(
+        &mut self,
+        settings: &BoardSettings,
+    ) -> Result<GeneralAttributes, TockloaderError> {
+        if !self.is_open() {
+            todo!("Error here");
+        }
+        let session = self.session.as_mut().expect("Board must be open");
+
+        let mut core = session
+            .core(self.target_info.core)
+            .map_err(|e| TockloaderError::CoreAccessError(self.target_info.core, e))?;
+
+        // TODO(george-cosma): extract these informations without bootloader
+        let system_attributes = SystemAttributes::read_system_attributes_probe(&mut core)?;
+        let app_attributes =
+            AppAttributes::read_apps_data_probe(&mut core, settings.start_address)?;
+
+        Ok(GeneralAttributes::new(system_attributes, app_attributes))
+    }
+}

tockloader-lib/src/command_impl/serial/info.rs

@@ -0,0 +1,35 @@
+use std::time::Duration;
+
+use crate::attributes::app_attributes::AppAttributes;
+use crate::attributes::general_attributes::GeneralAttributes;
+use crate::attributes::system_attributes::SystemAttributes;
+use crate::board_settings::BoardSettings;
+use crate::bootloader_serial::{ping_bootloader_and_wait_for_response, Response};
+use crate::connection::{Connection, SerialConnection};
+use crate::errors::TockloaderError;
+use crate::CommandInfo;
+
+impl CommandInfo for SerialConnection {
+    async fn info(
+        &mut self,
+        settings: &BoardSettings,
+    ) -> Result<GeneralAttributes, TockloaderError> {
+        if !self.is_open() {
+            todo!("Error here");
+        }
+        let stream = self.stream.as_mut().expect("Board must be open");
+
+        let response = ping_bootloader_and_wait_for_response(stream).await?;
+
+        if response as u8 != Response::Pong as u8 {
+            tokio::time::sleep(Duration::from_millis(100)).await;
+            let _ = ping_bootloader_and_wait_for_response(stream).await?;
+        }
+
+        let system_attributes = SystemAttributes::read_system_attributes_serial(stream).await?;
+        let app_attributes =
+            AppAttributes::read_apps_data_serial(stream, settings.start_address).await?;
+
+        Ok(GeneralAttributes::new(system_attributes, app_attributes))
+    }
+}

tockloader-lib/src/lib.rs

@@ -71,40 +71,6 @@ pub trait CommandInstall {
     ) -> Result<(), TockloaderError>;
 }
 
-pub async fn info(
-    connection: &mut Connection,
-    settings: &BoardSettings,
-) -> Result<GeneralAttributes, TockloaderError> {
-    match connection {
-        Connection::ProbeRS { session, info } => {
-            let mut core = session
-                .core(info.core)
-                .map_err(|e| TockloaderError::CoreAccessError(info.core, e))?;
-
-            // TODO: extract these informations without bootloader
-            let system_attributes = SystemAttributes::read_system_attributes_probe(&mut core)?;
-            let app_attributes =
-                AppAttributes::read_apps_data_probe(&mut core, settings.start_address)?;
-
-            Ok(GeneralAttributes::new(system_attributes, app_attributes))
-        }
-        Connection::Serial { stream, info: _ } => {
-            let response = ping_bootloader_and_wait_for_response(stream).await?;
-
-            if response as u8 != Response::Pong as u8 {
-                tokio::time::sleep(Duration::from_millis(100)).await;
-                let _ = ping_bootloader_and_wait_for_response(stream).await?;
-            }
-
-            let system_attributes = SystemAttributes::read_system_attributes_serial(stream).await?;
-            let app_attributes =
-                AppAttributes::read_apps_data_serial(stream, settings.start_address).await?;
-
-            Ok(GeneralAttributes::new(system_attributes, app_attributes))
-        }
-    }
-}
-
 pub async fn install_app(
     connection: &mut Connection,
     settings: &BoardSettings,