Made more things public, added From impls

Author: G2-Games

src/netmd/commands.rs

@@ -40,6 +40,15 @@ pub struct Time {
     pub frame: u16,
 }
 
+impl From<Time> for Duration {
+    fn from(value: Time) -> Self {
+        Duration::from_millis(
+            (value.minute as u64 * 60000)
+            + (value.second as u64 * 1000)
+        )
+    }
+}
+
 /// A representation of the current status of the device.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct DeviceStatus {
@@ -131,6 +140,22 @@ pub struct Disc {
 }
 
 impl Disc {
+    pub fn title(&self) -> &String {
+        &self.title
+    }
+
+    pub fn full_width_title(&self) -> &String {
+        &self.full_width_title
+    }
+
+    pub fn writeable(&self) -> bool {
+        self.writeable
+    }
+
+    pub fn write_protected(&self) -> bool {
+        self.write_protected
+    }
+
     pub fn track_count(&self) -> u16 {
         self.groups
             .iter()
@@ -328,7 +353,7 @@ impl NetMDContext {
     }
 
     /// Get the current status of the device
-    pub async fn device_status(&mut self) -> Result<DeviceStatus, Box<dyn Error>> {
+    pub async fn device_status(&mut self) -> Result<DeviceStatus, InterfaceError> {
         let status = self.interface.status().await?;
         let playback_status = self.interface.playback_status2().await?;
         let b1: u16 = playback_status[4] as u16;
@@ -359,7 +384,7 @@ impl NetMDContext {
     }
 
     /// Get a representation of the current disc inserted in the device.
-    pub async fn list_content(&mut self) -> Result<Disc, Box<dyn Error>> {
+    pub async fn list_content(&mut self) -> Result<Disc, InterfaceError> {
         let flags = self.interface.disc_flags().await?;
         let title = self.interface.disc_title(false).await?;
         let full_width_title = self.interface.disc_title(true).await?;
@@ -439,7 +464,7 @@ impl NetMDContext {
         &mut self,
         new_name: &str,
         new_fw_name: Option<&str>,
-    ) -> Result<(), Box<dyn Error>> {
+    ) -> Result<(), InterfaceError> {
         let new_name = sanitize_half_width_title(new_name);
         let new_fw_name = new_fw_name.map(sanitize_full_width_title);
 
@@ -519,7 +544,7 @@ impl NetMDContext {
         &mut self,
         track: u16,
         progress_callback: Option<F>,
-    ) -> Result<(DiscFormat, Vec<u8>), Box<dyn Error>> {
+    ) -> Result<(DiscFormat, Vec<u8>), InterfaceError> {
         let mut output_vec = Vec::new();
         let (format, _frames, result) = self
             .interface
@@ -548,7 +573,7 @@ impl NetMDContext {
         Ok((format, header))
     }
 
-    async fn prepare_download(&mut self) -> Result<(), Box<dyn Error>> {
+    async fn prepare_download(&mut self) -> Result<(), InterfaceError> {
         while ![OperatingStatus::DiscBlank, OperatingStatus::Ready].contains(
             &self
                 .device_status()
@@ -611,7 +636,7 @@ impl NetMDContext {
         &mut self,
         track: MDTrack,
         progress_callback: F,
-    ) -> Result<(u16, Vec<u8>, Vec<u8>), Box<dyn Error>>
+    ) -> Result<(u16, Vec<u8>, Vec<u8>), InterfaceError>
     {
         self.prepare_download().await?;
         // Lock the interface by providing it to the session

src/netmd/interface.rs

@@ -12,7 +12,6 @@ use log::debug;
 use num_derive::FromPrimitive;
 use rand::RngCore;
 use std::collections::HashMap;
-use std::error::Error;
 use std::time::Duration;
 use thiserror::Error;
 
@@ -22,7 +21,7 @@ use super::utils::{cross_sleep, to_sjis};
 
 /// An action to take on the player
 #[derive(Copy, Clone)]
-enum Action {
+pub enum Action {
     Play = 0x75,
     Pause = 0x7d,
     FastForward = 0x39,
@@ -251,6 +250,9 @@ pub enum EncryptionError {
 
     #[error("supplied {0} length of {1} is invalid")]
     InvalidLength(&'static str, usize),
+
+    #[error("{0}")]
+    InvalidState(&'static str)
 }
 
 /// An error for any action in the interface
@@ -494,14 +496,14 @@ impl NetMDInterface {
             data = self.device.read_reply(None).await?;
 
             let status = NetmdStatus::try_from(data[0])?;
-            debug!("Device status: {:?}", status);
+            debug!("Device status: {status:?}");
 
             match status {
                 NetmdStatus::NotImplemented => {
-                    return Err(InterfaceError::NotImplemented(format!("{:02X?}", data)))
+                    return Err(InterfaceError::NotImplemented(format!("{data:02X?}")))
                 }
                 NetmdStatus::Rejected => {
-                    return Err(InterfaceError::Rejected(format!("{:02X?}", data)))
+                    return Err(InterfaceError::Rejected(format!("{data:02X?}")))
                 }
                 NetmdStatus::Interim if !accept_interim => {
                     let sleep_time = Self::INTERIM_RESPONSE_RETRY_INTERVAL
@@ -518,15 +520,15 @@ impl NetMDInterface {
                     }
                     return Ok(data);
                 }
-                _ => return Err(InterfaceError::Unknown(format!("{:02X?}", data))),
+                _ => return Err(InterfaceError::Unknown(format!("{data:02X?}"))),
             }
         }
 
         // This should NEVER happen unless the code is changed wrongly
         unreachable!("The max number of retries is set to 0!")
     }
 
-    async fn playback_control(&mut self, action: Action) -> Result<(), InterfaceError> {
+    pub async fn playback_control(&mut self, action: Action) -> Result<(), InterfaceError> {
         let query = format_query(
             "18c3 ff %b 000000".to_string(),
             vec![QueryValue::Number(action as i64)],
@@ -974,9 +976,6 @@ impl NetMDInterface {
 
         let raw_full_title = self.raw_disc_title(true).await?;
 
-        dbg!(&raw_title);
-        dbg!(&raw_full_title);
-
         let mut full_width_group_list = raw_full_title.split("／／");
 
         for (i, group) in group_list.enumerate() {
@@ -1029,8 +1028,7 @@ impl NetMDInterface {
             for track in track_min - 1..track_max {
                 if track_dict.contains_key(&track) {
                     return Err(InterfaceError::GroupError(format!(
-                        "track {} is in 2 groups",
-                        track
+                        "track {track} is in 2 groups",
                     )));
                 }
                 track_dict.insert(track, (String::from(group_name), i as u16));
@@ -1119,10 +1117,10 @@ impl NetMDInterface {
         Ok(title)
     }
 
-    // Sets the title of the disc
-    //
-    // Caution: This does not respect groups. Use the functions available in
-    // NetMDContext to properly rename a disc.
+    /// Sets the title of the disc
+    ///
+    /// ## Caution: This does not respect groups.
+    /// Use the functions available in NetMDContext to properly rename a disc.
     pub async fn set_disc_title(&mut self, title: &str, wchar: bool) -> Result<(), InterfaceError> {
         let current_title = self.raw_disc_title(wchar).await?;
         if current_title == title {
@@ -1948,7 +1946,7 @@ pub(super) struct MDSession<'a> {
 }
 
 impl<'a> MDSession<'a> {
-    pub async fn init(&mut self) -> Result<(), Box<dyn Error>> {
+    pub async fn init(&mut self) -> Result<(), InterfaceError> {
         self.md.enter_secure_session().await?;
         self.md.leaf_id().await?;
 
@@ -1971,7 +1969,7 @@ impl<'a> MDSession<'a> {
         Ok(())
     }
 
-    pub async fn close(&mut self) -> Result<(), Box<dyn Error>> {
+    pub async fn close(&mut self) -> Result<(), InterfaceError> {
         if self.hex_session_key.is_none() {
             self.md.session_key_forget().await?;
         }
@@ -1985,10 +1983,10 @@ impl<'a> MDSession<'a> {
         mut track: MDTrack,
         progress_callback: F,
         disc_format: Option<DiscFormat>,
-    ) -> Result<(u16, Vec<u8>, Vec<u8>), Box<dyn Error>>
+    ) -> Result<(u16, Vec<u8>, Vec<u8>), InterfaceError>
     {
         if self.hex_session_key.is_none() {
-            return Err("Cannot download a track using a non-init()'ed session!".into());
+            return Err(EncryptionError::InvalidState("Cannot download a track using a non-init()'ed session!").into());
         }
         self.md
             .setup_download(