Skip to content

Commit

Permalink
Fixed some minor errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Naapperas committed Jul 25, 2023
1 parent 50c84d3 commit 93d467a
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 10 deletions.
26 changes: 19 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions src/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::library::Library;
use crate::queue::Queue;
use crate::spotify::{PlayerEvent, Spotify};
use crate::ui::create_cursive;
use crate::{authentication, ui};
use crate::{authentication, ui, lyrics, lyrics_fetcher};
use crate::{command, queue, spotify};

#[cfg(feature = "mpris")]
Expand Down Expand Up @@ -123,6 +123,15 @@ impl Application {
library.clone(),
));

println!("Building lyrics manager");

let lyrics_manager = Arc::new(lyrics::LyricsManager::new(
queue.clone(),
lyrics_fetcher::default_fetcher(configuration.clone()),
));

println!("Built lyrics manager");

#[cfg(feature = "mpris")]
let mpris_manager = mpris::MprisManager::new(
event_manager.clone(),
Expand Down Expand Up @@ -159,7 +168,7 @@ impl Application {

let queueview = ui::queue::QueueView::new(queue.clone(), library.clone());

let lyricsview = ui::lyrics::LyricsView::new(queue.clone());
let lyricsview = ui::lyrics::LyricsView::new(lyrics_manager.clone());

#[cfg(feature = "cover")]
let coverview = ui::cover::CoverView::new(queue.clone(), library.clone(), &configuration);
Expand Down
3 changes: 2 additions & 1 deletion src/lyrics_fetcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ impl LyricsFetcher for MusixMatchLyricsFetcher {
}
}

/// Create a default lyrics fetcher.
pub fn default_fetcher(cfg: Arc<Config>) -> Box<dyn LyricsFetcher> {
Box::new(MusixMatchLyricsFetcher {
api_key: cfg.values().backend.clone().unwrap(),
api_key: cfg.values().backend.clone().unwrap_or_default(),
})
}

0 comments on commit 93d467a

Please sign in to comment.