From 93d467accd7835afd34c3e38ae3cdcf73a098422 Mon Sep 17 00:00:00 2001
From: Nuno Pereira <nunoafonso2002@gmail.com>
Date: Tue, 25 Jul 2023 21:43:14 +0100
Subject: [PATCH] Fixed some minor errors

---
 Cargo.lock            | 26 +++++++++++++++++++-------
 src/application.rs    | 13 +++++++++++--
 src/lyrics_fetcher.rs |  3 ++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a4d3e8f0a..ec5c7281c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -138,6 +138,10 @@ name = "anstyle"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
 dependencies = [
@@ -565,12 +569,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
 [[package]]
 name = "combine"
 version = "4.6.6"
@@ -818,7 +816,7 @@ dependencies = [
  "interpolation",
  "lazy_static",
  "log",
- "num 0.4.0",
+ "num 0.4.1",
  "send_wrapper",
 ]
 
@@ -3050,6 +3048,20 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.37.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustix"
 version = "0.38.4"
diff --git a/src/application.rs b/src/application.rs
index e29dae424..fc108f75a 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -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")]
@@ -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(),
@@ -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);
diff --git a/src/lyrics_fetcher.rs b/src/lyrics_fetcher.rs
index 7986676cc..d9bef8c43 100644
--- a/src/lyrics_fetcher.rs
+++ b/src/lyrics_fetcher.rs
@@ -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(),
     })
 }