Simplify main
This commit is contained in:
20
src/main.rs
20
src/main.rs
@@ -18,8 +18,6 @@ async fn main() {
|
|||||||
// Create the tables on an empty database
|
// Create the tables on an empty database
|
||||||
db.create_tables().await.unwrap();
|
db.create_tables().await.unwrap();
|
||||||
|
|
||||||
let mut servermode = false;
|
|
||||||
|
|
||||||
if args().len() > 1 {
|
if args().len() > 1 {
|
||||||
// Add a new user
|
// Add a new user
|
||||||
let username = args().nth(1).unwrap();
|
let username = args().nth(1).unwrap();
|
||||||
@@ -41,8 +39,6 @@ async fn main() {
|
|||||||
.await
|
.await
|
||||||
.expect("Could not get ratings");
|
.expect("Could not get ratings");
|
||||||
return;
|
return;
|
||||||
} else if username == "-s" {
|
|
||||||
servermode = true;
|
|
||||||
} else {
|
} else {
|
||||||
let user_id = db.add_user(&username).await.expect("Could not add user");
|
let user_id = db.add_user(&username).await.expect("Could not add user");
|
||||||
println!("UserID for {username}: {user_id}");
|
println!("UserID for {username}: {user_id}");
|
||||||
@@ -85,25 +81,9 @@ async fn main() {
|
|||||||
http_server::http_serve(&db_http, mpris_tx_http).await;
|
http_server::http_serve(&db_http, mpris_tx_http).await;
|
||||||
});
|
});
|
||||||
|
|
||||||
if servermode {
|
|
||||||
eprintln!("Servermode...");
|
eprintln!("Servermode...");
|
||||||
let res = join!(http_handle);
|
let res = join!(http_handle);
|
||||||
if let Err(e) = res.0 {
|
if let Err(e) = res.0 {
|
||||||
eprintln!("{e}");
|
eprintln!("{e}");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
//loop {
|
|
||||||
// let (usernumber, userrating) = userinterface::get_user_rating(&db)
|
|
||||||
// .await
|
|
||||||
// .expect("Can not get user input");
|
|
||||||
// let (interpret, track) = (*mpris_rx.borrow_and_update()).clone();
|
|
||||||
|
|
||||||
// if let Err(e) = db
|
|
||||||
// .user_add_rating(usernumber, &interpret, &track, userrating)
|
|
||||||
// .await
|
|
||||||
// {
|
|
||||||
// eprintln!("{e}");
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user