From 79ac68479effc28387cee1d380e62a902ca81ce4 Mon Sep 17 00:00:00 2001 From: chmanie Date: Mon, 12 Jun 2023 12:10:14 +0200 Subject: [PATCH] Remove unused import statements --- cbd-tui/src/app/library.rs | 12 +++++------- cbd-tui/src/app/mod.rs | 10 +++------- cbd-tui/src/app/now_playing.rs | 6 ++---- cbd-tui/src/app/queue.rs | 12 +++++------- cbd-tui/src/config.rs | 8 +------- cbd-tui/src/main.rs | 21 ++++----------------- cbd-tui/src/rpc.rs | 26 ++++++++------------------ 7 files changed, 28 insertions(+), 67 deletions(-) diff --git a/cbd-tui/src/app/library.rs b/cbd-tui/src/app/library.rs index 6ac6c38..8610c97 100644 --- a/cbd-tui/src/app/library.rs +++ b/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}, - style::{Color, Modifier, Style}, - text::{Span, Spans}, - widgets::{ - Block, BorderType, Borders, Gauge, LineGauge, List, ListItem, ListState, Paragraph, Wrap, - }, + layout::Rect, + style::{Modifier, Style}, + text::Span, + widgets::{Block, BorderType, Borders, List, ListItem, ListState}, Frame, }; diff --git a/cbd-tui/src/app/mod.rs b/cbd-tui/src/app/mod.rs index 9cacc05..8c5e3ca 100644 --- a/cbd-tui/src/app/mod.rs +++ b/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}, - style::{Color, Modifier, Style}, - text::{Span, Spans}, - widgets::{ - Block, BorderType, Borders, Gauge, LineGauge, List, ListItem, ListState, Paragraph, Wrap, - }, + layout::{Constraint, Direction, Layout}, + style::Color, Frame, }; diff --git a/cbd-tui/src/app/now_playing.rs b/cbd-tui/src/app/now_playing.rs index 0617071..9519f5c 100644 --- a/cbd-tui/src/app/now_playing.rs +++ b/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::{ - Block, BorderType, Borders, Gauge, LineGauge, List, ListItem, ListState, Paragraph, Wrap, - }, + widgets::{Block, BorderType, Borders, LineGauge, Paragraph, Wrap}, Frame, }; diff --git a/cbd-tui/src/app/queue.rs b/cbd-tui/src/app/queue.rs index dbf602a..0f48eba 100644 --- a/cbd-tui/src/app/queue.rs +++ b/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}, - style::{Color, Modifier, Style}, - text::{Span, Spans}, - widgets::{ - Block, BorderType, Borders, Gauge, LineGauge, List, ListItem, ListState, Paragraph, Wrap, - }, + layout::Rect, + style::{Modifier, Style}, + text::Span, + widgets::{Block, BorderType, Borders, List, ListItem, ListState}, Frame, }; diff --git a/cbd-tui/src/config.rs b/cbd-tui/src/config.rs index 7e908b2..7459053 100644 --- a/cbd-tui/src/config.rs +++ b/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, diff --git a/cbd-tui/src/main.rs b/cbd-tui/src/main.rs index c51577b..f58745f 100644 --- a/cbd-tui/src/main.rs +++ b/cbd-tui/src/main.rs @@ -3,25 +3,13 @@ mod config; mod rpc; use std::{ - cell::{OnceCell, RefCell}, - collections::HashMap, error::Error, - fmt, io, - ops::{Div, IndexMut}, - println, + io, sync::OnceLock, - thread, time::{Duration, Instant}, - vec, }; -use crabidy_core::init_config; -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 crabidy_core::proto::crabidy::{get_update_stream_response::Update as StreamUpdate, PlayState}; 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; diff --git a/cbd-tui/src/rpc.rs b/cbd-tui/src/rpc.rs index fca0353..d37b948 100644 --- a/cbd-tui/src/rpc.rs +++ b/cbd-tui/src/rpc.rs @@ -1,21 +1,13 @@ use crabidy_core::proto::crabidy::{ - crabidy_service_client::CrabidyServiceClient, get_update_stream_response::Update, - AppendRequest, ChangeVolumeRequest, GetLibraryNodeRequest, GetLibraryNodeResponse, - GetUpdateStreamRequest, GetUpdateStreamResponse, InitRequest, InitResponse, InsertRequest, - LibraryNode, NextRequest, PrevRequest, QueueRequest, RemoveRequest, ReplaceRequest, - RestartTrackRequest, SetCurrentRequest, SetCurrentResponse, ToggleMuteRequest, - TogglePlayRequest, TogglePlayResponse, ToggleRepeatRequest, ToggleShuffleRequest, + crabidy_service_client::CrabidyServiceClient, AppendRequest, ChangeVolumeRequest, + GetLibraryNodeRequest, GetUpdateStreamRequest, GetUpdateStreamResponse, InitRequest, + InitResponse, InsertRequest, LibraryNode, NextRequest, PrevRequest, QueueRequest, + RemoveRequest, ReplaceRequest, RestartTrackRequest, SetCurrentRequest, ToggleMuteRequest, + TogglePlayRequest, ToggleRepeatRequest, ToggleShuffleRequest, }; -use std::{ - collections::HashMap, - error::Error, - fmt, io, mem, println, thread, - time::{Duration, Instant}, - vec, -}; -use tokio::task; -use tokio_stream::StreamExt; +use std::{collections::HashMap, error::Error, fmt, time::Duration}; + 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; - // FIXME: apparently mem::replace doesn't do anything here - mem::replace(&mut self.update_stream, update_stream); + self.update_stream = Self::get_update_stream(&mut self.client).await; } pub async fn init(&mut self) -> Result> {