feat(main): sep UI and logic

Author: HeZeBang

src/audio/recorder.rs

@@ -83,7 +83,7 @@ pub fn build_process_closure(
                                 .app_state
                                 .lock()
                                 .unwrap();
-                            *state = AppState::Playing;
+                            *state = AppState::Idle;
                             break;
                         }
                     }

src/main.rs

@@ -71,30 +71,24 @@ fn main() {
             "recording",
             recording_duration_samples as u64,
             templates::RECORDING,
-            format!("Record for {} secs", DEFAULT_RECORD_SECONDS).as_str(),
+            in_port_name.as_str(),
         )
         .unwrap();
 
-    // UI 线程负责基于状态更新进度
-    std::thread::spawn({
-        let shared = shared.clone();
-        let pm = progress_manager;
-        move || {
-            ui::run_progress_loop(&shared, recording_duration_samples, &pm);
-        }
-    });
-
-    // 监听状态变化：录制 -> 播放
     loop {
         std::thread::sleep(std::time::Duration::from_millis(50));
+        
+        ui::update_progress(&shared, recording_duration_samples, &progress_manager);
+        
         let state = {
             shared
-                .app_state
-                .lock()
-                .unwrap()
-                .clone()
+            .app_state
+            .lock()
+            .unwrap()
+            .clone()
         };
-        if let recorder::AppState::Playing = state {
+        if let recorder::AppState::Idle = state {
+            progress_manager.finish_all();
             break;
         }
     }
@@ -106,8 +100,20 @@ fn main() {
         &out_port_name,
     );
 
+    progress_manager.create_bar(
+        "playback",
+        recording_duration_samples as u64,
+        templates::PLAYBACK,
+        out_port_name.as_str(),
+    ).unwrap();
+
+    *shared.app_state.lock().unwrap() = recorder::AppState::Playing;
+
     loop {
         std::thread::sleep(std::time::Duration::from_millis(50));
+        
+        ui::update_progress(&shared, recording_duration_samples, &progress_manager);
+        
         let state = {
             shared
                 .app_state
@@ -116,6 +122,7 @@ fn main() {
                 .clone()
         };
         if let recorder::AppState::Idle = state {
+            progress_manager.finish_all();
             break;
         }
     }

src/ui/mod.rs

@@ -5,70 +5,45 @@ pub fn print_banner() {
     println!("TrackMaker-rs");
 }
 
-pub fn run_progress_loop(
+pub fn update_progress(
     shared: &AppShared,
     recording_duration_samples: usize,
     progress_manager: &ProgressManager,
 ) {
-    loop {
-        std::thread::sleep(std::time::Duration::from_millis(
-            crate::utils::consts::PROGRESS_UPDATE_INTERVAL_MS,
-        ));
+    let current_state = {
+        let state = shared
+            .app_state
+            .lock()
+            .unwrap();
+        state.clone()
+    };
 
-        let current_state = {
-            let state = shared
-                .app_state
-                .lock()
-                .unwrap();
-            state.clone()
-        };
-
-        match current_state {
-            AppState::Recording => {
-                let recorded_samples = {
-                    let recorded = shared
-                        .recorded_audio
-                        .lock()
-                        .unwrap();
-                    recorded.len()
-                };
-                let _ = progress_manager
-                    .set_position("recording", recorded_samples as u64);
-            }
-            AppState::Playing => {
-                if progress_manager.exists("recording")
-                    && !progress_manager
-                        .is_finished("recording")
-                        .unwrap_or(true)
-                {
-                    let _ = progress_manager.finish_and_clear("recording");
-                }
-
-                if !progress_manager.exists("playback") {
-                    let _ = progress_manager.create_bar(
-                        "playback",
-                        recording_duration_samples as u64,
-                        templates::PLAYBACK,
-                        "Playing...",
-                    );
-                }
-
-                let remaining_samples = {
-                    let playback = shared
-                        .playback_buffer
-                        .lock()
-                        .unwrap();
-                    playback.len()
-                };
-                let played_samples =
-                    recording_duration_samples - remaining_samples;
-                let _ = progress_manager
-                    .set_position("playback", played_samples as u64);
-            }
-            AppState::Idle => {
-                progress_manager.clear_all();
-                break;
-            }
+    match current_state {
+        AppState::Recording => {
+            let recorded_samples = {
+                let recorded = shared
+                    .recorded_audio
+                    .lock()
+                    .unwrap();
+                recorded.len()
+            };
+            let _ = progress_manager
+                .set_position("recording", recorded_samples as u64);
+        }
+        AppState::Playing => {
+            let remaining_samples = {
+                let playback = shared
+                    .playback_buffer
+                    .lock()
+                    .unwrap();
+                playback.len()
+            };
+            let played_samples =
+                recording_duration_samples - remaining_samples;
+            let _ = progress_manager
+                .set_position("playback", played_samples as u64);
+        }
+        AppState::Idle => {
         }
     }
 }

src/utils/progress.rs

@@ -129,6 +129,15 @@ impl ProgressManager {
         }
     }
 
+    /// 完成所有进度条
+    pub fn finish_all(&self) {
+        if let Ok(mut bars) = self.bars.lock() {
+            for (_, pb) in bars.drain() {
+                pb.finish();
+            }
+        }
+    }
+
     /// 清理所有进度条
     pub fn clear_all(&self) {
         if let Ok(mut bars) = self.bars.lock() {
@@ -147,13 +156,13 @@ impl Default for ProgressManager {
 
 pub mod templates {
     pub const RECORDING: &str =
-        "RECORDING: [{bar:30.red}] {percent}% ({pos}/{len} samples) {msg}";
+        "RECORDING:   [{bar:30.red}] {percent}% ({pos}/{len} samples) {msg}";
     pub const PLAYBACK: &str =
-        "PLAYBACK: [{bar:30.green}] {percent}% ({pos}/{len} samples) {msg}";
+        "PLAYBACK:    [{bar:30.green}] {percent}% ({pos}/{len} samples) {msg}";
     pub const PROCESSING: &str =
-        "PROCESSING: [{bar:30.blue}] {percent}% ({pos}/{len}) {msg}";
+        "PROCESSING:  [{bar:30.blue}] {percent}% ({pos}/{len}) {msg}";
     pub const DOWNLOAD: &str =
-        "DOWNLOAD: [{bar:30.yellow}] {percent}% ({pos}/{len} bytes) {msg}";
+        "DOWNLOADING: [{bar:30.yellow}] {percent}% ({pos}/{len} bytes) {msg}";
 }
 
 pub mod colors {