From 7e3ef6868ec138992ca22e96539acf385afb8a1c Mon Sep 17 00:00:00 2001 From: Jokler Date: Tue, 14 Jan 2020 20:55:46 +0100 Subject: Use youtube-dl json output for metadata access (#3) * Use youtube-dl json output for metadata access * Fix: meta_data -> metadata --- src/playlist.rs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/playlist.rs') diff --git a/src/playlist.rs b/src/playlist.rs index 86b9100..87c1c98 100644 --- a/src/playlist.rs +++ b/src/playlist.rs @@ -2,8 +2,10 @@ use std::collections::VecDeque; use log::info; +use crate::youtube_dl::AudioMetadata; + pub struct Playlist { - data: VecDeque, + data: VecDeque, } impl Playlist { @@ -13,13 +15,13 @@ impl Playlist { } } - pub fn push(&mut self, req: AudioRequest) { - info!("Adding {} to playlist", &req.title); + pub fn push(&mut self, data: AudioMetadata) { + info!("Adding {:?} to playlist", &data.title); - self.data.push_front(req) + self.data.push_front(data) } - pub fn pop(&mut self) -> Option { + pub fn pop(&mut self) -> Option { let res = self.data.pop_back(); info!("Popping {:?} from playlist", res.as_ref().map(|r| &r.title)); @@ -36,9 +38,3 @@ impl Playlist { info!("Cleared playlist") } } - -#[derive(Clone, Debug)] -pub struct AudioRequest { - pub title: String, - pub address: String, -} -- cgit v1.2.3-70-g09d2