Remove unused import statements

cbd-tui/src/app/library.rs

@@ -1,14 +1,12 @@
 use std::collections::HashMap;
 
-use flume::{Receiver, Sender};
+use flume::Sender;
 use ratatui::{
     backend::Backend,
-    layout::{Alignment, Constraint, Corner, Direction, Layout, Rect},
+    layout::Rect,
-    style::{Color, Modifier, Style},
+    style::{Modifier, Style},
-    text::{Span, Spans},
+    text::Span,
-    widgets::{
+    widgets::{Block, BorderType, Borders, List, ListItem, ListState},
-        Block, BorderType, Borders, Gauge, LineGauge, List, ListItem, ListState, Paragraph, Wrap,
-    },
     Frame,
 };
 

cbd-tui/src/app/mod.rs

@@ -3,15 +3,11 @@ mod list;
 mod now_playing;
 mod queue;
 
-use flume::{Receiver, Sender};
+use flume::Sender;
 use ratatui::{
     backend::Backend,
-    layout::{Alignment, Constraint, Corner, Direction, Layout, Rect},
+    layout::{Constraint, Direction, Layout},
-    style::{Color, Modifier, Style},
+    style::Color,
-    text::{Span, Spans},
-    widgets::{
-        Block, BorderType, Borders, Gauge, LineGauge, List, ListItem, ListState, Paragraph, Wrap,
-    },
     Frame,
 };
 

cbd-tui/src/app/now_playing.rs

@@ -6,12 +6,10 @@ use crabidy_core::proto::crabidy::{PlayState, QueueModifiers, Track, TrackPositi
 
 use ratatui::{
     backend::Backend,
-    layout::{Alignment, Constraint, Corner, Direction, Layout, Rect},
+    layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Span, Spans},
-    widgets::{
+    widgets::{Block, BorderType, Borders, LineGauge, Paragraph, Wrap},
-        Block, BorderType, Borders, Gauge, LineGauge, List, ListItem, ListState, Paragraph, Wrap,
-    },
     Frame,
 };
 

cbd-tui/src/app/queue.rs

@@ -1,12 +1,10 @@
-use flume::{Receiver, Sender};
+use flume::Sender;
 use ratatui::{
     backend::Backend,
-    layout::{Alignment, Constraint, Corner, Direction, Layout, Rect},
+    layout::Rect,
-    style::{Color, Modifier, Style},
+    style::{Modifier, Style},
-    text::{Span, Spans},
+    text::Span,
-    widgets::{
+    widgets::{Block, BorderType, Borders, List, ListItem, ListState},
-        Block, BorderType, Borders, Gauge, LineGauge, List, ListItem, ListState, Paragraph, Wrap,
-    },
     Frame,
 };
 

cbd-tui/src/config.rs

@@ -1,11 +1,5 @@
-use std::{
-    fs::{create_dir_all, read_to_string, File},
-    io::Write,
-    path::Path,
-};
-
 use crabidy_core::{
-    clap::{self, Parser},
+    clap::{self},
     clap_serde_derive,
     serde::Serialize,
     ClapSerde,

cbd-tui/src/main.rs

@@ -3,25 +3,13 @@ mod config;
 mod rpc;
 
 use std::{
-    cell::{OnceCell, RefCell},
-    collections::HashMap,
     error::Error,
-    fmt, io,
+    io,
-    ops::{Div, IndexMut},
-    println,
     sync::OnceLock,
-    thread,
     time::{Duration, Instant},
-    vec,
 };
 
-use crabidy_core::init_config;
+use crabidy_core::proto::crabidy::{get_update_stream_response::Update as StreamUpdate, PlayState};
-use crabidy_core::proto::crabidy::{
-    crabidy_service_client::CrabidyServiceClient,
-    get_update_stream_response::Update as StreamUpdate, GetLibraryNodeRequest,
-    InitResponse as InitialData, LibraryNode, PlayState, Queue as QueueData, QueueModifiers,
-    QueueTrack, Track, TrackPosition,
-};
 
 use crossterm::{
     event::{
@@ -31,11 +19,10 @@ use crossterm::{
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
 use flume::{Receiver, Sender};
-use notify_rust::Notification;
+
 use ratatui::{backend::CrosstermBackend, Terminal};
-use tokio::{fs, select, signal, task};
+use tokio::select;
 use tokio_stream::StreamExt;
-use tonic::{transport::Channel, Request, Status, Streaming};
 
 use app::{App, MessageFromUi, MessageToUi, StatefulList, UiFocus};
 use config::Config;

cbd-tui/src/rpc.rs

@@ -1,21 +1,13 @@
 use crabidy_core::proto::crabidy::{
-    crabidy_service_client::CrabidyServiceClient, get_update_stream_response::Update,
+    crabidy_service_client::CrabidyServiceClient, AppendRequest, ChangeVolumeRequest,
-    AppendRequest, ChangeVolumeRequest, GetLibraryNodeRequest, GetLibraryNodeResponse,
+    GetLibraryNodeRequest, GetUpdateStreamRequest, GetUpdateStreamResponse, InitRequest,
-    GetUpdateStreamRequest, GetUpdateStreamResponse, InitRequest, InitResponse, InsertRequest,
+    InitResponse, InsertRequest, LibraryNode, NextRequest, PrevRequest, QueueRequest,
-    LibraryNode, NextRequest, PrevRequest, QueueRequest, RemoveRequest, ReplaceRequest,
+    RemoveRequest, ReplaceRequest, RestartTrackRequest, SetCurrentRequest, ToggleMuteRequest,
-    RestartTrackRequest, SetCurrentRequest, SetCurrentResponse, ToggleMuteRequest,
+    TogglePlayRequest, ToggleRepeatRequest, ToggleShuffleRequest,
-    TogglePlayRequest, TogglePlayResponse, ToggleRepeatRequest, ToggleShuffleRequest,
 };
 
-use std::{
+use std::{collections::HashMap, error::Error, fmt, time::Duration};
-    collections::HashMap,
+
-    error::Error,
-    fmt, io, mem, println, thread,
-    time::{Duration, Instant},
-    vec,
-};
-use tokio::task;
-use tokio_stream::StreamExt;
 use tonic::{
     transport::{Channel, Endpoint},
     Request, Streaming,
@@ -72,9 +64,7 @@ impl RpcClient {
     }
 
     pub async fn reconnect_update_stream(&mut self) {
-        let update_stream = Self::get_update_stream(&mut self.client).await;
+        self.update_stream = Self::get_update_stream(&mut self.client).await;
-        // FIXME: apparently mem::replace doesn't do anything here
-        mem::replace(&mut self.update_stream, update_stream);
     }
 
     pub async fn init(&mut self) -> Result<InitResponse, Box<dyn Error>> {