cargo fmt

This commit is contained in:
KoffeinFlummi
2019-04-23 01:47:40 +02:00
parent eed218d0c3
commit 35303db5f0
7 changed files with 42 additions and 34 deletions

View File

@@ -176,6 +176,9 @@ impl ListItem for Album {
}
fn artist(&self) -> Option<Artist> {
Some(Artist::new(self.artist_ids[0].clone(), self.artists[0].clone()))
Some(Artist::new(
self.artist_ids[0].clone(),
self.artists[0].clone(),
))
}
}

View File

@@ -194,6 +194,9 @@ impl ListItem for Track {
}
fn artist(&self) -> Option<Artist> {
Some(Artist::new(self.artist_ids[0].clone(), self.artists[0].clone()))
Some(Artist::new(
self.artist_ids[0].clone(),
self.artists[0].clone(),
))
}
}

View File

@@ -29,7 +29,8 @@ impl AlbumView {
Vec::new()
};
let artists = album.artist_ids
let artists = album
.artist_ids
.iter()
.zip(album.artists.iter())
.map(|(id, name)| Artist::new(id.clone(), name.clone()))
@@ -39,18 +40,23 @@ impl AlbumView {
.tab(
"tracks",
"Tracks",
ListView::new(Arc::new(RwLock::new(tracks)), queue.clone(), library.clone()),
ListView::new(
Arc::new(RwLock::new(tracks)),
queue.clone(),
library.clone(),
),
)
.tab(
"artists",
"Artists",
ListView::new(Arc::new(RwLock::new(artists)), queue.clone(), library.clone()),
ListView::new(
Arc::new(RwLock::new(artists)),
queue.clone(),
library.clone(),
),
);
Self {
album,
tabs
}
Self { album, tabs }
}
}

View File

@@ -63,7 +63,11 @@ impl ArtistView {
tabs.add_tab(
"tracks",
"Saved Tracks",
ListView::new(Arc::new(RwLock::new(tracks)), queue.clone(), library.clone()),
ListView::new(
Arc::new(RwLock::new(tracks)),
queue.clone(),
library.clone(),
),
);
}
@@ -76,7 +80,11 @@ impl ArtistView {
tabs.add_tab(
"albums",
"Albums",
ListView::new(Arc::new(RwLock::new(albums)), queue.clone(), library.clone()),
ListView::new(
Arc::new(RwLock::new(albums)),
queue.clone(),
library.clone(),
),
);
tabs.add_tab(
@@ -85,10 +93,7 @@ impl ArtistView {
ListView::new(related.clone(), queue.clone(), library.clone()),
);
Self {
artist,
tabs
}
Self { artist, tabs }
}
}

View File

@@ -76,12 +76,7 @@ impl Layout {
self.focus = Some(s);
}
pub fn view<S: Into<String>, T: IntoBoxedViewExt>(
mut self,
id: S,
view: T,
title: S,
) -> Self {
pub fn view<S: Into<String>, T: IntoBoxedViewExt>(mut self, id: S, view: T, title: S) -> Self {
(&mut self).add_view(id, view, title);
self
}
@@ -120,10 +115,7 @@ impl Layout {
pub fn push_view(&mut self, view: Box<dyn ViewExt>) {
let title = view.title();
let screen = Screen {
title,
view
};
let screen = Screen { title, view };
self.stack.push(screen);
}

View File

@@ -358,16 +358,14 @@ impl<I: ListItem + Clone> ViewExt for ListView<I> {
if arg == "album" {
if let Some(album) = item.album(queue.clone()) {
let view = AlbumView::new(queue, library, &album)
.as_boxed_view_ext();
let view = AlbumView::new(queue, library, &album).as_boxed_view_ext();
return Ok(CommandResult::View(view));
}
}
if arg == "artist" {
if let Some(artist) = item.artist() {
let view = ArtistView::new(queue, library, &artist)
.as_boxed_view_ext();
let view = ArtistView::new(queue, library, &artist).as_boxed_view_ext();
return Ok(CommandResult::View(view));
}
}

View File

@@ -19,12 +19,13 @@ pub struct PlaylistView {
impl PlaylistView {
pub fn new(queue: Arc<Queue>, library: Arc<Library>, playlist: &Playlist) -> Self {
let playlist = playlist.clone();
let list = ListView::new(Arc::new(RwLock::new(playlist.tracks.clone())), queue, library);
let list = ListView::new(
Arc::new(RwLock::new(playlist.tracks.clone())),
queue,
library,
);
Self {
playlist,
list
}
Self { playlist, list }
}
}