Run lint / format

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

diff --git a/src/sources/mod.rs b/src/sources/mod.rs
index 78f749994ca5ce76725639e27ee15560e6b330b6..47c25d00880e07df69b84184e289d6de3a014772 100644 (file)
--- a/src/sources/mod.rs
+++ b/src/sources/mod.rs
@@ -1,32 +1,20 @@
-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 spotify;
 
 
 #[cfg(target_os = "macos")]
 mod apple_music;
 #[cfg(target_os = "macos")]
 mod spotify;
 

-// #[cfg(not(target_os = "macos"))]
-// mod rhythmbox;
-// #[cfg(not(target_os = "macos"))]
-// mod quod_libe;
-// #[cfg(not(target_os = "macos"))]
-// mod strawberry;
-// #[cfg(not(target_os = "macos"))]
-// mod tauon;
+#[cfg(target_os = "linux")]
+mod dbus;

 
 #[cfg(target_os = "macos")]
 use apple_music::AppleMusic;
 #[cfg(target_os = "macos")]
 use spotify::Spotify;
 
 
 #[cfg(target_os = "macos")]
 use apple_music::AppleMusic;
 #[cfg(target_os = "macos")]
 use spotify::Spotify;
 

-// #[cfg(not(target_os = "macos"))]
-// use rhythmbox::Rhythmbox;
-// #[cfg(not(target_os = "macos"))]
-// use quod_libet::QuodLibet;
-// #[cfg(not(target_os = "macos"))]
-// use strawberry::Strawberry;
-// #[cfg(not(target_os = "macos"))]
-// use tauon::Tauon;
+#[cfg(target_os = "linux")]
+use dbus::Dbus;

 
 use crate::Track;
 
 
 use crate::Track;
 


@@ -41,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."))


@@ -58,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."))


@@ -68,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."))


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

-    return None
+    return None;

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


@@ -94,10 +85,7 @@ pub fn available_sources() -> Vec<Box<dyn LyricsSource>> {
 
     #[cfg(not(target_os = "macos"))]
     {
 
     #[cfg(not(target_os = "macos"))]
     {

-        // sources.push(Box::new(Rhythmbox::new()));
-        // sources.push(Box::new(QuodLibet::new()));
-        // sources.push(Box::new(Strawberry::new()));
-        // sources.push(Box::new(Tauon::new()));
+        sources.push(Box::new(Dbus::new()));

     }
 
     sources
     }
 
     sources