Skip to content

Commit 93d467a

Browse files
committed
Fixed some minor errors
1 parent 50c84d3 commit 93d467a

File tree

3 files changed

+32
-10
lines changed

3 files changed

+32
-10
lines changed

Cargo.lock

Lines changed: 19 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/application.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::library::Library;
1616
use crate::queue::Queue;
1717
use crate::spotify::{PlayerEvent, Spotify};
1818
use crate::ui::create_cursive;
19-
use crate::{authentication, ui};
19+
use crate::{authentication, ui, lyrics, lyrics_fetcher};
2020
use crate::{command, queue, spotify};
2121

2222
#[cfg(feature = "mpris")]
@@ -123,6 +123,15 @@ impl Application {
123123
library.clone(),
124124
));
125125

126+
println!("Building lyrics manager");
127+
128+
let lyrics_manager = Arc::new(lyrics::LyricsManager::new(
129+
queue.clone(),
130+
lyrics_fetcher::default_fetcher(configuration.clone()),
131+
));
132+
133+
println!("Built lyrics manager");
134+
126135
#[cfg(feature = "mpris")]
127136
let mpris_manager = mpris::MprisManager::new(
128137
event_manager.clone(),
@@ -159,7 +168,7 @@ impl Application {
159168

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

162-
let lyricsview = ui::lyrics::LyricsView::new(queue.clone());
171+
let lyricsview = ui::lyrics::LyricsView::new(lyrics_manager.clone());
163172

164173
#[cfg(feature = "cover")]
165174
let coverview = ui::cover::CoverView::new(queue.clone(), library.clone(), &configuration);

src/lyrics_fetcher.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ impl LyricsFetcher for MusixMatchLyricsFetcher {
5151
}
5252
}
5353

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

0 commit comments

Comments
 (0)