Include dbus to use vendored

[rbdr/lyricli] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index d3b3334e44228b1999309a5b9ae9568b0059cf35..7b61a85d4eba342c5195af427d5ff895bdd3499c 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,17 +2,16 @@ mod configuration;
 mod lyrics_engine;
 mod sources;
 
 mod lyrics_engine;
 mod sources;
 

-use std::io::{Result, Error, ErrorKind::Other};

 use clap::Parser;
 use clap::Parser;

+use std::io::{Error, ErrorKind::Other, Result};

 
 use configuration::Configuration;
 
 use configuration::Configuration;

-use sources::{enable, disable, get_track, reset, list};

 use lyrics_engine::print_lyrics;
 use lyrics_engine::print_lyrics;

+use sources::{disable, enable, get_track, list, reset};

 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 struct Arguments {
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 struct Arguments {

-

     // Positional Arguments
     /// Specify the artist.
     artist: Option<String>,
     // Positional Arguments
     /// Specify the artist.
     artist: Option<String>,


@@ -41,7 +40,7 @@ struct Arguments {
 
 pub struct Track {
     pub name: String,
 
 pub struct Track {
     pub name: String,

-    pub artist: String
+    pub artist: String,

 }
 
 #[tokio::main]
 }
 
 #[tokio::main]


@@ -72,7 +71,7 @@ async fn run() -> Result<()> {
             if configuration.is_enabled(&source) {
                 print!(" (enabled)");
             }
             if configuration.is_enabled(&source) {
                 print!(" (enabled)");
             }

-            println!("");
+            println!();

         }
         return Ok(());
     }
         }
         return Ok(());
     }


@@ -99,11 +98,11 @@ async fn run() -> Result<()> {
     if let Some(artist) = arguments.artist {
         current_track = Track {
             name: arguments.track_name.unwrap_or("".to_string()),
     if let Some(artist) = arguments.artist {
         current_track = Track {
             name: arguments.track_name.unwrap_or("".to_string()),

-            artist: artist
+            artist,

         };
     } else {
         };
     } else {

-        current_track = get_track()
-            .ok_or_else(|| Error::new(Other, "No Artist/Song could be found :("))?
+        current_track =
+            get_track().ok_or_else(|| Error::new(Other, "No Artist/Song could be found :("))?

     }
 
     print_lyrics(current_track, arguments.show_title).await
     }
 
     print_lyrics(current_track, arguments.show_title).await