From 29275e61bbeb47fd0e5485da9365adceabdef2e3 Mon Sep 17 00:00:00 2001
From: lza_menace <lza_menace@protonmail.com>
Date: Tue, 18 Oct 2022 14:27:32 -0700
Subject: [PATCH] getting radio player working again

---
 src/app.rs    | 28 +++++++++++++++++-----------
 src/player.rs | 20 ++++++++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index 8485314..7615b18 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -48,14 +48,11 @@ impl eframe::App for App {
         });
         egui::CentralPanel::default().show(ctx, |ui| {
             ui.horizontal(|ui| {
-                let mut t: bool = false;
-                if ui.radio_value(&mut t, false, "tor").clicked() {
+                if ui.radio_value(&mut self.show_irc, false, "tor").clicked() {
                     self.show_irc = false;
                 }
-                if self.tor_connected {
-                    if ui.radio_value(&mut t, false, "irc").clicked() {
-                        self.show_irc = true;
-                    }
+                if ui.radio_value(&mut !self.show_irc, false, "irc").clicked() {
+                    self.show_irc = true;
                 }
             });
 
@@ -105,21 +102,30 @@ impl eframe::App for App {
                     if self.player.playing {
                         if ui.button("⏸").clicked() {
                             let _ = &self.player.sink.pause();
+                            // let _ = &self.player.sink.stop();
                             self.player.playing = false;
                         }
                         ui.add(egui::Slider::new(&mut self.player.volume, 0.0..=100.0));
                         self.player.sink.set_volume(self.player.volume / 100.0);
+                        // self.player.sink.stop();
                     } else {
                         if ui.button("▶").clicked() {
                             // If stream thread is done, start again
                             if self.player.stream_thread.is_finished() {
                                 self.player.stream_thread = self.player.start_radio_stream();
-                            }                        
+                            }
                             if self.player.sink.len() != 1 {
-                                let source: rodio::Decoder<std::io::BufReader<std::fs::File>> = self.player.get_radio_source();
-                                let _ = &self.player.sink.append(source);
+                                // let rs = self.player.get_radio_source();
+                                let f = std::fs::File::open(&crate::RADIO_STREAM);
+                                if let Ok(fo) = f {
+                                    let file = std::io::BufReader::new(fo);
+                                    let source = rodio::Decoder::new(file).unwrap();
+                                    let _ = &self.player.sink.append(source);
+                                } else {
+                                    return ()
+                                }
                             }
-                            let _ = &self.player.sink.play();
+                            let _ = self.player.sink.play();
                             self.player.playing = true;
                         }
                     }
@@ -129,7 +135,7 @@ impl eframe::App for App {
                     }
                 });
                 if self.player.playing {
-                    ui.label(egui::RichText::new(format!("\n{:?}", self.player.get_song_meta())).color(egui::Color32::WHITE).size(18.0));
+                    ui.label(egui::RichText::new(format!("\n{:?}", self.player.get_song_meta().unwrap())).color(egui::Color32::WHITE).size(18.0));
                 } else {
                     ui.label("\n");
                 }
diff --git a/src/player.rs b/src/player.rs
index 0dd8345..4f3145b 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -59,7 +59,7 @@ impl Player {
         }
     }
 
-    pub fn get_song_meta(&self) -> String {
+    pub fn get_song_meta(&self) -> Option<String> {
         let file = std::fs::File::open(&crate::RADIO_STREAM);
         match file {
             Ok(mut file) => {
@@ -68,17 +68,21 @@ impl Player {
                 let s = std::string::String::from_utf8_lossy(&buffer);
                 let re = regex::Regex::new(r"title=(.*).{4}server=").unwrap();
                 let caps = re.captures(&s).unwrap();
-                return caps.get(1).map_or("", |m| m.as_str()).to_owned();
+                Some(caps.get(1).map_or("", |m| m.as_str()).to_owned())
             },
-            Err(_e) => "".to_owned()
+            Err(_e) => Some("".to_owned())
         }
     }
 
-    pub fn get_radio_source(&self) -> rodio::Decoder<std::io::BufReader<std::fs::File>> {
-        Self::wait_for_source();
-        let file: std::io::BufReader<std::fs::File> = std::io::BufReader::new(std::fs::File::open(&crate::RADIO_STREAM).unwrap());
-        let source: rodio::Decoder<std::io::BufReader<std::fs::File>> = rodio::Decoder::new(file).unwrap();
-        return source
+    pub fn get_radio_source(&self) -> Result<rodio::Decoder<std::io::BufReader<std::fs::File>>, ()> {
+        // Self::wait_for_source();
+        let f = std::fs::File::open(&crate::RADIO_STREAM);
+        if let Ok(fo) = f {
+            let file = std::io::BufReader::new(fo);
+            let source = rodio::Decoder::new(file).unwrap();
+            return Ok(source)
+        }
+        Err(())
     }
 }