Add type DataSource to better handle serial port and stdio

Author: usbalbin

src/main.rs

@@ -21,10 +21,10 @@ use crate::io::{save_to_csv, FileOptions};
 use crate::serial::{load_serial_settings, serial_thread, Device};
 
 mod data;
+mod data_source;
 mod gui;
 mod io;
 mod serial;
-mod stdio;
 mod toggle;
 
 const APP_INFO: AppInfo = AppInfo {

src/serial.rs

@@ -1,14 +1,15 @@
-use std::io::{BufRead, BufReader};
+use std::io::{BufRead, BufReader, Write};
 use std::sync::mpsc::{Receiver, Sender};
 use std::sync::{Arc, RwLock};
 use std::time::{Duration, Instant};
 
 use preferences::Preferences;
 use serde::{Deserialize, Serialize};
-use serialport::{DataBits, FlowControl, Parity, SerialPort, StopBits};
+use serialport::{DataBits, FlowControl, Parity, StopBits};
 
 use crate::data::{get_epoch_ms, SerialDirection};
-use crate::{print_to_console, stdio, Packet, Print, APP_INFO, PREFS_KEY_SERIAL};
+use crate::data_source::DataSource;
+use crate::{print_to_console, Packet, Print, APP_INFO, PREFS_KEY_SERIAL};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SerialDevices {
@@ -74,16 +75,13 @@ impl Default for Device {
     }
 }
 
-fn serial_write(
-    port: &mut BufReader<Box<dyn SerialPort>>,
-    cmd: &[u8],
-) -> Result<usize, std::io::Error> {
+fn serial_write(port: &mut BufReader<DataSource>, cmd: &[u8]) -> Result<usize, std::io::Error> {
     let write_port = port.get_mut();
     write_port.write(cmd)
 }
 
 fn serial_read(
-    port: &mut BufReader<Box<dyn SerialPort>>,
+    port: &mut BufReader<DataSource>,
     serial_buf: &mut String,
 ) -> Result<usize, std::io::Error> {
     port.read_line(serial_buf)
@@ -118,7 +116,7 @@ pub fn serial_thread(
             }
             print_to_console(&print_lock, Print::Ok(format!("Connected to stdio")));
 
-            BufReader::new(Box::new(stdio::Stdio) as _)
+            BufReader::new(DataSource::Stdio)
         } else {
             match serialport::new(&device.name, device.baud_rate)
                 .timeout(Duration::from_millis(100))
@@ -135,7 +133,7 @@ pub fn serial_thread(
                             device.name, device.baud_rate
                         )),
                     );
-                    BufReader::new(p)
+                    BufReader::new(DataSource::SerialPort(p))
                 }
                 Err(err) => {
                     if let Ok(mut write_guard) = device_lock.write() {
@@ -238,7 +236,7 @@ fn disconnected(
 }
 
 fn perform_writes(
-    port: &mut BufReader<Box<dyn SerialPort>>,
+    port: &mut BufReader<DataSource>,
     send_rx: &Receiver<String>,
     raw_data_tx: &Sender<Packet>,
     t_zero: Instant,
@@ -261,11 +259,7 @@ fn perform_writes(
     }
 }
 
-fn perform_reads(
-    port: &mut BufReader<Box<dyn SerialPort>>,
-    raw_data_tx: &Sender<Packet>,
-    t_zero: Instant,
-) {
+fn perform_reads(port: &mut BufReader<DataSource>, raw_data_tx: &Sender<Packet>, t_zero: Instant) {
     let mut buf = "".to_string();
     match serial_read(port, &mut buf) {
         Ok(_) => {