Include dbus to use vendored

[rbdr/lyricli] / src / sources / mod.rs

diff --git a/src/sources/mod.rs b/src/sources/mod.rs
index 087a87f4a6cfb553888320ea1784746d17f590d8..c4122a412a572175e4ab6df710c02dbbff122f62 100644 (file)
--- a/src/sources/mod.rs
+++ b/src/sources/mod.rs
@@ -1,4 +1,4 @@
-use std::io::{Result, Error, ErrorKind::Other};
+use std::io::{Error, ErrorKind::Other, Result};

 
 #[cfg(target_os = "macos")]
 mod apple_music;
 
 #[cfg(target_os = "macos")]
 mod apple_music;


@@ -29,14 +29,17 @@ pub trait LyricsSource {
 }
 
 pub fn list() -> Vec<String> {
 }
 
 pub fn list() -> Vec<String> {

-    available_sources().into_iter().map(|source| source.name()).collect()
+    available_sources()
+        .into_iter()
+        .map(|source| source.name())
+        .collect()

 }
 
 pub fn enable(source_name: &String) -> Result<()> {
     let sources = available_sources();
     for source in sources {
         if &source.name() == source_name {
 }
 
 pub fn enable(source_name: &String) -> Result<()> {
     let sources = available_sources();
     for source in sources {
         if &source.name() == source_name {

-            return source.enable()
+            return source.enable();

         }
     }
     Err(Error::new(Other, "No such source was available."))
         }
     }
     Err(Error::new(Other, "No such source was available."))


@@ -46,7 +49,7 @@ pub fn disable(source_name: &String) -> Result<()> {
     let sources = available_sources();
     for source in sources {
         if &source.name() == source_name {
     let sources = available_sources();
     for source in sources {
         if &source.name() == source_name {

-            return source.disable()
+            return source.disable();

         }
     }
     Err(Error::new(Other, "No such source was available."))
         }
     }
     Err(Error::new(Other, "No such source was available."))


@@ -56,7 +59,7 @@ pub fn reset(source_name: &String) -> Result<()> {
     let sources = available_sources();
     for source in sources {
         if &source.name() == source_name {
     let sources = available_sources();
     for source in sources {
         if &source.name() == source_name {

-            return source.reset()
+            return source.reset();

         }
     }
     Err(Error::new(Other, "No such source was available."))
         }
     }
     Err(Error::new(Other, "No such source was available."))


@@ -69,7 +72,7 @@ pub fn get_track() -> Option<Track> {
             return Some(track);
         }
     }
             return Some(track);
         }
     }

-    return None
+    None

 }
 
 pub fn available_sources() -> Vec<Box<dyn LyricsSource>> {
 }
 
 pub fn available_sources() -> Vec<Box<dyn LyricsSource>> {