diff --git a/Cargo.lock b/Cargo.lock index c696f67..6372215 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1004,10 +1004,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" -[[package]] -name = "cli" -version = "0.1.0" - [[package]] name = "client" version = "0.1.0" @@ -1454,6 +1450,27 @@ dependencies = [ "ctutils", ] +[[package]] +name = "directories" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.61.2", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -2801,6 +2818,15 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" +[[package]] +name = "libredox" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" +dependencies = [ + "libc", +] + [[package]] name = "libsqlite3-sys" version = "0.30.1" @@ -3182,6 +3208,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ordered-float" version = "4.6.0" @@ -3733,6 +3765,17 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_users" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom 0.2.17", + "libredox", + "thiserror 2.0.18", +] + [[package]] name = "regex" version = "1.12.3" @@ -4944,6 +4987,20 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "task-line" +version = "0.1.0" +dependencies = [ + "clap", + "client", + "directories", + "serde", + "serde_json", + "tokio", + "types", + "uuid", +] + [[package]] name = "tempfile" version = "3.27.0" diff --git a/Cargo.toml b/Cargo.toml index 36a39ac..d166c23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ tokio-stream = { version = "0.1.18", features = ["sync"] } chrono = { version = "0.4.42", features = ["serde"] } serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.149" -uuid = { version = "1.23.1", features = ["v4"] } +uuid = { version = "1.23.1", features = ["serde", "v4"] } # --- Logging & Diagnostics --- color-eyre = "0.6.5" @@ -59,3 +59,5 @@ rpi-pal = { version = "0.22.3", features = ["embedded-hal"] } # --- Miscellaneous --- dotenvy = "0.15.7" bytes = "1.11.1" +directories = "6.0.0" +clap = { version = "4.6.1", features = ["derive"] } diff --git a/api/services/src/todos.rs b/api/services/src/todos.rs index 3a814ce..3c73998 100644 --- a/api/services/src/todos.rs +++ b/api/services/src/todos.rs @@ -8,9 +8,9 @@ use sea_orm::{ ConnectionTrait, EntityTrait, ExprTrait, IntoActiveModel, ModelTrait, Order, QueryFilter, QueryOrder, SelectExt, TransactionSession, TransactionTrait, Value, }; -use serde::Deserialize; use thiserror::Error; use tracing::warn; +use types::models::TodoPosition; use types::{CreateTodoData, Time as TimeModel, TimeRange, TimeRecurring, Todo as TodoModel}; use uuid::Uuid; @@ -37,13 +37,6 @@ pub enum TodoServiceError { NotFound, } -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -pub enum TodoPosition { - Top, - Bottom, -} - pub struct TodoService; impl TodoService { diff --git a/api/src/routes/todo.rs b/api/src/routes/todo.rs index e7d9fc0..1bd31c6 100644 --- a/api/src/routes/todo.rs +++ b/api/src/routes/todo.rs @@ -8,13 +8,16 @@ use http::StatusCode; use serde::Deserialize; use thiserror::Error; use tracing::warn; -use types::{CreateTodoData, Todo as TodoModel}; +use types::{ + CreateTodoData, Todo as TodoModel, + models::{AddTodoModel, TodoPosition}, +}; use uuid::Uuid; use crate::AppState; use services::{ User, - todos::{TodoPosition, TodoService, TodoServiceError}, + todos::{TodoService, TodoServiceError}, }; #[derive(Error, Debug, PartialEq)] @@ -74,14 +77,6 @@ async fn get_all_todos( Ok(Json(tags)) } -#[derive(Debug, Deserialize)] -struct AddTodoModel { - pub data: CreateTodoData, - pub position: Option, - #[serde(rename = "previousId")] - pub previous_id: Option, -} - async fn add_todo( state: State, user: User, diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 16d2db2..d28ddf6 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,18 @@ [package] -name = "cli" +name = "task-line" version = "0.1.0" edition = "2024" [dependencies] +client = { workspace = true } +types = { workspace = true } + +uuid = { workspace = true } + +tokio = { workspace = true } + +clap = { workspace = true } +directories = { workspace = true } + +serde = { workspace = true } +serde_json = { workspace = true } diff --git a/cli/src/main.rs b/cli/src/main.rs index e7a11a9..3a2e67f 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -1,3 +1,140 @@ -fn main() { - println!("Hello, world!"); +use std::fs; + +use clap::{Parser, Subcommand}; +use client::fetch::{add_todo, fetch_categories, fetch_tags}; +use directories::ProjectDirs; +use serde::{Deserialize, Serialize}; +use types::{CreateTodoData, models::AddTodoModel}; + +#[derive(Debug, Parser)] +#[command(name = "task-line")] +#[command(about = "The TaskLine CLI", long_about = None)] +struct Cli { + #[command(subcommand)] + command: Commands, +} + +#[derive(Debug, Subcommand)] +enum Commands { + Settings { + #[arg(short, long)] + url: Option, + #[arg(short = 'k', long)] + api_key: Option, + }, + New { + title: String, + note: Option, + #[arg(short, long)] + category: Option, + #[arg(short, long)] + tags: Vec, + }, +} + +#[tokio::main] +async fn main() { + let args = Cli::parse(); + + match args.command { + Commands::Settings { + url: None, + api_key: None, + } => { + let settings = Settings::read(); + + if let Some(settings) = settings { + println!("current settings\n{:?}", settings); + } else { + println!("no settings set"); + } + } + Commands::Settings { url, api_key } => { + let mut settings = Settings::read().unwrap_or_default(); + + if let Some(url) = url { + settings.url = Some(url); + } + + if let Some(api_key) = api_key { + settings.api_key = Some(api_key); + } + + settings.save(); + } + Commands::New { + title, + note, + category, + tags, + } => { + let settings = Settings::read().expect("no settings set"); + let url = settings.url.as_deref().expect("no url set"); + let token = settings.api_key.as_deref().expect("no api key set"); + + let server_tags = fetch_tags(url, token).await.unwrap(); + let server_categories = fetch_categories(url, token).await.unwrap(); + + let tags = server_tags + .iter() + .filter(|tag| tags.contains(&tag.name)) + .map(|tag| tag.uuid) + .collect::>(); + + let categories = server_categories + .iter() + .filter(|cat| category == Some(cat.name.clone())) + .map(|cat| cat.uuid) + .next(); + + add_todo( + url, + token, + &AddTodoModel { + data: CreateTodoData { + uuid: uuid::Uuid::new_v4(), + title, + note: note.unwrap_or_default(), + time: None, + tags: Some(tags), + category: categories, + }, + position: None, + previous_id: None, + }, + ) + .await + .unwrap(); + } + } +} + +#[derive(Debug, Default, Deserialize, Serialize)] +struct Settings { + url: Option, + api_key: Option, +} + +impl Settings { + fn read() -> Option { + let project_dirs = ProjectDirs::from("dev", "tobinio", "TaskLine") + .expect("failed to get project directories"); + + let settings_path = project_dirs.config_dir().join("settings.json"); + fs::read_to_string(&settings_path) + .ok() + .and_then(|content| serde_json::from_str(&content).ok()) + } + + fn save(&self) { + let project_dirs = ProjectDirs::from("dev", "tobinio", "TaskLine") + .expect("failed to get project directories"); + + let settings_path = project_dirs.config_dir().join("settings.json"); + + if let Some(parent) = settings_path.parent() { + fs::create_dir_all(parent).unwrap(); + } + fs::write(&settings_path, serde_json::to_string(self).unwrap()).unwrap(); + } } diff --git a/libs/client/src/fetch.rs b/libs/client/src/fetch.rs index 458f593..09cd031 100644 --- a/libs/client/src/fetch.rs +++ b/libs/client/src/fetch.rs @@ -4,7 +4,7 @@ use reqwest_sse::EventSource; use std::time::Duration; use tokio::sync::mpsc::{self, Receiver}; -use types::Todo; +use types::{Category, Tag, Todo, models::AddTodoModel}; pub fn get_todos(url: String, token: String) -> Receiver> { let (tx, rx) = mpsc::channel(8); @@ -69,3 +69,40 @@ async fn fetch_todos(url: &str, token: &str) -> eyre::Result> { Ok(serde_json::from_str(&response)?) } + +pub async fn add_todo(url: &str, token: &str, todo: &AddTodoModel) -> eyre::Result<()> { + reqwest::Client::new() + .post(format!("{}{}", url, "/api/todos")) + .header("x-api-key", token) + .json(todo) + .send() + .await? + .text() + .await?; + + Ok(()) +} + +pub async fn fetch_tags(url: &str, token: &str) -> eyre::Result> { + let response = reqwest::Client::new() + .get(format!("{}{}", url, "/api/tags")) + .header("x-api-key", token) + .send() + .await? + .text() + .await?; + + Ok(serde_json::from_str(&response)?) +} + +pub async fn fetch_categories(url: &str, token: &str) -> eyre::Result> { + let response = reqwest::Client::new() + .get(format!("{}{}", url, "/api/categories")) + .header("x-api-key", token) + .send() + .await? + .text() + .await?; + + Ok(serde_json::from_str(&response)?) +} diff --git a/libs/types/src/lib.rs b/libs/types/src/lib.rs index 107b41b..140c80d 100644 --- a/libs/types/src/lib.rs +++ b/libs/types/src/lib.rs @@ -4,6 +4,8 @@ use chrono::{DateTime, Datelike, Days, NaiveDate, Utc}; use serde::{Deserialize, Deserializer, Serialize}; use uuid::Uuid; +pub mod models; + #[derive(Debug, Serialize, Deserialize, PartialEq, Eq)] pub struct CreateTodoData { pub uuid: Uuid, diff --git a/libs/types/src/models.rs b/libs/types/src/models.rs new file mode 100644 index 0000000..5e102a1 --- /dev/null +++ b/libs/types/src/models.rs @@ -0,0 +1,19 @@ +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use crate::CreateTodoData; + +#[derive(Debug, Deserialize, Serialize)] +pub struct AddTodoModel { + pub data: CreateTodoData, + pub position: Option, + #[serde(rename = "previousId")] + pub previous_id: Option, +} + +#[derive(Debug, Deserialize, Serialize)] +#[serde(rename_all = "camelCase")] +pub enum TodoPosition { + Top, + Bottom, +}