refactor: re-organise module structure

Signed-off-by: Chris Chan <chris.chan@techex.co.uk>

Author: cwtchan

rust/mxl/src/flow.rs

@@ -1,3 +1,6 @@
+pub mod reader;
+pub mod writer;
+
 use uuid::Uuid;
 
 use crate::{Error, Result};

rust/mxl/src/flow_reader.rs rust/mxl/src/flow/reader.rsrust/mxl/src/flow_reader.rs renamed to rust/mxl/src/flow/reader.rs

@@ -1,9 +1,10 @@
 use std::sync::Arc;
 
-use crate::flow::is_discrete_data_format;
-use crate::grain_reader::GrainReader;
-use crate::samples_reader::SamplesReader;
-use crate::{DataFormat, Error, Result, flow::FlowInfo, instance::InstanceContext};
+use crate::{
+    DataFormat, Error, GrainReader, Result, SamplesReader,
+    flow::{FlowInfo, is_discrete_data_format},
+    instance::InstanceContext,
+};
 
 pub struct MxlFlowReader {
     context: Arc<InstanceContext>,

rust/mxl/src/flow_writer.rs rust/mxl/src/flow/writer.rsrust/mxl/src/flow_writer.rs renamed to rust/mxl/src/flow/writer.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
-use crate::flow::is_discrete_data_format;
-use crate::grain_writer::GrainWriter;
-use crate::instance::create_flow_reader;
-use crate::samples_writer::SamplesWriter;
-use crate::{DataFormat, Error, Result, instance::InstanceContext};
+use crate::{
+    flow::is_discrete_data_format,
+    instance::{create_flow_reader, InstanceContext},
+    DataFormat, Error, GrainWriter, Result, SamplesWriter,
+};
 
 /// Generic MXL Flow Writer, which can be further used to build either the "discrete" (grain-based
 /// data like video frames or meta) or "continuous" (audio samples) flow writers in MXL terminology.

rust/mxl/src/grain.rs

@@ -0,0 +1,4 @@
+pub mod data;
+pub mod reader;
+pub mod write_access;
+pub mod writer;

rust/mxl/src/grain_data.rs rust/mxl/src/grain/data.rsrust/mxl/src/grain_data.rs renamed to rust/mxl/src/grain/data.rs

@@ -1,7 +1,10 @@
 use std::{sync::Arc, time::Duration};
 
-use crate::flow_reader::get_flow_info;
-use crate::{Error, GrainData, Result, flow::FlowInfo, instance::InstanceContext};
+use crate::{
+    flow::{reader::get_flow_info, FlowInfo},
+    instance::InstanceContext,
+    Error, GrainData, Result,
+};
 
 pub struct GrainReader {
     context: Arc<InstanceContext>,
@@ -49,8 +52,7 @@ impl GrainReader {
             }
             if payload_ptr.is_null() {
                 return Err(Error::Other(format!(
-                    "Failed to get grain payload for index {}.",
-                    index
+                    "Failed to get grain payload for index {index}.",
                 )));
             }
             break;

rust/mxl/src/grain_reader.rs rust/mxl/src/grain/reader.rsrust/mxl/src/grain_reader.rs renamed to rust/mxl/src/grain/reader.rs

@@ -1,9 +1,8 @@
-use std::marker::PhantomData;
-use std::sync::Arc;
+use std::{marker::PhantomData, sync::Arc};
 
 use tracing::error;
 
-use crate::{Error, Result, instance::InstanceContext};
+use crate::{instance::InstanceContext, Error, Result};
 
 /// RAII grain writing session
 ///

rust/mxl/src/grain_write_access.rs rust/mxl/src/grain/write_access.rsrust/mxl/src/grain_write_access.rs renamed to rust/mxl/src/grain/write_access.rs

@@ -1,6 +1,8 @@
 use std::sync::Arc;
 
-use crate::{Error, Result, grain_write_access::GrainWriteAccess, instance::InstanceContext};
+use super::write_access::GrainWriteAccess;
+
+use crate::{instance::InstanceContext, Error, Result};
 
 /// MXL Flow Writer for discrete flows (grain-based data like video frames)
 pub struct GrainWriter {
@@ -39,8 +41,7 @@ impl GrainWriter {
 
         if payload_ptr.is_null() {
             return Err(Error::Other(format!(
-                "Failed to open grain payload for index {}.",
-                index
+                "Failed to open grain payload for index {index}.",
             )));
         }
 

rust/mxl/src/grain_writer.rs rust/mxl/src/grain/writer.rsrust/mxl/src/grain_writer.rs renamed to rust/mxl/src/grain/writer.rs

@@ -1,30 +1,20 @@
 mod api;
 mod error;
 mod flow;
-mod flow_reader;
-mod flow_writer;
-mod grain_data;
-mod grain_reader;
-mod grain_write_access;
-mod grain_writer;
+mod grain;
 mod instance;
-mod samples_data;
-mod samples_reader;
-mod samples_write_access;
-mod samples_writer;
+mod samples;
 
 pub mod config;
 pub mod tools;
 
 pub use api::{MxlApi, load_api};
 pub use error::{Error, Result};
-pub use flow::*;
-pub use flow_reader::MxlFlowReader;
-pub use flow_writer::MxlFlowWriter;
-pub use grain_data::*;
-pub use grain_reader::GrainReader;
-pub use grain_write_access::GrainWriteAccess;
+pub use flow::{reader::MxlFlowReader, writer::MxlFlowWriter, *};
+pub use grain::{
+    data::*, reader::GrainReader, write_access::GrainWriteAccess, writer::GrainWriter,
+};
 pub use instance::MxlInstance;
-pub use samples_data::*;
-pub use samples_reader::SamplesReader;
-pub use samples_write_access::SamplesWriteAccess;
+pub use samples::{
+    data::*, reader::SamplesReader, write_access::SamplesWriteAccess, writer::SamplesWriter,
+};

rust/mxl/src/lib.rs

@@ -0,0 +1,4 @@
+pub mod data;
+pub mod reader;
+pub mod write_access;
+pub mod writer;