minor edits

This commit is contained in:
Julien Rabier 2020-07-22 15:21:51 +02:00
parent 68be89f497
commit bf7740784e

View File

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