Finalize initial implementation

.gitea/workflows/ci.yaml

@@ -15,11 +15,25 @@ jobs:
       matrix:
         toolchain:
           - stable
-          - beta
+          # - beta
-          - nightly
+          # - nightly
     steps:
       - uses: actions/checkout@v4
       - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
       - run: cargo build --verbose
       - run: cargo test --verbose
       - run: cargo build --release --target=x86_64-unknown-linux-musl
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.loadingm.xyz
+          username: "the10thwiz"
+          password: ${{ secrets.PACKAGE_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          file: 'Dockerfile'
+          tags: gitea.loadingm.xyz/the10thwiz/gpodder:latest
+
+

src/devices.rs

@@ -8,7 +8,7 @@ use crate::{
 use rocket::{
     Route, TypedError, get, post, routes,
     serde::{Deserialize, Serialize, json::Json},
-    trace::debug,
+    trace::{debug, info},
 };
 use rocket_db_pools::{
     Connection,
@@ -71,6 +71,7 @@ pub async fn update(
     .await?;
 
     // debug!("Users: {:?}", sqlx::query!("SELECT * FROM users").fetch_all(&mut **db).await);
+    debug!("INSERT INTO devices (id, user, caption, type) VALUES ({:?}, {:?}, {:?}, {:?})", device, username, dev.caption, dev.r#type);
     let res = sqlx::query("INSERT INTO devices (id, user, caption, type) VALUES (?, ?, ?, ?)")
         .bind(device)
         .bind(username)

src/main.rs

@@ -1,5 +1,5 @@
 #![allow(private_interfaces)]
-use rocket::{catch, catchers, fairing::AdHoc, launch, TypedError};
+use rocket::{catch, catchers, fairing::AdHoc, launch, TypedError, trace::error};
 
 mod auth;
 mod devices;
@@ -31,6 +31,7 @@ impl From<sqlx::Error> for SqlError {
 
 #[catch(default, error = "<error>")]
 fn catch_sql(error: &SqlError) -> String {
+    error!("DB: {}", error.0);
     format!("Db Error: {}", error.0)
 }
 
@@ -58,7 +59,7 @@ const SQL_INIT: &[&str] = &[
         updated INTEGER NOT NULL,
         PRIMARY KEY(url, user, device) ON CONFLICT REPLACE,
         FOREIGN KEY(user) REFERENCES users(name),
-        FOREIGN KEY(device) REFERENCES devices(id)
+        FOREIGN KEY(device, user) REFERENCES devices(id, user)
     );",
     "CREATE TABLE IF NOT EXISTS episodes (
         id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -74,7 +75,7 @@ const SQL_INIT: &[&str] = &[
         total INTEGER,
         updated INTEGER NOT NULL,
         FOREIGN KEY(user) REFERENCES users(name),
-        FOREIGN KEY(device) REFERENCES devices(id)
+        FOREIGN KEY(device, user) REFERENCES devices(id, user)
     );",
 ];