rename TrackInfo to Track

src/download.rs

@@ -1,11 +1,11 @@
 use std::{path::Path, process::Command};
 
-use crate::track::TrackInfo;
+use crate::track::Track;
 
 #[derive(Debug, Clone, Copy)]
 pub struct DownloadError;
 
-pub fn download_from_youtube(url: &str) -> Result<TrackInfo, DownloadError> {
+pub fn download_from_youtube(url: &str) -> Result<Track, DownloadError> {
     let output = Command::new("yt-dlp")
         .args([
             "-o",
@@ -32,5 +32,5 @@ pub fn download_from_youtube(url: &str) -> Result<TrackInfo, DownloadError> {
         .replace('\n', "")
         + ".mp3";
 
-    Ok(TrackInfo::new(Path::new(filename.as_str())))
+    Ok(Track::new(Path::new(filename.as_str())))
 }

src/lib.rs

@@ -5,4 +5,4 @@ pub mod player;
 pub mod telegram;
 mod track;
 
-pub use track::TrackInfo;
+pub use track::Track;

src/player.rs

@@ -2,11 +2,11 @@ use rodio::{Decoder, OutputStream, OutputStreamHandle, Sink};
 use std::{collections::VecDeque, fs::File, io::BufReader, thread, thread::JoinHandle};
 
 use crate::channel::{self, Requester, Responder, TryRecvError};
-use crate::track::TrackInfo;
+use crate::track::Track;
 
 #[derive(Debug, Clone)]
 enum WorkerRequest {
-    AddTrack(TrackInfo),
+    AddTrack(Track),
     Pause,
     Play,
     Stop,
@@ -16,7 +16,7 @@ enum WorkerRequest {
 
 #[derive(Debug, Clone)]
 enum WorkerResponse {
-    TrackList(VecDeque<TrackInfo>),
+    TrackList(VecDeque<Track>),
     None,
 }
 
@@ -32,11 +32,11 @@ struct Worker {
     _stream: OutputStream,
     _handle: OutputStreamHandle,
     sink: Sink,
-    queue: VecDeque<TrackInfo>,
+    queue: VecDeque<Track>,
     responder: Responder<WorkerRequest, WorkerResponse>,
 }
 
-fn get_source(track: TrackInfo) -> Decoder<BufReader<File>> {
+fn get_source(track: Track) -> Decoder<BufReader<File>> {
     let file = BufReader::new(File::open(track.path).unwrap());
     Decoder::new(file).unwrap()
 }
@@ -88,7 +88,7 @@ impl Worker {
     pub fn build(responder: Responder<WorkerRequest, WorkerResponse>) -> Worker {
         let (_stream, _handle) = OutputStream::try_default().unwrap();
         let sink = Sink::try_new(&_handle).unwrap();
-        let queue: VecDeque<TrackInfo> = VecDeque::new();
+        let queue: VecDeque<Track> = VecDeque::new();
         Worker {
             _stream,
             _handle,
@@ -106,7 +106,7 @@ impl MusicPlayer {
         MusicPlayer { requester, _worker }
     }
 
-    pub fn enqueue(&mut self, track: TrackInfo) {
+    pub fn enqueue(&mut self, track: Track) {
         self.requester.send(AddTrack(track)).unwrap();
     }
 
@@ -126,7 +126,7 @@ impl MusicPlayer {
         self.requester.send(Stop).unwrap();
     }
 
-    pub fn list_tracks(&self) -> VecDeque<TrackInfo> {
+    pub fn list_tracks(&self) -> VecDeque<Track> {
         let response = self.requester.send(ListTracks).unwrap();
         match response.recv().unwrap() {
             TrackList(tracks) => tracks,

src/track.rs

@@ -1,12 +1,12 @@
 use std::path::{Path, PathBuf};
 #[derive(Debug, Clone)]
-pub struct TrackInfo {
+pub struct Track {
     pub path: PathBuf,
 }
 
-impl TrackInfo {
+impl Track {
-    pub fn new(path: &Path) -> TrackInfo {
+    pub fn new(path: &Path) -> Track {
-        TrackInfo {
+        Track {
             path: PathBuf::from(path),
         }
     }