Address clippy

[rbdr/lyricli] / src / lyrics_engine / genius.rs

diff --git a/src/lyrics_engine/genius.rs b/src/lyrics_engine/genius.rs
index e14589d88ff3c9d972867e8c5926eb8cbe809d01..b33ff9296d462f3badf731fba9c06721a4159d04 100644 (file)
--- a/src/lyrics_engine/genius.rs
+++ b/src/lyrics_engine/genius.rs
@@ -1,7 +1,10 @@
-use std::io::{Result, Error, ErrorKind::Other};
-use serde::Deserialize;

 use reqwest::get;
 use reqwest::get;

-use scraper::{ElementRef, Html, Selector, node::Node::{Text, Element}};
+use scraper::{
+    node::Node::{Element, Text},
+    ElementRef, Html, Selector,
+};
+use serde::Deserialize;
+use std::io::{Error, ErrorKind::Other, Result};

 
 #[derive(Deserialize, Debug)]
 struct GeniusApiResponse {
 
 #[derive(Deserialize, Debug)]
 struct GeniusApiResponse {


@@ -26,11 +29,21 @@ struct GeniusResult {
 }
 
 pub async fn search(url: &str) -> Result<String> {
 }
 
 pub async fn search(url: &str) -> Result<String> {

-    let response = get(url).await
+    let response = get(url)
+        .await

         .map_err(|_| Error::new(Other, "Could not perform lyrics search in engine."))?
         .map_err(|_| Error::new(Other, "Could not perform lyrics search in engine."))?

-        .json::<GeniusApiResponse>().await
-        .map_err(|_| Error::new(Other, "Lyrics engine returned invalid response from search."))?;
-    let url = response.response.hits.into_iter()
+        .json::<GeniusApiResponse>()
+        .await
+        .map_err(|_| {
+            Error::new(
+                Other,
+                "Lyrics engine returned invalid response from search.",
+            )
+        })?;
+    let url = response
+        .response
+        .hits
+        .into_iter()

         .find(|hit| hit.hit_type == "song")
         .map(|hit| hit.result.url)
         .ok_or_else(|| Error::new(Other, "Could not find a matching track in lyrics engine."))?;
         .find(|hit| hit.hit_type == "song")
         .map(|hit| hit.result.url)
         .ok_or_else(|| Error::new(Other, "Could not find a matching track in lyrics engine."))?;


@@ -39,14 +52,18 @@ pub async fn search(url: &str) -> Result<String> {
 }
 
 pub async fn get_lyrics(url: &str) -> Result<String> {
 }
 
 pub async fn get_lyrics(url: &str) -> Result<String> {

-    let song_html = get(url).await
+    let song_html = get(url)
+        .await

         .map_err(|_| Error::new(Other, "Could not fetch lyrics from engine."))?
         .map_err(|_| Error::new(Other, "Could not fetch lyrics from engine."))?

-        .text().await
+        .text()
+        .await

         .map_err(|_| Error::new(Other, "Lyrics engine returned invalid response."))?;
 
     let document = Html::parse_document(&song_html);
     let selector = Selector::parse(r#"div[data-lyrics-container="true"]"#).unwrap();
         .map_err(|_| Error::new(Other, "Lyrics engine returned invalid response."))?;
 
     let document = Html::parse_document(&song_html);
     let selector = Selector::parse(r#"div[data-lyrics-container="true"]"#).unwrap();

-    let lyrics_div = document.select(&selector).next()
+    let lyrics_div = document
+        .select(&selector)
+        .next()

         .ok_or_else(|| Error::new(Other, "Could not find lyrics in response."))?;
 
     let mut lyrics = String::new();
         .ok_or_else(|| Error::new(Other, "Could not find lyrics in response."))?;
 
     let mut lyrics = String::new();


@@ -55,16 +72,14 @@ pub async fn get_lyrics(url: &str) -> Result<String> {
             Element(element) => {
                 if element.name() == "br" {
                     lyrics.push('\n');
             Element(element) => {
                 if element.name() == "br" {
                     lyrics.push('\n');

-                } else {
-                    if let Some(element_ref) = ElementRef::wrap(node) {
-                        let text = element_ref.text().collect::<Vec<_>>().join("");
-                        lyrics.push_str(&text);
-                    }
+                } else if let Some(element_ref) = ElementRef::wrap(node) {
+                    let text = element_ref.text().collect::<Vec<_>>().join("");
+                    lyrics.push_str(&text);

                 }
                 }

-            },
+            }

             Text(text) => {
                 lyrics.push_str(text);
             Text(text) => {
                 lyrics.push_str(text);

-            },
+            }

             _ => {}
         }
     }
             _ => {}
         }
     }