lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to rust edition 2018 + bump version

Browse Source
This commit is contained in:
Henrik Friedrichsen
2020-03-15 11:05:49 +01:00
parent 662e8e4304
commit dccb36d8e7
29 changed files with 190 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui/album.rs
View File

@@ -3,15 +3,15 @@ use std::sync::{Arc, RwLock};
use cursive::view::ViewWrapper;
use cursive::Cursive;
use album::Album;
use artist::Artist;
use command::Command;
use commands::CommandResult;
use library::Library;
use queue::Queue;
use traits::ViewExt;
use ui::listview::ListView;
use ui::tabview::TabView;
use crate::album::Album;
use crate::artist::Artist;
use crate::command::Command;
use crate::commands::CommandResult;
use crate::library::Library;
use crate::queue::Queue;
use crate::traits::ViewExt;
use crate::ui::listview::ListView;
use crate::ui::tabview::TabView;
pub struct AlbumView {
album: Album,

18
src/ui/artist.rs
View File

@@ -4,15 +4,15 @@ use std::thread;
use cursive::view::ViewWrapper;
use cursive::Cursive;
use artist::Artist;
use command::Command;
use commands::CommandResult;
use library::Library;
use queue::Queue;
use track::Track;
use traits::ViewExt;
use ui::listview::ListView;
use ui::tabview::TabView;
use crate::artist::Artist;
use crate::command::Command;
use crate::commands::CommandResult;
use crate::library::Library;
use crate::queue::Queue;
use crate::track::Track;
use crate::traits::ViewExt;
use crate::ui::listview::ListView;
use crate::ui::tabview::TabView;
pub struct ArtistView {
artist: Artist,

12
src/ui/contextmenu.rs
View File

@@ -4,14 +4,14 @@ use cursive::view::{Margins, ViewWrapper};
use cursive::views::{Dialog, ScrollView, SelectView};
use cursive::Cursive;
use crate::library::Library;
use crate::queue::Queue;
use crate::track::Track;
use crate::traits::ListItem;
use crate::ui::layout::Layout;
use crate::ui::modal::Modal;
#[cfg(feature = "share_clipboard")]
use clipboard::{ClipboardContext, ClipboardProvider};
use library::Library;
use queue::Queue;
use track::Track;
use traits::ListItem;
use ui::layout::Layout;
use ui::modal::Modal;
pub struct ContextMenu {
dialog: Modal<Dialog>,

6
src/ui/help.rs
View File

@@ -5,9 +5,9 @@ use cursive::utils::markup::StyledString;
use cursive::view::ViewWrapper;
use cursive::views::{ScrollView, TextView};
use command::Command;
use config::config_path;
use traits::ViewExt;
use crate::command::Command;
use crate::config::config_path;
use crate::traits::ViewExt;
pub struct HelpView {
view: ScrollView<TextView>,

8
src/ui/layout.rs
View File

@@ -12,10 +12,10 @@ use cursive::views::EditView;
use cursive::{Cursive, Printer};
use unicode_width::UnicodeWidthStr;
use command::Command;
use commands::CommandResult;
use events;
use traits::{IntoBoxedViewExt, ViewExt};
use crate::command::Command;
use crate::commands::CommandResult;
use crate::events;
use crate::traits::{IntoBoxedViewExt, ViewExt};
struct Screen {
title: String,

16
src/ui/library.rs
View File

@@ -3,14 +3,14 @@ use std::sync::Arc;
use cursive::view::ViewWrapper;
use cursive::Cursive;
use command::Command;
use commands::CommandResult;
use library::Library;
use queue::Queue;
use traits::ViewExt;
use ui::listview::ListView;
use ui::playlists::PlaylistsView;
use ui::tabview::TabView;
use crate::command::Command;
use crate::commands::CommandResult;
use crate::library::Library;
use crate::queue::Queue;
use crate::traits::ViewExt;
use crate::ui::listview::ListView;
use crate::ui::playlists::PlaylistsView;
use crate::ui::tabview::TabView;
pub struct LibraryView {
tabs: TabView,

18
src/ui/listview.rs
View File

@@ -9,17 +9,17 @@ use cursive::view::ScrollBase;
use cursive::{Cursive, Printer, Rect, Vec2};
use unicode_width::UnicodeWidthStr;
use crate::command::{Command, GotoMode, MoveMode, TargetMode};
use crate::commands::CommandResult;
use crate::library::Library;
use crate::queue::Queue;
use crate::track::Track;
use crate::traits::{IntoBoxedViewExt, ListItem, ViewExt};
use crate::ui::album::AlbumView;
use crate::ui::artist::ArtistView;
use crate::ui::contextmenu::ContextMenu;
#[cfg(feature = "share_clipboard")]
use clipboard::{ClipboardContext, ClipboardProvider};
use command::{Command, GotoMode, MoveMode, TargetMode};
use commands::CommandResult;
use library::Library;
use queue::Queue;
use track::Track;
use traits::{IntoBoxedViewExt, ListItem, ViewExt};
use ui::album::AlbumView;
use ui::artist::ArtistView;
use ui::contextmenu::ContextMenu;
pub type Paginator<I> = Box<dyn Fn(Arc<RwLock<Vec<I>>>) + Send + Sync>;
pub struct Pagination<I: ListItem> {

16
src/ui/playlist.rs
View File

@@ -3,14 +3,14 @@ use std::sync::{Arc, RwLock};
use cursive::view::ViewWrapper;
use cursive::Cursive;
use command::Command;
use commands::CommandResult;
use library::Library;
use playlist::Playlist;
use queue::Queue;
use track::Track;
use traits::ViewExt;
use ui::listview::ListView;
use crate::command::Command;
use crate::commands::CommandResult;
use crate::library::Library;
use crate::playlist::Playlist;
use crate::queue::Queue;
use crate::track::Track;
use crate::traits::ViewExt;
use crate::ui::listview::ListView;
pub struct PlaylistView {
playlist: Playlist,

16
src/ui/playlists.rs
View File

@@ -4,14 +4,14 @@ use cursive::view::{Margins, ViewWrapper};
use cursive::views::Dialog;
use cursive::Cursive;
use command::Command;
use commands::CommandResult;
use library::Library;
use playlist::Playlist;
use queue::Queue;
use traits::ViewExt;
use ui::listview::ListView;
use ui::modal::Modal;
use crate::command::Command;
use crate::commands::CommandResult;
use crate::library::Library;
use crate::playlist::Playlist;
use crate::queue::Queue;
use crate::traits::ViewExt;
use crate::ui::listview::ListView;
use crate::ui::modal::Modal;
pub struct PlaylistsView {
list: ListView<Playlist>,

16
src/ui/queue.rs
View File

@@ -6,14 +6,14 @@ use cursive::Cursive;
use std::cmp::min;
use std::sync::Arc;
use command::{Command, ShiftMode};
use commands::CommandResult;
use library::Library;
use queue::Queue;
use track::Track;
use traits::ViewExt;
use ui::listview::ListView;
use ui::modal::Modal;
use crate::command::{Command, ShiftMode};
use crate::commands::CommandResult;
use crate::library::Library;
use crate::queue::Queue;
use crate::track::Track;
use crate::traits::ViewExt;
use crate::ui::listview::ListView;
use crate::ui::modal::Modal;
pub struct QueueView {
list: ListView<Track>,

26
src/ui/search.rs
View File

@@ -9,19 +9,19 @@ use cursive::{Cursive, Printer, Vec2};
use std::cell::RefCell;
use std::sync::{Arc, Mutex, RwLock};
use album::Album;
use artist::Artist;
use command::{Command, MoveMode};
use commands::CommandResult;
use events::EventManager;
use library::Library;
use playlist::Playlist;
use queue::Queue;
use spotify::{Spotify, URIType};
use track::Track;
use traits::{ListItem, ViewExt};
use ui::listview::{ListView, Pagination};
use ui::tabview::TabView;
use crate::album::Album;
use crate::artist::Artist;
use crate::command::{Command, MoveMode};
use crate::commands::CommandResult;
use crate::events::EventManager;
use crate::library::Library;
use crate::playlist::Playlist;
use crate::queue::Queue;
use crate::spotify::{Spotify, URIType};
use crate::track::Track;
use crate::traits::{ListItem, ViewExt};
use crate::ui::listview::{ListView, Pagination};
use crate::ui::tabview::TabView;
pub struct SearchView {
results_tracks: Arc<RwLock<Vec<Track>>>,

6
src/ui/statusbar.rs
View File

@@ -8,9 +8,9 @@ use cursive::vec::Vec2;
use cursive::Printer;
use unicode_width::UnicodeWidthStr;
use library::Library;
use queue::{Queue, RepeatSetting};
use spotify::{PlayerEvent, Spotify};
use crate::library::Library;
use crate::queue::{Queue, RepeatSetting};
use crate::spotify::{PlayerEvent, Spotify};
pub struct StatusBar {
queue: Arc<Queue>,

6
src/ui/tabview.rs
View File

@@ -7,9 +7,9 @@ use cursive::traits::View;
use cursive::{Cursive, Printer, Vec2};
use unicode_width::UnicodeWidthStr;
use command::{Command, MoveMode};
use commands::CommandResult;
use traits::{IntoBoxedViewExt, ViewExt};
use crate::command::{Command, MoveMode};
use crate::commands::CommandResult;
use crate::traits::{IntoBoxedViewExt, ViewExt};
pub struct Tab {
title: String,