Merge pull request #14 from tsirysndr/fix/now-playing-not-updated

fix 'now playing' not updated

Author: tsirysndr

Cargo.lock

@@ -8,12 +8,18 @@ license = "MIT"
 name = "tunein-cli"
 readme = "README.md"
 repository = "https://github.com/tsirysndr/tunein-cli"
-version = "0.2.1"
+version = "0.2.2"
 
 [[bin]]
 name = "tunein"
 path = "src/main.rs"
 
+[workspace.metadata.cross.target.aarch64-unknown-linux-gnu]
+pre-build = [
+    "dpkg --add-architecture $CROSS_DEB_ARCH", 
+    "apt-get update && apt-get --assume-yes install libasound2-dev libasound2-dev:$CROSS_DEB_ARCH protobuf-compiler"
+]
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

Cargo.toml

@@ -69,8 +69,8 @@ nix profile install --experimental-features "nix-command flakes" github:tsirysnd
 Or download the latest release for your platform [here](https://github.com/tsirysndr/tunein-cli/releases).
 
 ## 📦 Downloads
-- `Mac`: arm64: [tunein_v0.2.1_aarch64-apple-darwin.tar.gz](https://github.com/tsirysndr/tunein-cli/releases/download/v0.2.1/tunein_v0.2.1_aarch64-apple-darwin.tar.gz) intel: [tunein_v0.2.1_x86_64-apple-darwin.tar.gz](https://github.com/tsirysndr/tunein-cli/releases/download/v0.2.1/tunein_v0.2.1_x86_64-apple-darwin.tar.gz)
-- `Linux`: [tunein_v0.2.1_x86_64-unknown-linux-gnu.tar.gz](https://github.com/tsirysndr/tunein-cli/releases/download/v0.2.1/tunein_v0.2.1_x86_64-unknown-linux-gnu.tar.gz)
+- `Mac`: arm64: [tunein_v0.2.2_aarch64-apple-darwin.tar.gz](https://github.com/tsirysndr/tunein-cli/releases/download/v0.2.2/tunein_v0.2.2_aarch64-apple-darwin.tar.gz) intel: [tunein_v0.2.2_x86_64-apple-darwin.tar.gz](https://github.com/tsirysndr/tunein-cli/releases/download/v0.2.2/tunein_v0.2.2_x86_64-apple-darwin.tar.gz)
+- `Linux`: [tunein_v0.2.2_x86_64-unknown-linux-gnu.tar.gz](https://github.com/tsirysndr/tunein-cli/releases/download/v0.2.2/tunein_v0.2.2_x86_64-unknown-linux-gnu.tar.gz)
 ## 🚀 Usage
 ```
 USAGE:

README.md

@@ -1,15 +1,14 @@
-use std::{io, time::Duration};
-
 use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
 use ratatui::{
     prelude::*,
     widgets::{block::*, *},
 };
+use std::{io, process, thread, time::Duration};
 use tokio::sync::mpsc::UnboundedReceiver;
 
 use crate::{extract::get_currently_playing, tui};
 
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default)]
 pub struct State {
     pub name: String,
     pub now_playing: String,
@@ -20,14 +19,24 @@ pub struct State {
 
 #[derive(Debug, Default)]
 pub struct App {
-    pub state: State,
+    name: String,
+    now_playing: String,
+    genre: String,
+    description: String,
+    br: String,
     exit: bool,
 }
 
 impl App {
     pub fn new() -> Self {
-        let state = State::default();
-        Self { state, exit: false }
+        Self {
+            name: "".to_string(),
+            now_playing: "".to_string(),
+            genre: "".to_string(),
+            description: "".to_string(),
+            br: "".to_string(),
+            exit: false,
+        }
     }
 }
 
@@ -38,25 +47,51 @@ impl App {
         terminal: &mut tui::Tui,
         mut cmd_rx: UnboundedReceiver<State>,
         id: &str,
-    ) -> anyhow::Result<()> {
+    ) {
         let new_state = cmd_rx.recv().await.unwrap();
-
-        while !self.exit {
-            self.state = new_state.clone();
-
+        self.name = new_state.name;
+        self.genre = new_state.genre;
+        self.description = new_state.description;
+        self.br = new_state.br;
+
+        thread::spawn(|| loop {
+            match event::read().unwrap() {
+                // it's important to check that the event is a key press event as
+                // crossterm also emits key release and repeat events on Windows.
+                Event::Key(key_event) if key_event.kind == KeyEventKind::Press => {
+                    match key_event.code {
+                        KeyCode::Char('q') => {
+                            let _ = tui::restore();
+                            process::exit(0);
+                        },
+                        KeyCode::Char('d')
+                            if key_event.modifiers.contains(KeyModifiers::CONTROL) =>
+                        {
+                            let _ = tui::restore();
+                            process::exit(0);
+                        }
+                        KeyCode::Char('c')
+                            if key_event.modifiers.contains(KeyModifiers::CONTROL) =>
+                        {
+                            let _ = tui::restore();
+                            process::exit(0);
+                        }
+                        _ => {}
+                    }
+                }
+                _ => {}
+            };
+        });
+
+        loop {
             // Get current playing if available, otherwise use state's value
-            let now_playing = get_currently_playing(id)
-                .await
-                .unwrap_or_else(|_| self.state.now_playing.clone());
+            let now_playing = get_currently_playing(id).await.unwrap_or_default();
 
             // Update state with current playing
-            self.state.now_playing = now_playing;
-
-            terminal.draw(|frame| self.render_frame(frame))?;
-            self.handle_events()?;
+            self.now_playing = now_playing;
+            terminal.draw(|frame| self.render_frame(frame)).unwrap();
             std::thread::sleep(Duration::from_millis(500));
         }
-        Ok(())
     }
 
     fn render_frame(&self, frame: &mut Frame) {
@@ -81,16 +116,11 @@ impl App {
             areas[0],
         );
 
-        self.render_line("Station ", &self.state.name, areas[1], frame);
-        self.render_line("Now Playing ", &self.state.now_playing, areas[2], frame);
-        self.render_line("Genre ", &self.state.genre, areas[3], frame);
-        self.render_line("Description ", &self.state.description, areas[4], frame);
-        self.render_line(
-            "Bitrate ",
-            &format!("{} kbps", &self.state.br),
-            areas[5],
-            frame,
-        );
+        self.render_line("Station ", &self.name, areas[1], frame);
+        self.render_line("Now Playing ", &self.now_playing, areas[2], frame);
+        self.render_line("Genre ", &self.genre, areas[3], frame);
+        self.render_line("Description ", &self.description, areas[4], frame);
+        self.render_line("Bitrate ", &format!("{} kbps", &self.br), areas[5], frame);
     }
 
     fn render_line(&self, label: &str, value: &str, area: Rect, frame: &mut Frame) {

src/api/tunein.v1alpha1.rs

@@ -116,7 +116,7 @@ pub async fn exec(name_or_id: &str) -> Result<(), Error> {
     });
 
     let mut terminal = tui::init()?;
-    let app_result = app.run(&mut terminal, cmd_rx, &id).await;
+    app.run(&mut terminal, cmd_rx, &id).await;
     tui::restore()?;
-    app_result
+    Ok(())
 }

src/app.rs

@@ -3,7 +3,7 @@ use std::{
     sync::{Arc, Mutex},
     task::{Context, Poll},
     thread,
-    time::{Duration},
+    time::Duration,
 };
 
 use anyhow::Error;

src/play.rs

@@ -1,9 +1,6 @@
 use std::str::FromStr;
 
-use tunein::{
-    types,
-    TuneInClient,
-};
+use tunein::{types, TuneInClient};
 use tunein_cli::api::{
     objects::v1alpha1::{Category, StationLinkDetails},
     tunein::v1alpha1::{