From a102fecc2eaac2e37469f01d06af2ced34ac2cd6 Mon Sep 17 00:00:00 2001
From: jude <jude@jellywx.com>
Date: Sat, 20 Apr 2024 19:10:49 +0100
Subject: [PATCH] various

---
 .idea/workspace.xml                | 13 ++++++------
 Cargo.lock                         |  2 +-
 Cargo.toml                         |  8 ++++---
 etc/playlistd/Rocket.toml          |  3 +++
 etc/{ => playlistd}/playlistd.toml |  0
 src/daemon/create_playlists.rs     |  2 --
 src/main.rs                        | 19 +++++++++++++++--
 src/models.rs                      | 34 ++++++++++++++++++++++++++++++
 systemd/playlistd.service          |  2 +-
 9 files changed, 67 insertions(+), 16 deletions(-)
 create mode 100644 etc/playlistd/Rocket.toml
 rename etc/{ => playlistd}/playlistd.toml (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d8b77b5..d06b362 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -13,17 +13,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="52900e09-9584-4b6c-95ff-fbd4ed5d8b2c" name="Changes" comment="Add interface package. Start adding auth stuff for refreshing tokens.">
-      <change afterPath="$PROJECT_DIR$/src/daemon/create_playlists.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sqldialects.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sqldialects.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Cargo.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Cargo.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/Cargo.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/daemon/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/daemon/mod.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/daemon/update_playlists.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/daemon/update_playlists.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/listenbrainz.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/listenbrainz.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etc/playlistd.toml" beforeDir="false" afterPath="$PROJECT_DIR$/etc/playlistd/playlistd.toml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/daemon/create_playlists.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/daemon/create_playlists.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/models.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/models.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/subsonic.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/subsonic.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/systemd/playlistd.service" beforeDir="false" afterPath="$PROJECT_DIR$/systemd/playlistd.service" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -102,6 +99,7 @@
       <recent name="$PROJECT_DIR$/navidrome/src/client" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/etc/playlistd" />
       <recent name="$PROJECT_DIR$/src/daemon" />
       <recent name="$PROJECT_DIR$/navidrome/src/models" />
     </key>
@@ -166,7 +164,8 @@
       <workItem from="1713372315382" duration="4924000" />
       <workItem from="1713385358427" duration="2705000" />
       <workItem from="1713465993328" duration="1750000" />
-      <workItem from="1713469457285" duration="6504000" />
+      <workItem from="1713469457285" duration="6588000" />
+      <workItem from="1713609379678" duration="6626000" />
     </task>
     <task id="LOCAL-00001" summary="Structure">
       <created>1692008860369</created>
diff --git a/Cargo.lock b/Cargo.lock
index b2b3744..450ecba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1456,7 +1456,7 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "playlistd"
-version = "0.1.0"
+version = "0.2.2"
 dependencies = [
  "chrono",
  "config",
diff --git a/Cargo.toml b/Cargo.toml
index 35908ce..4ce8a18 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playlistd"
-version = "0.1.0"
+version = "0.2.2"
 edition = "2021"
 authors = ["Jude Southworth (judesouthworth@pm.me)"]
 license = "AGPL-3.0 only"
@@ -24,10 +24,12 @@ chrono = "0.4.38"
 depends = "$auto"
 assets = [
     ["target/release/playlistd", "usr/bin/playlistd", "755"],
-    ["etc/playlistd.toml", "etc/playlistd.toml", "600"],
+    ["etc/playlistd/playlistd.toml", "etc/playlistd/playlistd.toml", "600"],
+    ["etc/playlistd/Rocket.toml", "etc/playlistd/Rocket.toml", "600"],
 ]
 conf-files = [
-    "/etc/playlistd.toml",
+    "/etc/playlistd/playlistd.toml",
+    "/etc/playlistd/Rocket.toml",
 ]
 
 [package.metadata.deb.systemd-units]
diff --git a/etc/playlistd/Rocket.toml b/etc/playlistd/Rocket.toml
new file mode 100644
index 0000000..2d5c249
--- /dev/null
+++ b/etc/playlistd/Rocket.toml
@@ -0,0 +1,3 @@
+[default]
+# port = 0
+# address = "localhost"
diff --git a/etc/playlistd.toml b/etc/playlistd/playlistd.toml
similarity index 100%
rename from etc/playlistd.toml
rename to etc/playlistd/playlistd.toml
diff --git a/src/daemon/create_playlists.rs b/src/daemon/create_playlists.rs
index 45f270d..3542617 100644
--- a/src/daemon/create_playlists.rs
+++ b/src/daemon/create_playlists.rs
@@ -2,11 +2,9 @@ use crate::models::CreateTrackedPlaylist;
 use crate::subsonic::Subsonic;
 use crate::CONFIG;
 use chrono::Local;
-use log::error;
 use sqlx::postgres::PgPool;
 use std::str::FromStr;
 use std::time::Duration;
-use thiserror::Error;
 use tokio::time::{interval, MissedTickBehavior};
 use uuid::Uuid;
 
diff --git a/src/main.rs b/src/main.rs
index 3ef02dc..5a016eb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,9 @@ mod subsonic;
 mod track;
 
 use crate::daemon::{create_playlists_daemon, update_playlists_daemon};
-use crate::models::{PartialTrackedPlaylist, TrackedPlaylist};
+use crate::models::{
+    CreateTrackedPlaylist, PartialCreateTrackedPlaylist, PartialTrackedPlaylist, TrackedPlaylist,
+};
 use crate::subsonic::{Subsonic, SubsonicBuilder};
 use config::Config;
 use rocket::serde::json::{json, Json};
@@ -24,7 +26,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     CONFIG
         .set(
             Config::builder()
-                .add_source(config::File::with_name("/etc/playlistd").required(false))
+                .add_source(config::File::with_name("playlistd").required(false))
                 .add_source(config::Environment::default().separator("_"))
                 .build()
                 .unwrap(),
@@ -71,6 +73,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 create_tracking_playlist,
                 add_tracking_playlist,
                 all_playlists,
+                create_tracking_playlist_rule,
             ],
         )
         .launch()
@@ -114,6 +117,18 @@ pub struct CreatePlaylist {
     pub tracking_type: Option<String>,
 }
 
+/// Create a new playlist and attach a tracker
+#[post("/rule", data = "<create_playlist_rule>")]
+async fn create_tracking_playlist_rule(
+    pool: &State<PgPool>,
+    create_playlist_rule: Json<PartialCreateTrackedPlaylist>,
+) -> Json<Response<CreateTrackedPlaylist>> {
+    match create_playlist_rule.record(pool.inner()).await {
+        Ok(playlist) => Json(Response::Success(playlist)),
+        Err(e) => Json(Response::Error(e.into())),
+    }
+}
+
 /// Create a new playlist and attach a tracker
 #[post("/create", data = "<create_playlist>")]
 async fn create_tracking_playlist(
diff --git a/src/models.rs b/src/models.rs
index b6a581d..a85e82d 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -68,6 +68,40 @@ impl TrackedPlaylist {
     }
 }
 
+#[derive(Deserialize)]
+pub struct PartialCreateTrackedPlaylist {
+    pub name_template: String,
+    pub playlist_size: i32,
+    pub tracking_user: Option<String>,
+    pub tracking_type: Option<String>,
+}
+
+impl PartialCreateTrackedPlaylist {
+    pub async fn record(
+        &self,
+        pool: impl Executor<'_, Database = Postgres> + Copy,
+    ) -> Result<CreateTrackedPlaylist, Error> {
+        let uuid = Uuid::new_v4();
+
+        sqlx::query!(
+            r#"
+            INSERT INTO "create_tracked_playlist"
+            (id, name_template, playlist_size, tracking_user, tracking_type)
+            VALUES ($1, $2, $3, $4, $5)
+            "#,
+            uuid,
+            self.name_template,
+            self.playlist_size,
+            self.tracking_user,
+            self.tracking_type,
+        )
+        .execute(pool)
+        .await?;
+
+        CreateTrackedPlaylist::rule(pool, uuid).await
+    }
+}
+
 #[derive(Serialize)]
 pub struct CreateTrackedPlaylist {
     pub id: Uuid,
diff --git a/systemd/playlistd.service b/systemd/playlistd.service
index 4b66834..b259331 100644
--- a/systemd/playlistd.service
+++ b/systemd/playlistd.service
@@ -4,7 +4,7 @@ Description=Playlistd
 [Service]
 Type=simple
 ExecStart=/usr/bin/playlistd
-WorkingDirectory=/etc/
+WorkingDirectory=/etc/playlistd
 Restart=always
 RestartSec=20