add: shared structs, caching services, import task change

This commit is contained in:
wymiller committed 2026-11-09 00:04:22 -05:00
1 parent b64d5ba0ad
commit 5cb5dd8eb8
41 files changed
+875 -770

No files matched your search

+54 -14
View File
@@ -727,7 +727,7 @@ version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"cexpr",
"clang-sys",
"itertools",
@@ -744,6 +744,12 @@ dependencies = [
"which",
]
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.9.1"
@@ -1456,6 +1462,12 @@ dependencies = [
"slab",
]
[[package]]
name = "gemtext"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb76a04b598440b386caa0893dd7b8228a4b555692d2e4f04636a238b5c4b5b"
[[package]]
name = "generic-array"
version = "0.14.7"
@@ -1994,7 +2006,7 @@ version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"cfg-if",
"libc",
]
@@ -2195,6 +2207,16 @@ dependencies = [
"digest",
]
[[package]]
name = "md2gemtext"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ad2427c485f47550ea77fe0b17cb83d0ad26cee4311be1f42e7e676077e7ef0"
dependencies = [
"gemtext",
"pulldown-cmark",
]
[[package]]
name = "memchr"
version = "2.7.5"
@@ -2353,7 +2375,7 @@ version = "0.10.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"cfg-if",
"foreign-types",
"libc",
@@ -2576,6 +2598,17 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "pulldown-cmark"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8"
dependencies = [
"bitflags 1.3.2",
"memchr",
"unicase",
]
[[package]]
name = "quick-xml"
version = "0.31.0"
@@ -2776,7 +2809,7 @@ version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
dependencies = [
"bitflags",
"bitflags 2.9.1",
]
[[package]]
@@ -2955,7 +2988,7 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"errno",
"libc",
"linux-raw-sys 0.4.15",
@@ -2968,7 +3001,7 @@ version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"errno",
"libc",
"linux-raw-sys 0.9.4",
@@ -3124,7 +3157,7 @@ version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"core-foundation 0.9.4",
"core-foundation-sys",
"libc",
@@ -3137,7 +3170,7 @@ version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"core-foundation 0.10.1",
"core-foundation-sys",
"libc",
@@ -3446,7 +3479,7 @@ checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
dependencies = [
"atoi",
"base64 0.22.1",
"bitflags",
"bitflags 2.9.1",
"byteorder",
"bytes",
"chrono",
@@ -3489,7 +3522,7 @@ checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
dependencies = [
"atoi",
"base64 0.22.1",
"bitflags",
"bitflags 2.9.1",
"byteorder",
"chrono",
"crc",
@@ -3618,7 +3651,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"core-foundation 0.9.4",
"system-configuration-sys",
]
@@ -3635,7 +3668,7 @@ dependencies = [
[[package]]
name = "task"
version = "0.1.0"
version = "0.2.0"
dependencies = [
"cache",
"chrono",
@@ -3643,6 +3676,7 @@ dependencies = [
"futures",
"job_scheduler",
"markdown",
"md2gemtext",
"once_cell",
"reqwest",
"serde",
@@ -3879,7 +3913,7 @@ version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
dependencies = [
"bitflags",
"bitflags 2.9.1",
"bytes",
"futures-util",
"http 1.3.1",
@@ -4027,6 +4061,12 @@ dependencies = [
"syn",
]
[[package]]
name = "unicase"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f"
[[package]]
name = "unicode-bidi"
version = "0.3.18"
@@ -4640,7 +4680,7 @@ version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
"bitflags",
"bitflags 2.9.1",
]
[[package]]
+2 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "task"
version = "0.1.0"
version = "0.2.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -25,3 +25,4 @@ serde = { version = "*", features = ["derive"] }
serde_yml = "*"
tracing = "0.1"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
md2gemtext = "0.1.0"
+9 -8
View File
@@ -1,14 +1,15 @@
use std::fs;
use std::io::Read;
use crate::utils::task_log;
use chrono::{DateTime, FixedOffset, Utc};
use chrono::DateTime;
use serde::{Deserialize, Deserializer};
pub fn register(pool: &sqlx::Pool<sqlx::Postgres>) {
let p = pool.clone();
tokio::spawn(async move {
let _ = import_posts("/app/posts", &p).await;
if let Err(error) = import_posts("/app/posts", &p).await {
tracing::error!(%error, "Post import failed");
}
});
}
@@ -20,9 +21,6 @@ async fn import_posts(
// Start task logging
let task = task_log::start(1, pool).await?;
let options = MarkdownOptions {
options: markdown::Constructs::gfm(),
};
let entries = fs::read_dir(dir_path)?;
for entry_result in entries {
@@ -66,6 +64,7 @@ async fn import_posts(
let content =
markdown::to_html_with_options(&document.content, &markdown::Options::default());
let gemtext = md2gemtext::convert(&document.content).to_string();
let title = document.metadata.title;
let pub_date =
@@ -73,11 +72,12 @@ async fn import_posts(
let content_final = content.unwrap();
// Insert into database
let results = sqlx::query_as::<_, InsertPosts>(
"INSERT INTO posts (title, body, filename, publish_date, author_id) VALUES ($1, $2, $3, $4, $5) RETURNING title, body, filename, author_id"
let _ = sqlx::query_as::<_, InsertPosts>(
"INSERT INTO posts (title, body, body_gemtext, filename, publish_date, author_id) VALUES ($1, $2, $3, $4, $5, $6) RETURNING title, body, body_gemtext, filename, author_id"
)
.bind(title)
.bind(content_final)
.bind(gemtext)
.bind(file_name_str)
.bind(pub_date)
.bind(1) // Consider making author_id a parameter
@@ -111,6 +111,7 @@ struct FilenameExists {
struct InsertPosts {
title: String,
body: String,
body_gemtext: String,
filename: String,
author_id: i32,
}