Fix URL button layout and add URL history

Soddentrough · Soddentrough · commit 1595a06f430e · 2026-05-19T09:06:27.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -51,6 +51,7 @@ naga = { version = "29.0.3", features = ["wgsl-in"] }
 glam = "0.32.1"
 env_logger = "0.11.10"
 ureq = "3.3.0"
+directories = "6.0.0"
 
 [build-dependencies]
 winres = "0.1.12"
diff --git a/src/engine.rs b/src/engine.rs
@@ -1812,27 +1812,48 @@ impl<'a> VulkanEngine<'a> {
                 egui::Window::new("Open Network Stream")
                     .collapsible(false)
                     .resizable(false)
+                    .default_width(600.0)
                     .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0])
                     .show(ctx, |ui| {
                         ui.label("Enter Stream URL (e.g. .pls, .m3u, or direct stream link):");
+                        ui.add_space(4.0);
                         let mut url_text = state.url_input_text.clone();
-                        let text_resp = ui.add_sized([400.0, 30.0], egui::TextEdit::singleline(&mut url_text));
+                        let text_resp = ui.add(
+                            egui::TextEdit::singleline(&mut url_text)
+                                .desired_width(f32::INFINITY)
+                                .min_size(egui::vec2(0.0, 30.0))
+                        );
                         if text_resp.changed() {
                             engine_action = EngineAction::SetUrlInput(url_text.clone());
                         }
                         ui.add_space(10.0);
                         ui.horizontal(|ui| {
-                            ui.allocate_ui_with_layout(ui.available_size(), egui::Layout::centered_and_justified(egui::Direction::LeftToRight), |ui| {
-                                if ui.button("Cancel").clicked() {
-                                    engine_action = EngineAction::CloseUrlDialog;
-                                }
-                                if ui.button("Open").clicked() || (text_resp.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter))) {
+                            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                                if ui.add_sized([80.0, 30.0], egui::Button::new("Open")).clicked() || (text_resp.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter))) {
                                     if !url_text.is_empty() {
                                         engine_action = EngineAction::LoadUrl(url_text);
                                     }
                                 }
+                                if ui.add_sized([80.0, 30.0], egui::Button::new("Cancel")).clicked() {
+                                    engine_action = EngineAction::CloseUrlDialog;
+                                }
                             });
                         });
+                        
+                        if !state.url_history.is_empty() {
+                            ui.separator();
+                            ui.label(egui::RichText::new("Recent Streams:").strong());
+                            egui::ScrollArea::vertical().max_height(150.0).show(ui, |ui| {
+                                for (url, title) in &state.url_history {
+                                    if ui.add_sized(
+                                        [ui.available_width(), 30.0],
+                                        egui::Button::new(format!("{} ({})", title, url))
+                                    ).clicked() {
+                                        engine_action = EngineAction::LoadUrl(url.clone());
+                                    }
+                                }
+                            });
+                        }
                     });
             }
 
diff --git a/src/main.rs b/src/main.rs
@@ -104,6 +104,23 @@ fn main() -> Result<(), Box<dyn Error>> {
         state.playlist = args.file.clone();
         state.playlist_index = 0;
         
+        let mut history_changed = false;
+        for path in &args.file {
+            if path.starts_with("http") {
+                if !state.url_history.iter().any(|(u, _)| u == path) {
+                    state.url_history.push((path.clone(), "Network Stream".to_string()));
+                    history_changed = true;
+                }
+            }
+        }
+        if history_changed {
+            let mut out = String::new();
+            for (u, t) in &state.url_history {
+                out.push_str(&format!("{}|{}\n", u, t));
+            }
+            let _ = std::fs::write(crate::state::get_history_file_path(), out);
+        }
+        
         if let Some(vis) = &args.vis {
             let vis_lower = vis.to_lowercase();
             if let Some(idx) = crate::state::VISUALIZERS.iter().position(|v| v.filename.to_lowercase().contains(&vis_lower) || v.name.to_lowercase().contains(&vis_lower)) {
@@ -808,8 +825,16 @@ async fn run_gui(app_state: Arc<Mutex<AppState>>, mut active_stream: Option<audi
                                 state.url_input_text.clear();
                                 state.playlist = vec![url.clone()];
                                 state.playlist_index = 0;
-                                state.load_request = Some(url);
+                                state.load_request = Some(url.clone());
                                 state.file_loaded = true;
+                                if !state.url_history.iter().any(|(u, _)| u == &url) {
+                                    state.url_history.push((url.clone(), "Network Stream".to_string()));
+                                    let mut out = String::new();
+                                    for (u, t) in &state.url_history {
+                                        out.push_str(&format!("{}|{}\n", u, t));
+                                    }
+                                    let _ = std::fs::write(crate::state::get_history_file_path(), out);
+                                }
                             }
                             EngineAction::None => {}
                         }
diff --git a/src/state.rs b/src/state.rs
@@ -170,6 +170,7 @@ pub struct AppState {
     pub open_file_request: bool,
     pub is_url_dialog_open: bool,
     pub url_input_text: String,
+    pub url_history: Vec<(String, String)>,
     pub egui_gamepad_events: Vec<egui::Event>,
     pub force_stereo_downmix: bool,
     pub append_to_playlist: bool,
@@ -185,6 +186,18 @@ pub struct AppState {
     pub cumulative_scrub: f64,
 }
 
+pub fn get_history_file_path() -> std::path::PathBuf {
+    if let Some(proj_dirs) = directories::ProjectDirs::from("com", "RustTracker", "RustTracker") {
+        let dir = proj_dirs.data_dir();
+        if !dir.exists() {
+            let _ = std::fs::create_dir_all(dir);
+        }
+        dir.join("url_history.txt")
+    } else {
+        std::path::PathBuf::from("url_history.txt")
+    }
+}
+
 impl AppState {
     pub fn new(title: String) -> Self {
         let mut history = VecDeque::new();
@@ -212,6 +225,17 @@ impl AppState {
             vis_enabled[9] = false; // Ferrofluid Particle Sim
             vis_enabled[10] = false; // Neon Corridor
         }
+        
+        let mut url_history = Vec::new();
+        if let Ok(data) = std::fs::read_to_string(get_history_file_path()) {
+            for line in data.lines() {
+                if let Some((url, title)) = line.split_once('|') {
+                    if !url_history.iter().any(|(u, _)| u == url) {
+                        url_history.push((url.to_string(), title.to_string()));
+                    }
+                }
+            }
+        }
 
         AppState {
             passthrough_enabled: true,
@@ -273,6 +297,7 @@ impl AppState {
             open_file_request: false,
             is_url_dialog_open: false,
             url_input_text: String::new(),
+            url_history,
             egui_gamepad_events: Vec::new(),
             force_stereo_downmix: is_steam_deck,
             append_to_playlist: false,
@@ -358,6 +383,7 @@ impl AppState {
             open_file_request: false,
             is_url_dialog_open: self.is_url_dialog_open,
             url_input_text: self.url_input_text.clone(),
+            url_history: self.url_history.clone(),
             egui_gamepad_events: Vec::new(),
             force_stereo_downmix: self.force_stereo_downmix,
             append_to_playlist: self.append_to_playlist,
