From bf7740784efab254bd3a3b1e10ffa3f84dca1d37 Mon Sep 17 00:00:00 2001
From: Julien Rabier <taziden@flexiden.org>
Date: Wed, 22 Jul 2020 15:21:51 +0200
Subject: [PATCH] minor edits

---
 src/main.rs | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 4e804e1..1da49b3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
 use chrono::Local;
-use mpd::*;
+use mpd::{Client, Query, Song};
 use rand::prelude::*;
 use std::{thread, time};
 
@@ -9,10 +9,10 @@ fn main() {
 
     // We launch an infinite loop
     loop {
-        let mut conn = Client::default();
+        let mut c = Client::default();
         println!("{} checking playlist ", Local::now().format("%T"));
 
-        let s = match conn.status() {
+        let s = match c.status() {
             Ok(status) => status,
             Err(_) => panic!("blah"),
         };
@@ -20,18 +20,22 @@ fn main() {
         let ql = s.queue_len;
 
         if ql < 10u32 {
-            add_music(10u32 - ql);
+            populate_playlist(10u32 - ql);
         };
 
         let refresh_delay = time::Duration::from_secs(20);
         thread::sleep(refresh_delay);
 
-        let _ = conn.close();
+        let _ = c.close();
     }
 }
 
-fn add_music(a: u32) {
-    println!("need to add {} songs", a);
+fn populate_playlist(a: u32) {
+    if a == 1 {
+        println!("need to add one song");
+    } else {
+        println!("need to add {} songs", a);
+    }
 
     let mut x: u32 = 0;
     while x < a {
@@ -47,20 +51,17 @@ fn add_music(a: u32) {
 }
 
 fn add_track() {
-    let mut conn = Client::default();
+    let mut c = Client::default();
 
     let res: Song = get_random_track();
     println!("adding: {:?}", res.file);
 
-    let _ = match conn.push(res) {
-        Ok(_) => (),
-        Err(e) => eprintln!("{:?}", e),
-    };
-    let _ = conn.close();
+    let _ = c.push(res);
+    let _ = c.close();
 }
 
 fn get_random_track() -> Song {
-    let mut conn = Client::default();
+    let mut c = Client::default();
 
     const CHARSET: &[u8] = b"abcdefghijklmnopqrstuvwxyz";
     const CHARS_LEN: usize = 2;
@@ -76,7 +77,7 @@ fn get_random_track() -> Song {
     let mut query = Query::new();
     let query = query.and(mpd::Term::Any, chars);
 
-    let songs = conn.search(query, None).unwrap_or_default();
+    let songs = c.search(query, None).unwrap_or_default();
 
     if songs.is_empty() {
         return get_random_track();