Add database transaction instead of multiple connections

And remove userinterface

src/database.rs

@@ -147,7 +147,8 @@ impl Database {
         song: &str,
         rating: i64,
     ) -> Result<()> {
-        let mut conn = self.pool.acquire().await?;
+        // Begin the transaction
+        let mut tx = self.pool.begin().await?;
 
         // Add interpret
         let _ = sqlx::query(
@@ -157,7 +158,7 @@ impl Database {
             "#,
         )
         .bind(interpret)
-        .execute(&mut *conn)
+        .execute(&mut *tx)
         .await?;
 
         // Get the interpret ID
@@ -168,7 +169,7 @@ impl Database {
         "#,
         )
         .bind(interpret)
-        .fetch_one(&mut *conn)
+        .fetch_one(&mut *tx)
         .await?;
 
         let interpret_id: i64 = record.try_get("id")?;
@@ -182,7 +183,7 @@ impl Database {
         )
         .bind(song)
         .bind(interpret_id)
-        .execute(&mut *conn)
+        .execute(&mut *tx)
         .await?;
 
         // Get the song ID
@@ -193,7 +194,7 @@ impl Database {
         "#,
         )
         .bind(song)
-        .fetch_one(&mut *conn)
+        .fetch_one(&mut *tx)
         .await?;
 
         let song_id: i64 = record.try_get("id")?;
@@ -208,9 +209,12 @@ impl Database {
         .bind(user_id)
         .bind(song_id)
         .bind(rating)
-        .execute(&mut *conn)
+        .execute(&mut *tx)
         .await?;
 
+        // Commit the transaction to save everything!
+        tx.commit().await?;
+
         Ok(())
     }
 

src/http_server.rs

@@ -32,10 +32,10 @@ pub async fn http_serve(database: &Database, mpris_producer: Sender<(String, Str
 
     let app = Router::new()
         .route("/", get(root))
-        .route("/rating/{rating}", get(cache_rating_only))
+        .route("/rating/:rating", get(cache_rating_only))
-        .route("/userid/{user_id}", get(add_userid))
+        .route("/userid/:user_id", get(add_userid))
-        .route("/usercard/{user_card}", get(add_userid_by_card))
+        .route("/usercard/:user_card", get(add_userid_by_card))
-        .route("/{user_id}/{rating}", get(add_rating))
+        .route("/:user_id/:rating", get(add_rating))
         .with_state(shared_state);
 
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();

src/main.rs

@@ -1,9 +1,8 @@
 mod database;
 mod http_server;
 mod player;
-mod userinterface;
 
-use std::{env::args, sync::Arc, thread::sleep, time::Duration};
+use std::{env::args, sync::Arc, time::Duration};
 
 use tokio::{join, sync::watch};
 
@@ -67,7 +66,7 @@ async fn main() {
     let (mpris_tx, mut mpris_rx) = watch::channel((String::new(), String::new()));
 
     let mpris_tx_http = mpris_tx.clone();
-    tokio::spawn(async move {
+    std::thread::spawn(move || {
         let player = player::MprisPlayer::new().expect("Could not create player");
         loop {
             if let Ok((interpret, track)) = player.get_interpret_and_track() {
@@ -76,7 +75,7 @@ async fn main() {
                 }
             }
             // Use the std sleep here to avoid an await which will requires player to be Send.
-            sleep(Duration::from_millis(10));
+            std::thread::sleep(Duration::from_millis(1000));
         }
     });
 
@@ -94,17 +93,17 @@ async fn main() {
         }
     }
 
-    loop {
+    //loop {
-        let (usernumber, userrating) = userinterface::get_user_rating(&db)
+    //    let (usernumber, userrating) = userinterface::get_user_rating(&db)
-            .await
+    //        .await
-            .expect("Can not get user input");
+    //        .expect("Can not get user input");
-        let (interpret, track) = (*mpris_rx.borrow_and_update()).clone();
+    //    let (interpret, track) = (*mpris_rx.borrow_and_update()).clone();
 
-        if let Err(e) = db
+    //    if let Err(e) = db
-            .user_add_rating(usernumber, &interpret, &track, userrating)
+    //        .user_add_rating(usernumber, &interpret, &track, userrating)
-            .await
+    //        .await
-        {
+    //    {
-            eprintln!("{e}");
+    //        eprintln!("{e}");
-        }
+    //    }
-    }
+    //}
 }