mirror of
https://github.com/Lumither/nocturne.git
synced 2026-10-17 18:36:21 +00:00
Compare commits
47
Commits
20c2964242
...
refactor
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f27e0bddc | ||
|
|
45010f030c | ||
|
|
06a4ab8cf7 | ||
|
|
f491bc99a8 | ||
|
|
d15cdf216a | ||
|
|
2f6cafa543 | ||
|
|
dc2c294617 | ||
|
|
80a164625b | ||
|
|
2c11af4a25 | ||
|
|
e83cea1d42 | ||
|
|
71af26a09c | ||
|
|
15a88074e9 | ||
|
|
5bf6d24733 | ||
|
|
6a6af722c3 | ||
|
|
512197d87a | ||
|
|
3c16bf5100 | ||
|
|
ff4245a856 | ||
|
|
9270abc4b7 | ||
|
|
b11b19b0f5 | ||
|
|
7d988d380b | ||
|
|
8ba348a93e | ||
|
|
10f14312bd | ||
|
|
27d2c86106 | ||
|
|
12d9ddf8b6 | ||
|
|
ac8a2359b0 | ||
|
|
40abec2e90 | ||
|
|
1038351f4a | ||
|
|
b748764d79 | ||
|
|
ac5f30151f | ||
|
|
d54996b690 | ||
|
|
7b84a63a14 | ||
|
|
7cc44522fa | ||
|
|
2045d380c1 | ||
|
|
dc781bc2ef | ||
|
|
2e32297d5e | ||
|
|
5e8b1ff35d | ||
|
|
0c6325d5f2 | ||
|
|
ca86dd236e | ||
|
|
8358a8ae33 | ||
|
|
84ec754c65 | ||
|
|
bd90cd94d1 | ||
|
|
5da9ca3ae1 | ||
|
|
eef32ad695 | ||
|
|
acd0525513 | ||
|
|
8938c96409 | ||
|
|
6da6231c92 | ||
|
|
19f84d2188 |
No files matched your search
+8
-1
@@ -6,5 +6,12 @@
|
||||
.idea
|
||||
.vscode
|
||||
|
||||
# exclude post repo
|
||||
# macOS system files
|
||||
.DS_Store
|
||||
**/.DS_Store
|
||||
|
||||
# exclude content repo
|
||||
/blog_posts_git
|
||||
|
||||
# rustc ICE dump
|
||||
rustc-ice-*.txt
|
||||
@@ -3,14 +3,7 @@ ifeq ($(ARCH), arm64)
|
||||
ARCH := aarch64
|
||||
endif
|
||||
|
||||
all: release
|
||||
|
||||
release:
|
||||
docker compose -f prod.compose.yaml build --build-arg ARCH=$(ARCH)
|
||||
|
||||
dev:
|
||||
docker-compose -f dev.compose.yaml up --build
|
||||
|
||||
.PHONY: up
|
||||
clean:
|
||||
docker-compose -f prod.compose.yaml -f dev.compose.yaml rm -fsv
|
||||
echo "todo"
|
||||
|
||||
@@ -1,36 +1,10 @@
|
||||
# `Nocturne: personal website & CMS`
|
||||
# `Nocturne: Personal Website`
|
||||
|
||||
This is the code repo of my personal website, and [here](https://github.com/Lumither/blog-posts/) is the link of the
|
||||
content repo.
|
||||
This is the code repo of my [personal website](https://lumither.com),
|
||||
and [here](https://github.com/Lumither/blog-posts/) is the link to the
|
||||
content (blog posts etc.) repo.
|
||||
|
||||
Powered by Next.js and Rust, built with passion and love
|
||||
|
||||
<p align="center">
|
||||
<img src="https://avatars.githubusercontent.com/u/46409277?v=4" alt="GitHub Avatar"/>
|
||||
</p>
|
||||
|
||||
*will add more here in the future
|
||||
|
||||
## Nav:
|
||||
|
||||
<todo>
|
||||
|
||||
## Todos:
|
||||
|
||||
### Backend
|
||||
|
||||
- [ ] Add: log system
|
||||
- [ ] Add: search api
|
||||
- [ ] Add: tag filter (api)
|
||||
- [ ] Abandon: UUID mechanism
|
||||
- [ ] Fix: db connection issue
|
||||
|
||||
### Frontend
|
||||
|
||||
- [ ] Page: Home
|
||||
- [ ] Page: About
|
||||
- [ ] Page: Tags
|
||||
- [ ] Page: Archive
|
||||
- [ ] Page: Search
|
||||
- [ ] Add: Right sidebar
|
||||
|
||||
> [!NOTE]
|
||||
> This is an unstable branch, checkout `release` for the (guaranteed) working version
|
||||
+2
-3
@@ -1,8 +1,7 @@
|
||||
[workspace]
|
||||
resolver = "2"
|
||||
resolver = "3"
|
||||
members = [
|
||||
"api_server",
|
||||
"constants",
|
||||
"server",
|
||||
"macros",
|
||||
"markdown",
|
||||
]
|
||||
@@ -1,25 +0,0 @@
|
||||
[package]
|
||||
name = "api_server"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
macros = { path = "../macros" }
|
||||
constants = { path = "../constants" }
|
||||
markdown = { path = "../markdown" }
|
||||
chrono = { version = "0.4.38", features = ["serde", "alloc"] }
|
||||
tracing = "0.1.40"
|
||||
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] }
|
||||
tracing-appender = "0.2.3"
|
||||
dotenv = "0.15.0"
|
||||
dirs = "5.0.1"
|
||||
tokio = { version = "1.40.0", features = ["full"] }
|
||||
sqlx = { version = "0.8.2", features = ["runtime-tokio", "tls-native-tls", "postgres", "chrono", "uuid"] }
|
||||
axum = { version = "0.7.5", features = ["macros"] }
|
||||
serde = { version = "1.0.199", features = ["derive"] }
|
||||
serde_json = "1.0.128"
|
||||
uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] }
|
||||
futures = { version = "0.3.30", features = ["executor"] }
|
||||
cron = "0.13.0"
|
||||
git2 = "0.19.0"
|
||||
thiserror = "2.0.3"
|
||||
@@ -1,26 +0,0 @@
|
||||
use constants::blog::PAGE_SIZE;
|
||||
|
||||
use axum::extract::State;
|
||||
use axum::Json;
|
||||
use serde_json::{json, Value};
|
||||
use sqlx::{query, PgPool, Row};
|
||||
use tracing::error;
|
||||
|
||||
pub async fn get_page_count(
|
||||
State(db_connection): State<PgPool>,
|
||||
) -> Result<Json<Value>, Json<Value>> {
|
||||
match query("select cast(ceil(count(*) / $1) as integer) as res from post")
|
||||
.bind(PAGE_SIZE as f32)
|
||||
.fetch_one(&db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(res) => {
|
||||
let res: i32 = res.get("res");
|
||||
Ok(Json::from(json!({"res": res})))
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to get blog page count: {}", e.to_string());
|
||||
Err(Json::from(json!({"error": e.to_string()})))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,153 +0,0 @@
|
||||
use axum::{
|
||||
extract::{Path, State},
|
||||
http::StatusCode,
|
||||
Json,
|
||||
};
|
||||
use serde_json::{json, Value};
|
||||
use sqlx::{query, Error, PgPool, Row};
|
||||
use std::str::FromStr;
|
||||
use tracing::error;
|
||||
use uuid::Uuid;
|
||||
|
||||
pub async fn get_post(
|
||||
State(db_connection): State<PgPool>,
|
||||
Path(post_id): Path<String>,
|
||||
) -> Result<Json<Value>, (StatusCode, Json<Value>)> {
|
||||
let post_id = match Uuid::from_str(post_id.as_str()) {
|
||||
Ok(id) => id,
|
||||
Err(e) => {
|
||||
error!(
|
||||
"Failed to parse UUID <{}>: {}",
|
||||
post_id.as_str(),
|
||||
e.to_string()
|
||||
);
|
||||
return Err((
|
||||
StatusCode::BAD_REQUEST,
|
||||
Json::from(json!(("error", e.to_string()))),
|
||||
));
|
||||
}
|
||||
};
|
||||
|
||||
let post = match query(
|
||||
r#"
|
||||
SELECT jsonb_strip_nulls(to_jsonb(t.*)) - 'post_id' AS post
|
||||
FROM post t
|
||||
WHERE post_id = $1;
|
||||
"#,
|
||||
)
|
||||
.bind(post_id)
|
||||
.fetch_one(&db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(value) => value.get::<Value, _>("post"),
|
||||
Err(e) => {
|
||||
error!(
|
||||
"Database error on Reading `base post information` from table `post`: <{}>: {}",
|
||||
post_id.to_string(),
|
||||
e.to_string()
|
||||
);
|
||||
return match e {
|
||||
Error::RowNotFound => Err((
|
||||
StatusCode::BAD_REQUEST,
|
||||
Json::from(json!({"error": e.to_string()})),
|
||||
)),
|
||||
_ => Err((
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
Json::from(json!({"error": e.to_string()})),
|
||||
)),
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
let tags: Vec<_> = match query("SELECT tag FROM Tag WHERE post_id = $1;")
|
||||
.bind(post_id)
|
||||
.fetch_all(&db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(tags) => tags.iter().map(|tag| tag.get::<String, _>("tag")).collect(),
|
||||
Err(e) => {
|
||||
error!("Database query error :{}", e.to_string());
|
||||
return Err((
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
Json::from(json!({"error": e.to_string()})),
|
||||
));
|
||||
}
|
||||
};
|
||||
|
||||
let meta = match query(
|
||||
r#"
|
||||
SELECT jsonb_strip_nulls(to_jsonb(t.*)) - 'post_id' AS meta
|
||||
FROM meta t
|
||||
WHERE post_id = $1;
|
||||
"#,
|
||||
)
|
||||
.bind(post_id)
|
||||
.fetch_one(&db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(value) => value.get::<Value, _>("meta"),
|
||||
Err(e) => {
|
||||
error!(
|
||||
"Database error on Reading `{}` from table `{}`: <{}>: {}",
|
||||
"post meta data",
|
||||
"meta",
|
||||
post_id.to_string(),
|
||||
e.to_string()
|
||||
);
|
||||
return Err((
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
Json::from(json!({"error": e.to_string()})),
|
||||
));
|
||||
}
|
||||
};
|
||||
|
||||
let adjacent = match query(r"
|
||||
WITH target_post AS (SELECT t.date FROM meta t WHERE post_id = $1),
|
||||
prev AS (SELECT post_id, t.title, t.sub_title, t.header_img
|
||||
FROM meta t
|
||||
WHERE t.date < (SELECT date FROM target_post)
|
||||
ORDER BY t.date DESC
|
||||
LIMIT 1),
|
||||
next AS (SELECT post_id, t.title, t.sub_title, t.header_img
|
||||
FROM meta t
|
||||
WHERE t.date > (SELECT date FROM target_post)
|
||||
ORDER BY t.date
|
||||
LIMIT 1)
|
||||
SELECT json_strip_nulls(json_build_object(
|
||||
'prev',
|
||||
(SELECT json_build_object('id', post_id, 'title', title, 'sub_title', sub_title, 'header_img', header_img)
|
||||
FROM prev),
|
||||
'next',
|
||||
(SELECT json_build_object('id', post_id, 'title', title, 'sub_title', sub_title, 'header_img', header_img)
|
||||
FROM next)
|
||||
)) AS result;
|
||||
"
|
||||
)
|
||||
.bind(post_id)
|
||||
.fetch_one(&db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(res) => {res.get::<Value, _>("result")}
|
||||
Err(e) => {
|
||||
error!(
|
||||
"Database error on Reading `{}` from table `{}`: <{}>: {}",
|
||||
"adjoint posts data",
|
||||
"meta",
|
||||
post_id.to_string(),
|
||||
e.to_string()
|
||||
);
|
||||
return Err((
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
Json::from(json!({"error": e.to_string()})),
|
||||
));
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
let mut res = post.as_object().unwrap().to_owned();
|
||||
res.insert("tags".to_string(), tags.into());
|
||||
res.insert("meta".to_string(), meta);
|
||||
res.insert("adj".to_string(), adjacent);
|
||||
|
||||
Ok(Json::from(json!(res)))
|
||||
}
|
||||
@@ -1,130 +0,0 @@
|
||||
use std::error::Error;
|
||||
|
||||
use constants::blog::PAGE_SIZE;
|
||||
|
||||
use axum::{extract::Query, extract::State, http::StatusCode, Json};
|
||||
use chrono::{DateTime, Utc};
|
||||
use futures::future::join_all;
|
||||
use serde::Deserialize;
|
||||
use serde_json::{json, Map, Value};
|
||||
use sqlx::{postgres::PgRow, query, PgPool, Row};
|
||||
use tracing::error;
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct Params {
|
||||
page: Option<u32>,
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
pub async fn get_post_list(
|
||||
State(db_connection): State<PgPool>,
|
||||
Query(params): Query<Params>,
|
||||
) -> Result<Json<Value>, (StatusCode, Json<Value>)> {
|
||||
let search_param_page = params.page.unwrap_or(1);
|
||||
if search_param_page < 1 {
|
||||
return Err((
|
||||
StatusCode::BAD_REQUEST,
|
||||
Json::from(json!({"error": "`page` should be greater than 0"})),
|
||||
));
|
||||
}
|
||||
|
||||
let offset = PAGE_SIZE * (search_param_page - 1);
|
||||
|
||||
let post_list = sqlx::query("SELECT * FROM post ORDER BY first_update DESC LIMIT $1 OFFSET $2")
|
||||
.bind(PAGE_SIZE as i32)
|
||||
.bind(offset as i32)
|
||||
.fetch_all(&db_connection)
|
||||
.await;
|
||||
let post_list = match post_list {
|
||||
Ok(post_list) => post_list,
|
||||
Err(e) => {
|
||||
error!(
|
||||
"Database query error on fetching post list: {}",
|
||||
e.to_string()
|
||||
);
|
||||
return Err((
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
Json::from(json!({"error": e.to_string()})),
|
||||
));
|
||||
}
|
||||
};
|
||||
|
||||
let mut res = Vec::new();
|
||||
let posts: Vec<_> = post_list
|
||||
.into_iter()
|
||||
.map(|post| async { analyze_post(&db_connection, post).await })
|
||||
.collect();
|
||||
let posts = join_all(posts).await;
|
||||
for post in posts {
|
||||
match post {
|
||||
Ok(p) => res.push(p),
|
||||
Err(e) => {
|
||||
return Err((
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
Json::from(json!(("error", e.to_string()))),
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// res.insert("posts".to_string(), Value::from(posts));
|
||||
Ok(Json::from(Value::from(res)))
|
||||
}
|
||||
|
||||
async fn analyze_post(db_connection: &PgPool, post: PgRow) -> Result<Value, Box<dyn Error + Send>> {
|
||||
let post_id: Uuid = post.get("post_id");
|
||||
let tags = fetch_post_tags(db_connection, post_id).await;
|
||||
let meta = fetch_post_meta(db_connection, post_id).await.unwrap();
|
||||
let header_img = meta.get("header_img");
|
||||
let last_update = meta.get("last_update");
|
||||
|
||||
Ok(json!({
|
||||
"post_id": post_id.to_string(),
|
||||
"title": post.get::<String, _>("title"),
|
||||
"category": post.get::<String, _>("category"),
|
||||
"header_img": header_img,
|
||||
"sub_title": post.get::<String, _>("sub_title"),
|
||||
"summary": post.get::<String, _>("summary"),
|
||||
"last_update": last_update,
|
||||
"first_update": post.get::<DateTime<Utc>, _>("first_update"),
|
||||
"tags": tags,
|
||||
}))
|
||||
}
|
||||
|
||||
async fn fetch_post_meta(db_connection: &PgPool, post_id: Uuid) -> Option<Value> {
|
||||
match query(
|
||||
r#"
|
||||
SELECT jsonb_strip_nulls(to_jsonb(t.*)) - 'post_id' AS meta
|
||||
FROM meta t
|
||||
WHERE post_id = $1;
|
||||
"#,
|
||||
)
|
||||
.bind(post_id)
|
||||
.fetch_one(db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(value) => Some(value.get::<Value, _>("meta")),
|
||||
Err(e) => {
|
||||
error!(
|
||||
"Database error on Reading `{}` from table `{}`: <{}>: {}",
|
||||
"post meta data",
|
||||
"meta",
|
||||
post_id.to_string(),
|
||||
e.to_string()
|
||||
);
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn fetch_post_tags(db_connection: &PgPool, post_id: Uuid) -> Vec<String> {
|
||||
match query("SELECT tag FROM Tag WHERE post_id = $1")
|
||||
.bind(post_id)
|
||||
.fetch_all(db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(res) => res.iter().map(|tag| tag.get::<String, _>("tag")).collect(),
|
||||
Err(_) => vec![],
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
pub mod get_page_count;
|
||||
pub mod get_post;
|
||||
pub mod get_post_list;
|
||||
@@ -1,49 +0,0 @@
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum PostIdxError {
|
||||
#[error("missing essential field `{}` for file `{}`", field, filename)]
|
||||
MissingField { field: String, filename: String },
|
||||
|
||||
#[error(
|
||||
"invalid field `{}` for file `{}`, <{}>: {}",
|
||||
field_name,
|
||||
filename,
|
||||
err_field,
|
||||
msg
|
||||
)]
|
||||
InvalidField {
|
||||
field_name: String,
|
||||
err_field: String,
|
||||
filename: String,
|
||||
msg: String,
|
||||
},
|
||||
|
||||
#[error(
|
||||
"database error on writing `{}` to table `{}`: <{}>: {}",
|
||||
data_desc,
|
||||
db_table,
|
||||
id,
|
||||
msg
|
||||
)]
|
||||
DBWriteFailure {
|
||||
data_desc: String,
|
||||
db_table: String,
|
||||
id: String,
|
||||
msg: String,
|
||||
},
|
||||
|
||||
#[error(
|
||||
"Database error on Reading `{}` from table `{}`: <{}>: {}",
|
||||
data_desc,
|
||||
db_table,
|
||||
id,
|
||||
msg
|
||||
)]
|
||||
DBReadFailure {
|
||||
data_desc: String,
|
||||
db_table: String,
|
||||
id: String,
|
||||
msg: String,
|
||||
},
|
||||
}
|
||||
@@ -1,351 +0,0 @@
|
||||
use std::error::Error;
|
||||
use std::path::Path;
|
||||
|
||||
use crate::blog::cron::check_update::utils::get_md_file_basename;
|
||||
use crate::blog::cron::check_update::{error::PostIdxError, utils::parse_date};
|
||||
use markdown::MdFile;
|
||||
|
||||
use sqlx::{query, PgPool, Pool, Postgres, Row};
|
||||
use tokio::runtime::Runtime;
|
||||
use tracing::{info, warn};
|
||||
|
||||
async fn base(db_connection: &PgPool, post: &MdFile) -> Result<(), PostIdxError> {
|
||||
let post_id = post.file_id;
|
||||
let title = match post.meta.get("title") {
|
||||
None => {
|
||||
return Err(PostIdxError::MissingField {
|
||||
field: "title".to_string(),
|
||||
filename: post.filename.clone(),
|
||||
})
|
||||
}
|
||||
Some(title) => title.as_str().unwrap_or_else(|| {
|
||||
warn!("invalid title for `{}`", &post.filename);
|
||||
"invalid title"
|
||||
}),
|
||||
};
|
||||
let sub_title = post
|
||||
.meta
|
||||
.get("sub_title")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("");
|
||||
let summary = post
|
||||
.meta
|
||||
.get("summary")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("");
|
||||
let content = post.content.as_str();
|
||||
let category = match post.meta.get("category") {
|
||||
None => {
|
||||
return Err(PostIdxError::MissingField {
|
||||
field: "category".to_string(),
|
||||
filename: post.filename.clone(),
|
||||
})
|
||||
}
|
||||
Some(title) => title.as_str().unwrap_or_else(|| {
|
||||
warn!("invalid category for `{}`", &post.filename);
|
||||
"invalid category"
|
||||
}),
|
||||
};
|
||||
let last_update = {
|
||||
if let Some(last_update) = post.meta.get("last_update") {
|
||||
match parse_date(last_update.as_str().unwrap()) {
|
||||
Ok(date) => Some(date),
|
||||
Err(e) => {
|
||||
return Err(PostIdxError::InvalidField {
|
||||
field_name: "last_update".to_string(),
|
||||
err_field: last_update.to_string(),
|
||||
filename: post.filename.clone(),
|
||||
msg: e.to_string(),
|
||||
})
|
||||
}
|
||||
}
|
||||
} else {
|
||||
None
|
||||
}
|
||||
};
|
||||
let first_update = match post.meta.get("date") {
|
||||
None => {
|
||||
return Err(PostIdxError::MissingField {
|
||||
field: "date".to_string(),
|
||||
filename: post.filename.clone(),
|
||||
})
|
||||
}
|
||||
Some(first_update) => match parse_date(first_update.as_str().unwrap()) {
|
||||
Ok(date) => date,
|
||||
Err(e) => {
|
||||
return Err(PostIdxError::InvalidField {
|
||||
field_name: "date".to_string(),
|
||||
err_field: first_update.to_string(),
|
||||
filename: post.filename.clone(),
|
||||
msg: e.to_string(),
|
||||
})
|
||||
}
|
||||
},
|
||||
};
|
||||
let filename = get_md_file_basename(&post.filename);
|
||||
|
||||
if let Err(e) = query(
|
||||
r##"
|
||||
INSERT INTO Post (post_id, title, summary, content, last_update, first_update, sub_title, category, filename)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
|
||||
ON CONFLICT (post_id) DO
|
||||
UPDATE SET
|
||||
title = EXCLUDED.title,
|
||||
summary = EXCLUDED.summary,
|
||||
content = EXCLUDED.content,
|
||||
last_update = EXCLUDED.last_update,
|
||||
first_update = EXCLUDED.first_update,
|
||||
sub_title = EXCLUDED.sub_title,
|
||||
category = EXCLUDED.category,
|
||||
filename = EXCLUDED.filename;
|
||||
"##,
|
||||
)
|
||||
.bind(post_id)
|
||||
.bind(title)
|
||||
.bind(summary)
|
||||
.bind(content)
|
||||
.bind(last_update)
|
||||
.bind(first_update)
|
||||
.bind(sub_title)
|
||||
.bind(category)
|
||||
.bind(filename)
|
||||
.execute(db_connection)
|
||||
.await
|
||||
{
|
||||
return Err(
|
||||
PostIdxError::DBWriteFailure {
|
||||
data_desc: "post base information".to_string(),
|
||||
db_table: "Post".to_string(),
|
||||
id: post_id.to_string(),
|
||||
msg: e.to_string(),
|
||||
}
|
||||
);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn tag(db_connection: &PgPool, post: &MdFile) -> Result<(), PostIdxError> {
|
||||
if let Some(tags_string) = post.meta.get("tags").to_owned() {
|
||||
let tags = match tags_string.as_array().map(|vec| {
|
||||
vec.iter()
|
||||
.map(|val| val.as_str().unwrap())
|
||||
.collect::<Vec<_>>()
|
||||
}) {
|
||||
None => {
|
||||
return Err(PostIdxError::MissingField {
|
||||
field: "tags".to_string(),
|
||||
filename: post.filename.clone(),
|
||||
})
|
||||
}
|
||||
Some(val) => val,
|
||||
};
|
||||
|
||||
let post_id = post.file_id;
|
||||
|
||||
// remove old record
|
||||
if let Err(e) = query("DELETE FROM Tag WHERE post_id = $1")
|
||||
.bind(post_id)
|
||||
.execute(db_connection)
|
||||
.await
|
||||
{
|
||||
return Err(PostIdxError::DBWriteFailure {
|
||||
data_desc: "post tag information".to_string(),
|
||||
db_table: "Tag".to_string(),
|
||||
id: post_id.to_string(),
|
||||
msg: e.to_string(),
|
||||
});
|
||||
}
|
||||
|
||||
// add new record
|
||||
for tag in tags {
|
||||
match query("INSERT INTO Tag VALUES ($1, $2);")
|
||||
.bind(post_id)
|
||||
.bind(tag)
|
||||
.execute(db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
return Err(PostIdxError::DBWriteFailure {
|
||||
data_desc: "post tag information".to_string(),
|
||||
db_table: "Tag".to_string(),
|
||||
id: post_id.to_string(),
|
||||
msg: e.to_string(),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn hash(db_connection: &PgPool, post: &MdFile) -> Result<bool, PostIdxError> {
|
||||
let base64_form = post.hash.clone();
|
||||
match query("SELECT hash FROM Hash WHERE post_id = $1")
|
||||
.bind(post.file_id)
|
||||
.fetch_optional(db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(row) => {
|
||||
let db_record: String = match row {
|
||||
None => "".to_string(),
|
||||
Some(row) => row.try_get("hash").unwrap_or("".to_string()),
|
||||
};
|
||||
if base64_form == db_record {
|
||||
Ok(false)
|
||||
} else {
|
||||
if let Err(e) = query(
|
||||
r#"
|
||||
INSERT INTO Hash (post_id, hash) VALUES ($1, $2)
|
||||
ON CONFLICT (post_id) DO UPDATE SET hash = EXCLUDED.hash"#,
|
||||
)
|
||||
.bind(post.file_id)
|
||||
.bind(&base64_form)
|
||||
.execute(db_connection)
|
||||
.await
|
||||
{
|
||||
return Err(PostIdxError::DBWriteFailure {
|
||||
data_desc: "post hash".to_string(),
|
||||
db_table: "Hash".to_string(),
|
||||
id: post.file_id.to_string(),
|
||||
msg: e.to_string(),
|
||||
});
|
||||
}
|
||||
Ok(true)
|
||||
}
|
||||
}
|
||||
Err(e) => Err(PostIdxError::DBReadFailure {
|
||||
data_desc: "post hash".to_string(),
|
||||
db_table: "Hash".to_string(),
|
||||
id: post.file_id.to_string(),
|
||||
msg: e.to_string(),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
async fn meta(db_connection: &PgPool, post: &MdFile) -> Result<(), PostIdxError> {
|
||||
if let Err(e) = query(
|
||||
// todo: sanitization
|
||||
format!(
|
||||
r#"
|
||||
DO
|
||||
$$
|
||||
DECLARE
|
||||
_post_id UUID := '{}';
|
||||
_meta_cols JSONB := '{}';
|
||||
_exists BOOLEAN;
|
||||
_col_name TEXT;
|
||||
_col_value TEXT;
|
||||
_sql TEXT;
|
||||
_insert_columns TEXT := 'post_id';
|
||||
_insert_values TEXT := quote_literal(_post_id);
|
||||
_update_set TEXT := '';
|
||||
_blacklist TEXT[] := ARRAY['tags'];
|
||||
BEGIN
|
||||
SELECT EXISTS(SELECT 1 FROM meta WHERE post_id = _post_id) INTO _exists;
|
||||
|
||||
FOR _col_name, _col_value IN SELECT key, value FROM jsonb_each_text(_meta_cols)
|
||||
LOOP
|
||||
IF _col_name = ANY(_blacklist) THEN
|
||||
CONTINUE;
|
||||
END IF;
|
||||
|
||||
IF NOT EXISTS (SELECT 1
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'meta'
|
||||
AND column_name = _col_name
|
||||
-- may change in the future
|
||||
AND table_schema = 'public') THEN
|
||||
_sql := 'ALTER TABLE meta ADD COLUMN ' || quote_ident(_col_name) || ' TEXT';
|
||||
EXECUTE _sql;
|
||||
END IF;
|
||||
_insert_columns := _insert_columns || ', ' || quote_ident(_col_name);
|
||||
_insert_values := _insert_values || ', ' || quote_literal(_col_value);
|
||||
_update_set := _update_set || ', ' || quote_ident(_col_name) || ' = ' || quote_literal(_col_value);
|
||||
END LOOP;
|
||||
|
||||
_update_set := substring(_update_set FROM 3);
|
||||
|
||||
IF _exists THEN
|
||||
_sql := 'UPDATE meta SET ' || _update_set || ' WHERE post_id = ' || quote_literal(_post_id);
|
||||
EXECUTE _sql;
|
||||
ELSE
|
||||
_sql := 'INSERT INTO meta (' || _insert_columns || ') VALUES (' || _insert_values || ')';
|
||||
EXECUTE _sql;
|
||||
END IF;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
"#, post.file_id.to_string().as_str(), post.meta
|
||||
).as_str()
|
||||
)
|
||||
.execute(db_connection)
|
||||
.await {
|
||||
Err(PostIdxError::DBWriteFailure {
|
||||
data_desc: "post meta data".to_string(),
|
||||
db_table: "Meta".to_string(),
|
||||
id: post.file_id.to_string(),
|
||||
msg: e.to_string(),
|
||||
})
|
||||
} else {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn index_file(path: &Path, db_conn: &Pool<Postgres>) -> Result<(), Box<dyn Error>> {
|
||||
let md_file = MdFile::from_file(path)?;
|
||||
|
||||
async fn trail(db_conn: &Pool<Postgres>, md_file: &MdFile) -> Result<(), PostIdxError> {
|
||||
base(db_conn, md_file).await?;
|
||||
tag(db_conn, md_file).await?;
|
||||
meta(db_conn, md_file).await?;
|
||||
hash(db_conn, md_file).await.map(|_| ())
|
||||
}
|
||||
let mut cnt = 5;
|
||||
|
||||
while let Err(e) = trail(db_conn, &md_file).await {
|
||||
match e {
|
||||
PostIdxError::DBWriteFailure { .. } => {
|
||||
cnt -= 1;
|
||||
}
|
||||
PostIdxError::DBReadFailure { .. } => {
|
||||
cnt -= 1;
|
||||
}
|
||||
_ => return Err(e.into()),
|
||||
}
|
||||
if cnt <= 0 {
|
||||
return Err(e.into());
|
||||
}
|
||||
}
|
||||
|
||||
info!("indexed markdown file: {}", path.display());
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn drop_index(file_basename: &str, db_conn: &Pool<Postgres>) -> Result<(), Box<dyn Error>> {
|
||||
let rt = Runtime::new().unwrap();
|
||||
rt.block_on(async {
|
||||
if let Err(e) = query(
|
||||
r#"
|
||||
WITH deleted_post AS (
|
||||
DELETE FROM post
|
||||
WHERE id = (SELECT id FROM post WHERE filename = $1)
|
||||
RETURNING id
|
||||
)
|
||||
DELETE FROM tag WHERE post_id IN (SELECT id FROM deleted_post);
|
||||
DELETE FROM meta WHERE post_id IN (SELECT id FROM deleted_post);
|
||||
DELETE FROM hash WHERE post_id IN (SELECT id FROM deleted_post);
|
||||
"#,
|
||||
)
|
||||
.bind(file_basename)
|
||||
.execute(db_conn)
|
||||
.await
|
||||
{
|
||||
Err(Box::from(
|
||||
format!("failed to drop index: {}", e).to_string(),
|
||||
))
|
||||
} else {
|
||||
Ok(())
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -1,146 +0,0 @@
|
||||
use std::env;
|
||||
use std::fs::remove_dir_all;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use crate::{
|
||||
blog::cron::check_update::{
|
||||
index::drop_index,
|
||||
utils::{expand_path, get_md_file_basename, index_files, search_md},
|
||||
},
|
||||
utils::git,
|
||||
};
|
||||
use constants::config::general::{default_value, var_name};
|
||||
use macros::panic_with_log;
|
||||
|
||||
use git2::{Delta, Repository};
|
||||
use sqlx::{Pool, Postgres};
|
||||
use tracing::{error, info, warn, Level};
|
||||
|
||||
mod error;
|
||||
mod index;
|
||||
mod utils;
|
||||
|
||||
pub fn task(db_connection: &Pool<Postgres>) {
|
||||
// init
|
||||
let git_work_dir = {
|
||||
let path = if let Ok(default_log_path) = env::var(var_name::WORK_DIR) {
|
||||
expand_path(default_log_path)
|
||||
} else {
|
||||
let fallback_path = expand_path(default_value::WORK_DIR.to_string());
|
||||
warn!(
|
||||
"unset env var `{}`, using default path: {}/blog_git",
|
||||
var_name::WORK_DIR,
|
||||
fallback_path
|
||||
);
|
||||
fallback_path
|
||||
};
|
||||
Path::new(&path).join("blog_git")
|
||||
};
|
||||
|
||||
// clone & check update
|
||||
|
||||
let git_url = match env::var(var_name::BLOG_GIT_URL) {
|
||||
Ok(url) => url,
|
||||
Err(e) => {
|
||||
panic_with_log!(
|
||||
Level::ERROR,
|
||||
"failed to read `{}`: {}",
|
||||
var_name::BLOG_GIT_URL,
|
||||
e
|
||||
)
|
||||
}
|
||||
};
|
||||
let git_remote_name = env::var(var_name::BLOG_GIT_REMOTE_NAME)
|
||||
.unwrap_or(default_value::BLOG_GIT_REMOTE_NAME.to_string());
|
||||
let git_remote_branch = env::var(var_name::BLOG_GIT_REMOTE_BRANCH)
|
||||
.unwrap_or(default_value::BLOG_GIT_REMOTE_BRANCH.to_string());
|
||||
|
||||
match Repository::open(&git_work_dir) {
|
||||
Ok(repo) => {
|
||||
// prevent git remote url mismatch (clean cache)
|
||||
match repo.find_remote(&git_remote_name) {
|
||||
Ok(remote) => {
|
||||
if remote.url().is_some_and(|url| url != git_url) {
|
||||
remove_dir_all(&git_work_dir).unwrap();
|
||||
warn!("blog content git({}) url mismatch, reinitialized", &git_url);
|
||||
return;
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
remove_dir_all(&git_work_dir).unwrap();
|
||||
error!(
|
||||
"unexpected error on indexing blog content git({}), reinitialized: {}",
|
||||
&git_url, e
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
match git::sync(&git_remote_name, &git_remote_branch, &repo) {
|
||||
Ok(updates) => {
|
||||
if !updates.is_empty() {
|
||||
// incremental update
|
||||
info!(
|
||||
"blog content git({}) update detected: {:?}",
|
||||
&git_url, updates
|
||||
);
|
||||
|
||||
let mut update_md: Vec<PathBuf> = vec![];
|
||||
|
||||
for update in updates {
|
||||
if [Delta::Deleted, Delta::Untracked].contains(&update.status) {
|
||||
if let Some(path) = &update.old_path {
|
||||
if drop_index(
|
||||
&get_md_file_basename(
|
||||
path.file_name().unwrap().to_str().unwrap(),
|
||||
),
|
||||
db_connection,
|
||||
)
|
||||
.is_ok()
|
||||
{
|
||||
info!(
|
||||
"blog content git({}) file `{}` is detected as deleted/untracked, index dropped",
|
||||
&git_url,
|
||||
&path.display()
|
||||
);
|
||||
} else {
|
||||
error!(
|
||||
"blog content git({}) file `{}` is detected as deleted/untracked, failed to drop index",
|
||||
&git_url,
|
||||
&path.display()
|
||||
)
|
||||
}
|
||||
}
|
||||
} else if let Some(path) = &update.new_path {
|
||||
if path.components().any(|comp| comp.as_os_str() == "posts")
|
||||
&& path.extension().is_some_and(|ext| ext == "md")
|
||||
{
|
||||
update_md.push(path.to_path_buf());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
index_files(&update_md, db_connection);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
error!(
|
||||
"failed to sync blog content git({}) updates: {}",
|
||||
&git_url, e
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(_) => {
|
||||
match Repository::clone(&git_url, &git_work_dir) {
|
||||
Ok(_repo) => {
|
||||
// full repo index
|
||||
let files = search_md(git_work_dir.join("posts"));
|
||||
index_files(&files, db_connection);
|
||||
}
|
||||
Err(e) => {
|
||||
error!("failed to clone blog content git({}): {}", &git_url, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
use dirs::home_dir;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use crate::blog::cron::check_update::index::index_file;
|
||||
use chrono::{DateTime, FixedOffset, ParseResult};
|
||||
use constants::config::general::{default_value, var_name};
|
||||
use constants::time::DEFAULT_DATE_FORMAT;
|
||||
|
||||
use futures::executor::block_on;
|
||||
use futures::future::join_all;
|
||||
use sqlx::{Pool, Postgres};
|
||||
use tokio::runtime::Runtime;
|
||||
use tokio::spawn;
|
||||
use tracing::{error, warn};
|
||||
|
||||
pub fn search_md(entry: PathBuf) -> Vec<PathBuf> {
|
||||
if entry.ends_with(".git") {
|
||||
return vec![];
|
||||
}
|
||||
if entry.is_dir() {
|
||||
if let Ok(files) = entry.read_dir() {
|
||||
files
|
||||
.flat_map(|file| {
|
||||
let file_path = file.unwrap().path();
|
||||
search_md(file_path)
|
||||
})
|
||||
.collect()
|
||||
} else {
|
||||
vec![]
|
||||
}
|
||||
} else if entry.extension().is_some_and(|ext| ext == "md") {
|
||||
vec![entry]
|
||||
} else {
|
||||
vec![]
|
||||
}
|
||||
}
|
||||
|
||||
pub fn index_files(files: &[PathBuf], db_conn: &Pool<Postgres>) {
|
||||
let rt = Runtime::new().unwrap();
|
||||
rt.block_on(async {
|
||||
let files_clone = files.to_owned();
|
||||
let handlers = files_clone
|
||||
.into_iter()
|
||||
.map(|file: PathBuf| {
|
||||
let conn_clone = db_conn.clone();
|
||||
spawn(async move {
|
||||
if let Err(e) = index_file(&file, &conn_clone).await {
|
||||
error!("failed to index markdown file `{}`: {}", file.display(), e);
|
||||
}
|
||||
})
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
block_on(join_all(handlers));
|
||||
});
|
||||
}
|
||||
|
||||
pub fn expand_path(path: String) -> String {
|
||||
if path.starts_with('~') {
|
||||
home_dir()
|
||||
.map(|dir| {
|
||||
dir.join(path.strip_prefix("~/").unwrap())
|
||||
.into_os_string()
|
||||
.into_string()
|
||||
.unwrap()
|
||||
})
|
||||
.unwrap_or_else(|| {
|
||||
warn!(
|
||||
"failed to parse env var `{}`, using default value `{}`",
|
||||
var_name::WORK_DIR,
|
||||
default_value::WORK_DIR
|
||||
);
|
||||
default_value::WORK_DIR.to_string()
|
||||
})
|
||||
} else {
|
||||
path
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse_date(date_str: &str) -> ParseResult<DateTime<FixedOffset>> {
|
||||
DateTime::parse_from_str(format!("{}T120000", date_str).as_str(), DEFAULT_DATE_FORMAT)
|
||||
}
|
||||
|
||||
pub fn get_md_file_basename(f_name: &str) -> String {
|
||||
f_name.replace(".md", "")
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
use crate::scheduler::tasks::basic::BasicTask;
|
||||
use crate::scheduler::tasks::Task;
|
||||
use sqlx::{Pool, Postgres};
|
||||
|
||||
pub mod check_update;
|
||||
|
||||
pub fn get_tasks(db_connection: Pool<Postgres>) -> Vec<Box<dyn Task>> {
|
||||
let db_conn_clone = db_connection.clone();
|
||||
vec![
|
||||
BasicTask::new(move || check_update::task(&db_conn_clone), "0/15 * * * * *")
|
||||
.unwrap()
|
||||
.to_task(),
|
||||
]
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
mod api;
|
||||
pub mod cron;
|
||||
|
||||
use crate::blog::api::{
|
||||
get_page_count::get_page_count, get_post::get_post, get_post_list::get_post_list,
|
||||
};
|
||||
|
||||
use axum::routing::get;
|
||||
use axum::Router;
|
||||
use sqlx::{Pool, Postgres};
|
||||
|
||||
pub fn get_router() -> Router<Pool<Postgres>> {
|
||||
Router::new()
|
||||
.route("/get_post_list", get(get_post_list))
|
||||
.route("/get_page_count", get(get_page_count))
|
||||
.route("/get_post/:post_id", get(get_post))
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
use crate::blog;
|
||||
use crate::scheduler::Scheduler;
|
||||
use sqlx::{Pool, Postgres};
|
||||
|
||||
pub fn start(db_pool: Pool<Postgres>) {
|
||||
let scheduler = Scheduler::new();
|
||||
let _ = vec![blog::cron::get_tasks(db_pool.clone())]
|
||||
.into_iter()
|
||||
.map(|list| scheduler.insert_list(list))
|
||||
.collect::<Vec<_>>();
|
||||
scheduler.start().unwrap()
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
use sqlx::{query, Pool, Postgres};
|
||||
use tracing::info;
|
||||
|
||||
const POST_BASE_MODEL: &str = r##"
|
||||
CREATE TABLE IF NOT EXISTS Post
|
||||
(
|
||||
post_id UUID PRIMARY KEY,
|
||||
title VARCHAR(255) NOT NULL,
|
||||
category VARCHAR(255) NOT NULL,
|
||||
filename TEXT UNIQUE NOT NULL,
|
||||
summary TEXT,
|
||||
sub_title TEXT,
|
||||
content TEXT NOT NULL,
|
||||
last_update TIMESTAMPTZ,
|
||||
first_update TIMESTAMPTZ NOT NULL
|
||||
);
|
||||
"##;
|
||||
|
||||
// base model, will add more cols at runtime
|
||||
const POST_META_MODEL: &str = r##"
|
||||
CREATE TABLE IF NOT EXISTS Meta
|
||||
(
|
||||
post_id UUID PRIMARY KEY
|
||||
);
|
||||
"##;
|
||||
|
||||
const POST_HASH_MODEL: &str = r##"
|
||||
CREATE TABLE IF NOT EXISTS Hash
|
||||
(
|
||||
post_id UUID PRIMARY KEY,
|
||||
hash VARCHAR(44)
|
||||
);
|
||||
"##;
|
||||
|
||||
const TAG_MODEL: &str = r##"
|
||||
CREATE TABLE IF NOT EXISTS Tag
|
||||
(
|
||||
post_id UUID NOT NULL,
|
||||
tag VARCHAR(255) NOT NULL
|
||||
);
|
||||
"##;
|
||||
|
||||
pub async fn init(db_connection: &Pool<Postgres>) {
|
||||
query(POST_BASE_MODEL).execute(db_connection).await.unwrap();
|
||||
query(POST_META_MODEL).execute(db_connection).await.unwrap();
|
||||
query(TAG_MODEL).execute(db_connection).await.unwrap();
|
||||
query(POST_HASH_MODEL).execute(db_connection).await.unwrap();
|
||||
info!("database schema initialized");
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
use std::env;
|
||||
use std::error::Error;
|
||||
use std::num::ParseIntError;
|
||||
use std::process::exit;
|
||||
|
||||
use crate::blog;
|
||||
use axum::Router;
|
||||
use constants::config::server::{default_value, var_name};
|
||||
use macros::panic_with_log;
|
||||
use sqlx::{Pool, Postgres};
|
||||
use tracing::{error, info, warn, Level};
|
||||
|
||||
pub async fn start(db_pool: Pool<Postgres>) -> Result<(), Box<dyn Error>> {
|
||||
let app = Router::new()
|
||||
.nest("/blog", blog::get_router())
|
||||
.with_state(db_pool);
|
||||
|
||||
let port: u32 = match env::var(var_name::PORT) {
|
||||
Ok(value) => value.parse().unwrap_or_else(|e: ParseIntError| {
|
||||
warn!(
|
||||
"failed to parse `{}`, using default port: {}",
|
||||
var_name::PORT,
|
||||
e.to_string()
|
||||
);
|
||||
default_value::PORT
|
||||
}),
|
||||
Err(_) => default_value::PORT,
|
||||
};
|
||||
|
||||
let listener =
|
||||
match tokio::net::TcpListener::bind(format!("{}:{}", default_value::HOST, port)).await {
|
||||
Ok(listener) => {
|
||||
info!("server started on {}:{}", default_value::HOST, port);
|
||||
listener
|
||||
}
|
||||
Err(e) => {
|
||||
panic_with_log!(
|
||||
Level::ERROR,
|
||||
"failed to start server on {}:{}: {}",
|
||||
default_value::HOST,
|
||||
port,
|
||||
e.to_string()
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
axum::serve(listener, app).await.unwrap_or_else(|e| {
|
||||
error!("failed to start axum: {}", e.to_string());
|
||||
exit(1);
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
mod blog;
|
||||
mod init;
|
||||
mod scheduler;
|
||||
mod utils;
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
init::load_env();
|
||||
|
||||
let _guards = init::logger::init();
|
||||
|
||||
init::start().await;
|
||||
}
|
||||
@@ -1,194 +0,0 @@
|
||||
use crate::{
|
||||
scheduler::scheduler_error::SchedulerError,
|
||||
scheduler::scheduler_error::SchedulerError::IdAlreadyRunning,
|
||||
scheduler::scheduler_error::SchedulerError::IdNotFound, scheduler::sleeper::SkippableSleeper,
|
||||
scheduler::tasks::Task,
|
||||
};
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::RwLock;
|
||||
use std::{collections::HashMap, sync::Arc, thread};
|
||||
use tracing::log::error;
|
||||
use uuid::Uuid;
|
||||
|
||||
pub mod scheduler_error;
|
||||
mod sleeper;
|
||||
mod task_func;
|
||||
pub mod tasks;
|
||||
|
||||
struct TaskStatus {
|
||||
sleeper: Option<Arc<SkippableSleeper>>,
|
||||
is_alive: AtomicBool,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Scheduler {
|
||||
tasks: Arc<RwLock<HashMap<Uuid, Arc<Box<dyn Task>>>>>,
|
||||
running: Arc<RwLock<HashMap<Uuid, Arc<TaskStatus>>>>,
|
||||
}
|
||||
|
||||
impl Scheduler {
|
||||
/// Start all tasks in the scheduler
|
||||
pub fn start(&self) -> Result<(), SchedulerError> {
|
||||
for (k, _v) in self.tasks.read()?.iter() {
|
||||
self.run_non_blocking(k)?
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Terminate all tasks in the scheduler
|
||||
pub fn halt() {}
|
||||
|
||||
fn run_task(
|
||||
running: Arc<RwLock<HashMap<Uuid, Arc<TaskStatus>>>>,
|
||||
id: Uuid,
|
||||
task: Arc<Box<dyn Task>>,
|
||||
) -> Result<(), SchedulerError> {
|
||||
if running.read()?.get(&id).is_some() {
|
||||
return Err(IdAlreadyRunning);
|
||||
} else {
|
||||
running.write()?.insert(
|
||||
id,
|
||||
TaskStatus {
|
||||
sleeper: None,
|
||||
is_alive: AtomicBool::new(true),
|
||||
}
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
loop {
|
||||
if let Some(next_execution) = task.get_next_execution() {
|
||||
// guarantee is alive
|
||||
let task_status = {
|
||||
let running_reading_guard = running.read()?;
|
||||
running_reading_guard.get(&id).cloned().clone()
|
||||
};
|
||||
if let Some(task_status) = task_status {
|
||||
if !&task_status.is_alive.load(Ordering::SeqCst) {
|
||||
{
|
||||
let mut running_lock_guard = running.write()?;
|
||||
running_lock_guard.remove(&id);
|
||||
}
|
||||
return Ok(());
|
||||
} else {
|
||||
let sleeper = Arc::from(SkippableSleeper::from(next_execution));
|
||||
{
|
||||
let mut running_lock_guard = running.write()?;
|
||||
running_lock_guard.insert(
|
||||
id,
|
||||
TaskStatus {
|
||||
sleeper: Some(sleeper.clone()),
|
||||
is_alive: AtomicBool::new(true),
|
||||
}
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
sleeper.start();
|
||||
task.call();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
error!("unexpected error ");
|
||||
break;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Run a task with `id`
|
||||
pub fn run(&self, id: &Uuid) -> Result<(), SchedulerError> {
|
||||
let id = id.to_owned();
|
||||
if let Some(task) = self.tasks.read()?.get(&id) {
|
||||
Self::run_task(self.running.clone(), id, task.clone())
|
||||
} else {
|
||||
Err(IdNotFound)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn run_non_blocking(&self, id: &Uuid) -> Result<(), SchedulerError> {
|
||||
let id = id.to_owned();
|
||||
if let Some(task) = self.tasks.read()?.get(&id) {
|
||||
let running_clone = self.running.clone();
|
||||
let task_clone = task.clone();
|
||||
thread::spawn(move || Self::run_task(running_clone, id, task_clone));
|
||||
Ok(())
|
||||
} else {
|
||||
Err(IdNotFound)
|
||||
}
|
||||
}
|
||||
|
||||
fn get_running(&self, id: &Uuid) -> Option<Arc<TaskStatus>> {
|
||||
let ret = self.running.read().unwrap().get(id).cloned();
|
||||
ret
|
||||
}
|
||||
|
||||
/// Stop a task with `id`
|
||||
pub fn stop(&self, id: &Uuid) -> Result<(), SchedulerError> {
|
||||
match self.get_running(id) {
|
||||
None => Err(IdNotFound),
|
||||
Some(status) => {
|
||||
status.is_alive.store(false, Ordering::SeqCst);
|
||||
if let Some(s) = &status.sleeper {
|
||||
s.skip();
|
||||
} else {
|
||||
return Err(IdAlreadyRunning);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn now(&self, id: &Uuid) -> Result<(), SchedulerError> {
|
||||
match self.get_running(id) {
|
||||
None => Err(IdNotFound),
|
||||
Some(status) => {
|
||||
if let Some(s) = &status.sleeper {
|
||||
s.skip()
|
||||
} else {
|
||||
return Err(IdAlreadyRunning);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn insert(&self, task: Box<dyn Task>) -> Result<Uuid, SchedulerError> {
|
||||
let id = Uuid::new_v4();
|
||||
self.tasks.write()?.insert(id, Arc::new(task));
|
||||
Ok(id)
|
||||
}
|
||||
|
||||
pub fn insert_list(&self, tasks: Vec<Box<dyn Task>>) -> Result<Vec<Uuid>, SchedulerError> {
|
||||
tasks.into_iter().map(|t| self.insert(t)).collect()
|
||||
}
|
||||
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::scheduler::tasks::basic::BasicTask;
|
||||
use crate::scheduler::Scheduler;
|
||||
use std::error::Error;
|
||||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
#[test]
|
||||
fn test_run() -> Result<(), Box<dyn Error>> {
|
||||
let scheduler = Scheduler::default();
|
||||
let task = BasicTask::new(|| println!("test print"), "* * * * * *")?;
|
||||
let id = scheduler.insert(Box::new(task))?;
|
||||
for i in 1..=2 {
|
||||
println!("Loop {} start", i);
|
||||
println!("Run {}", i);
|
||||
scheduler.run_non_blocking(&id)?;
|
||||
thread::sleep(Duration::from_secs(4));
|
||||
scheduler.stop(&id)?;
|
||||
println!("Stop {}", i);
|
||||
thread::sleep(Duration::from_secs(2));
|
||||
println!("Loop {} finished", i);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
use chrono::{DateTime, Utc};
|
||||
use std::sync::{Arc, Condvar, Mutex};
|
||||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct SkippableSleeper {
|
||||
pub duration: Duration,
|
||||
state: Arc<(Mutex<bool>, Condvar)>,
|
||||
}
|
||||
|
||||
impl SkippableSleeper {
|
||||
pub fn new(duration: Duration) -> Self {
|
||||
SkippableSleeper {
|
||||
duration,
|
||||
state: Arc::new((Mutex::new(false), Condvar::new())),
|
||||
}
|
||||
}
|
||||
|
||||
// Blocks until the duration has passed or skip() is called
|
||||
pub fn start(&self) {
|
||||
let (lock, cvar) = &*self.state;
|
||||
let mut received = lock.lock().unwrap();
|
||||
let state_clone = Arc::clone(&self.state);
|
||||
let duration_clone = self.duration;
|
||||
thread::spawn(move || {
|
||||
thread::sleep(duration_clone);
|
||||
let (lock, cvar) = &*state_clone;
|
||||
let mut received = lock.lock().unwrap();
|
||||
*received = true;
|
||||
cvar.notify_one();
|
||||
});
|
||||
while !*received {
|
||||
received = cvar.wait(received).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
// Skip the blocking delay
|
||||
pub fn skip(&self) {
|
||||
let (lock, cvar) = &*self.state;
|
||||
let mut received = lock.lock().unwrap();
|
||||
*received = true;
|
||||
cvar.notify_one();
|
||||
}
|
||||
}
|
||||
|
||||
impl From<DateTime<Utc>> for SkippableSleeper {
|
||||
fn from(value: DateTime<Utc>) -> Self {
|
||||
let from_utc_timestamp = value.timestamp() as u64;
|
||||
let curr_utc_timestamp = Utc::now().timestamp() as u64;
|
||||
SkippableSleeper::new(Duration::from_secs(from_utc_timestamp - curr_utc_timestamp))
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use crate::scheduler::sleeper::SkippableSleeper;
|
||||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
#[test]
|
||||
fn usage() {
|
||||
let sleeper = SkippableSleeper::new(Duration::new(10, 0));
|
||||
thread::spawn({
|
||||
let sleeper = sleeper.clone();
|
||||
move || {
|
||||
println!("Sleeping...");
|
||||
sleeper.start();
|
||||
println!("Woke up!");
|
||||
}
|
||||
});
|
||||
println!("Start Sleeping...");
|
||||
thread::sleep(Duration::from_secs(4));
|
||||
println!("Skipping sleep...");
|
||||
sleeper.skip();
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
pub trait TaskFunc: Fn() + Send + Sync + 'static {}
|
||||
|
||||
impl<T> TaskFunc for T where T: Fn() + Send + Sync + Clone + 'static {}
|
||||
@@ -1,8 +0,0 @@
|
||||
use chrono::{DateTime, Utc};
|
||||
|
||||
pub mod basic;
|
||||
|
||||
pub trait Task: Send + Sync {
|
||||
fn get_next_execution(&self) -> Option<DateTime<Utc>>;
|
||||
fn call(&self);
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
pub mod git;
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "macros"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
tracing = "0.1.40"
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#[macro_export]
|
||||
macro_rules! dev_consume {
|
||||
($($var:ident),+) => {
|
||||
$(let _ = $var;)*
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
/// Includes a UTF-8 encoded file as a string
|
||||
///
|
||||
/// The file is located relative to `CARGO_MANIFEST_DIR`.
|
||||
///
|
||||
/// # Example
|
||||
/// ```rust
|
||||
/// use macros::include_str_from_crate_root;
|
||||
///
|
||||
/// let str: &str = include_str_from_crate_root!("/query/scheme.sql");
|
||||
///
|
||||
// todo: impl
|
||||
// const PATH_PREFIX: &str = "/src";
|
||||
// let str: &str = include_str_from_crate_root!("{}/query/scheme.sql", PATH_PREFIX);
|
||||
/// ```
|
||||
#[macro_export]
|
||||
macro_rules! include_str_from_crate_root {
|
||||
// ($path:literal $(, $($arg:tt)*)?) => {
|
||||
// ($path:expr, $($args:tt)*) => {
|
||||
// include_str!(concat!(env!("CARGO_MANIFEST_DIR"), format_args!($path, $($args)*)))
|
||||
// };
|
||||
($path:expr) => {
|
||||
include_str!(concat!(env!("CARGO_MANIFEST_DIR"), $path))
|
||||
};
|
||||
}
|
||||
@@ -1 +1,3 @@
|
||||
mod dev;
|
||||
mod include_str;
|
||||
mod log;
|
||||
@@ -6,7 +6,7 @@
|
||||
/// use macros::panic_with_log;
|
||||
/// use tracing::Level;
|
||||
///
|
||||
/// panic_with_log!(Level::ERROR, "Test panicked: {}", 42);
|
||||
/// panic_with_log!(Level::ERROR, "test panicked: {}", 42);
|
||||
/// ```
|
||||
#[macro_export]
|
||||
macro_rules! panic_with_log {
|
||||
@@ -18,6 +18,25 @@ macro_rules! panic_with_log {
|
||||
}};
|
||||
}
|
||||
|
||||
/// log the message with `Level::ERROR` and exit(1)
|
||||
///
|
||||
/// # Example
|
||||
/// ```rust
|
||||
///
|
||||
/// use macros::error_panic;
|
||||
///
|
||||
/// error_panic!("test panicked: {}", 42);
|
||||
/// ```
|
||||
#[macro_export]
|
||||
macro_rules! error_panic {
|
||||
($msg:literal $(, $($arg:tt)*)?) => {{
|
||||
use std::process;
|
||||
use tracing::{event, Level};
|
||||
event!(Level::ERROR, $msg $(, $($arg)*)?);
|
||||
process::exit(1);
|
||||
}};
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
@@ -25,7 +44,7 @@ mod tests {
|
||||
use std::io;
|
||||
use tracing::Level;
|
||||
use tracing_subscriber::prelude::*;
|
||||
use tracing_subscriber::{fmt, Registry};
|
||||
use tracing_subscriber::{Registry, fmt};
|
||||
|
||||
let format = tracing_subscriber::fmt::format()
|
||||
.with_level(true)
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
[package]
|
||||
name = "markdown"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] }
|
||||
serde = { version = "1.0.209", features = ["derive"] }
|
||||
serde_json = "1.0.128"
|
||||
regex = "1.10.4"
|
||||
yaml-rust2 = "0.9.0"
|
||||
yaml-rust2 = "0.10.0"
|
||||
sha2 = "0.10.8"
|
||||
base64 = "0.22.1"
|
||||
thiserror = "2.0.3"
|
||||
@@ -2,12 +2,6 @@ use thiserror::Error;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum Error {
|
||||
#[error("missing front-matter field: id")]
|
||||
MissingID,
|
||||
|
||||
#[error("invalid file id: {}", msg)]
|
||||
InvalidID { msg: String },
|
||||
|
||||
#[error("invalid front-matter: {}", msg)]
|
||||
InvalidFrontMatter { msg: String },
|
||||
|
||||
|
||||
+19
-30
@@ -1,23 +1,20 @@
|
||||
mod error;
|
||||
pub mod error;
|
||||
mod utils;
|
||||
|
||||
use std::fs;
|
||||
use std::path::Path;
|
||||
use std::str::FromStr;
|
||||
use std::{fs, path::Path, str::FromStr};
|
||||
|
||||
use crate::error::Error;
|
||||
use crate::utils::front_matter::{parse_front_matter, split_md_front_matter};
|
||||
use crate::{
|
||||
error::Error,
|
||||
utils::front_matter::{parse_front_matter, split_md_front_matter},
|
||||
};
|
||||
|
||||
use base64::{engine::general_purpose, Engine};
|
||||
use base64::{Engine, engine::general_purpose};
|
||||
use serde::Serialize;
|
||||
use serde_json::Value;
|
||||
use sha2::{Digest, Sha256};
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Default, Debug, Serialize)]
|
||||
#[derive(Default, Debug, Serialize, Clone)]
|
||||
pub struct MdFile {
|
||||
pub file_id: Uuid,
|
||||
pub filename: String,
|
||||
pub meta: Value,
|
||||
pub content: String,
|
||||
pub hash: String,
|
||||
@@ -29,30 +26,22 @@ impl MdFile {
|
||||
Ok(file) => file,
|
||||
Err(e) => return Err(Error::FSError { msg: e.to_string() }),
|
||||
};
|
||||
let raw_file_bytes = raw_file.as_bytes().to_vec();
|
||||
let (front_matter_str, content) = split_md_front_matter(raw_file);
|
||||
Self::from_str(&raw_file)
|
||||
}
|
||||
}
|
||||
|
||||
impl FromStr for MdFile {
|
||||
type Err = Error;
|
||||
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
let bytes = s.as_bytes().to_vec();
|
||||
let (front_matter_str, content) = split_md_front_matter(s);
|
||||
let front_matter = match parse_front_matter(&front_matter_str) {
|
||||
Ok(front_matter) => front_matter,
|
||||
Err(e) => return Err(Error::InvalidFrontMatter { msg: e.to_string() }),
|
||||
};
|
||||
let hash = calculate_hash_base64(&raw_file_bytes);
|
||||
let file_id = match front_matter["id"].as_str() {
|
||||
Some(id) => match Uuid::from_str(id) {
|
||||
Ok(id) => id,
|
||||
Err(e) => return Err(Error::InvalidID { msg: e.to_string() }),
|
||||
},
|
||||
None => return Err(Error::MissingID),
|
||||
};
|
||||
let file_name = Path::new(file_path)
|
||||
.file_name()
|
||||
.unwrap()
|
||||
.to_str()
|
||||
.unwrap()
|
||||
.to_string();
|
||||
|
||||
let hash = calculate_hash_base64(&bytes);
|
||||
Ok(MdFile {
|
||||
file_id,
|
||||
filename: file_name,
|
||||
meta: front_matter,
|
||||
content,
|
||||
hash,
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
use std::error::Error;
|
||||
|
||||
use crate::utils::yaml::yaml_to_serde;
|
||||
|
||||
use regex::Regex;
|
||||
use serde_json::Value;
|
||||
use std::error::Error;
|
||||
use yaml_rust2::YamlLoader;
|
||||
|
||||
pub fn split_md_front_matter(raw_file: String) -> (String, String) {
|
||||
pub fn split_md_front_matter(raw_file: &str) -> (String, String) {
|
||||
let re = Regex::new(r"(?s)^(---\n.*?\n---\n)(.*)").unwrap();
|
||||
if let Some(captures) = re.captures(raw_file.as_str()) {
|
||||
if let Some(captures) = re.captures(raw_file) {
|
||||
let front_matter = captures.get(1).map_or("", |m| m.as_str()).to_string();
|
||||
let main_content = captures.get(2).map_or("", |m| m.as_str()).to_string();
|
||||
(front_matter, main_content)
|
||||
} else {
|
||||
(String::new(), raw_file)
|
||||
(String::new(), raw_file.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,8 +45,7 @@ tags: [ "test1", "test2" ]
|
||||
|
||||
test body
|
||||
|
||||
"##
|
||||
.to_string(),
|
||||
"##,
|
||||
);
|
||||
assert_eq!(
|
||||
front_matter,
|
||||
@@ -64,7 +65,7 @@ tags: [ "test1", "test2" ]
|
||||
|
||||
#[test]
|
||||
fn test_front_matter_parser() {
|
||||
dbg!(parse_front_matter(
|
||||
parse_front_matter(
|
||||
r##"---
|
||||
title: test_title
|
||||
date: 0000-00-00+0000
|
||||
@@ -75,7 +76,7 @@ summary: summary
|
||||
tags: [ "test1", "test2" ]
|
||||
---
|
||||
"##,
|
||||
))
|
||||
)
|
||||
.expect("Failed to parse front matter");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
[package]
|
||||
name = "server"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
macros = { path = "../macros" }
|
||||
markdown = { path = "../markdown" }
|
||||
|
||||
axum = { version = "0.8.1", features = ["macros"] }
|
||||
tracing = { version = "0.1.41", features = ["log"] }
|
||||
git2 = "0.20.0"
|
||||
chrono = { version = "0.4.39", features = ["serde"] }
|
||||
cron = "0.15.0"
|
||||
sqlx = { version = "0.8.3", features = ["runtime-tokio", "tls-native-tls", "postgres", "chrono", "uuid"] }
|
||||
serde_json = "1.0.133"
|
||||
serde = { version = "1.0.215", features = ["derive"] }
|
||||
tracing-subscriber = "0.3.18"
|
||||
tracing-appender = "0.2.3"
|
||||
dirs = "6.0.0"
|
||||
thiserror = "2.0.11"
|
||||
tokio = { version = "1.42.0", features = ["rt", "rt-multi-thread", "macros", "sync"] }
|
||||
regex = "1.11.1"
|
||||
dotenv = "0.15.0"
|
||||
uuid = { version = "1.13.2", features = ["v4"] }
|
||||
futures = "0.3.31"
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile = "3.19.1"
|
||||
|
||||
[build-dependencies]
|
||||
git2 = "0.20.0"
|
||||
chrono = "0.4.39"
|
||||
@@ -0,0 +1,16 @@
|
||||
use chrono::Utc;
|
||||
use git2::Repository;
|
||||
|
||||
fn main() {
|
||||
let repo = Repository::open("../..").expect("failed to open repository");
|
||||
let commit = repo
|
||||
.head()
|
||||
.expect("failed to get HEAD")
|
||||
.peel_to_commit()
|
||||
.expect("failed to get HEAD commit");
|
||||
let hash = commit.id().to_string();
|
||||
let utc_timestamp = Utc::now().date_naive().format("%Y%m%d").to_string();
|
||||
let pkg_version = env!("CARGO_PKG_VERSION");
|
||||
let build_id = format!("{}:{}@{}", pkg_version, &hash[..8], utc_timestamp);
|
||||
println!("cargo:rustc-env=BUILD_ID={}", build_id);
|
||||
}
|
||||
File renamed without changes.
@@ -1,3 +1,5 @@
|
||||
// todo: rebuild with static OnceCell
|
||||
|
||||
// Database related
|
||||
pub mod database {
|
||||
pub mod var_name {
|
||||
File renamed without changes.
@@ -1,2 +1,3 @@
|
||||
pub const DEFAULT_TIME_FORMAT: &str = "%Y-%m-%dT%H:%M:%S%z";
|
||||
pub const DEFAULT_DATE_FORMAT: &str = "%Y-%m-%d%zT%H%M%S";
|
||||
|
||||
pub const DEFAULT_NAIVE_DATE_FORMAT: &str = "%Y-%m-%d";
|
||||
@@ -2,7 +2,8 @@ use std::env;
|
||||
use std::error::Error;
|
||||
use std::str::FromStr;
|
||||
|
||||
use constants::config::database::{default_value, var_name};
|
||||
use crate::constants::config::database::{default_value, var_name};
|
||||
|
||||
use sqlx::postgres::{PgConnectOptions, PgPoolOptions};
|
||||
use sqlx::{ConnectOptions, Pool, Postgres};
|
||||
use tracing::info;
|
||||
@@ -12,7 +13,7 @@ pub async fn init() -> Result<Pool<Postgres>, Box<dyn Error>> {
|
||||
.unwrap()
|
||||
.disable_statement_logging();
|
||||
Ok(PgPoolOptions::new()
|
||||
.max_connections(1) // todo: temporal solution, to be fixed
|
||||
.max_connections(1) // todo: temporary solution, to be fixed
|
||||
.connect_with(db_connect_option)
|
||||
.await?)
|
||||
}
|
||||
@@ -1,14 +1,15 @@
|
||||
use std::path::Path;
|
||||
use std::{env, io};
|
||||
|
||||
use crate::constants::config::general::{default_value, var_name};
|
||||
|
||||
use chrono::Local;
|
||||
use constants::config::general::{default_value, var_name};
|
||||
use dirs::home_dir;
|
||||
use tracing::info;
|
||||
use tracing_appender::{non_blocking, non_blocking::WorkerGuard, rolling};
|
||||
use tracing_subscriber::{
|
||||
filter::LevelFilter, fmt, fmt::format::Writer, fmt::time::FormatTime, fmt::MakeWriter,
|
||||
layer::SubscriberExt, Layer, Registry,
|
||||
Layer, Registry, filter::LevelFilter, fmt, fmt::MakeWriter, fmt::format::Writer,
|
||||
fmt::time::FormatTime, layer::SubscriberExt,
|
||||
};
|
||||
|
||||
struct LocalTimer;
|
||||
@@ -18,7 +19,7 @@ impl FormatTime for LocalTimer {
|
||||
write!(
|
||||
w,
|
||||
"{}",
|
||||
Local::now().format(constants::time::DEFAULT_TIME_FORMAT)
|
||||
Local::now().format(crate::constants::time::DEFAULT_TIME_FORMAT)
|
||||
)
|
||||
}
|
||||
}
|
||||
File renamed without changes.
@@ -1,13 +1,13 @@
|
||||
mod cron;
|
||||
mod database;
|
||||
pub mod logger;
|
||||
mod misc;
|
||||
mod schema;
|
||||
pub mod server;
|
||||
|
||||
use macros::panic_with_log;
|
||||
use std::{env, panic};
|
||||
use tracing::{info, Level};
|
||||
|
||||
use crate::modules::{ModuleTree, blog::Blog};
|
||||
use macros::error_panic;
|
||||
|
||||
use tracing::info;
|
||||
|
||||
pub fn load_env() {
|
||||
if let Some(env_file) = env::args().nth(1) {
|
||||
@@ -34,25 +34,17 @@ pub async fn start() {
|
||||
pool
|
||||
}
|
||||
Err(e) => {
|
||||
panic_with_log!(
|
||||
Level::ERROR,
|
||||
"database connection pool failed to initialize: {}",
|
||||
e
|
||||
);
|
||||
error_panic!("database connection pool failed to initialize: {}", e);
|
||||
}
|
||||
};
|
||||
|
||||
// schema init
|
||||
schema::init(&db_pool).await;
|
||||
// // schema init
|
||||
// schema::init(&db_pool).await;
|
||||
|
||||
// load cron task
|
||||
cron::start(db_pool.clone());
|
||||
|
||||
// api serve
|
||||
match server::start(db_pool).await {
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
panic_with_log!(Level::ERROR, "server panicked: {}", e)
|
||||
}
|
||||
}
|
||||
ModuleTree::new()
|
||||
.add_module(Blog {
|
||||
db_handler: db_pool,
|
||||
})
|
||||
.blocking_serve()
|
||||
.await
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
#[allow(dead_code)]
|
||||
mod constants;
|
||||
|
||||
mod scheduler;
|
||||
|
||||
mod init;
|
||||
mod modules;
|
||||
mod utils;
|
||||
|
||||
use crate::init::{logger, start};
|
||||
|
||||
const BUILD_ID: &str = env!("BUILD_ID");
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
println!("{}", BUILD_ID);
|
||||
|
||||
init::load_env();
|
||||
let _guards = logger::init();
|
||||
|
||||
start().await;
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
// todo: remove exception tag
|
||||
#[allow(dead_code)]
|
||||
pub mod posts;
|
||||
@@ -0,0 +1,110 @@
|
||||
use crate::{
|
||||
constants::blog::PAGE_SIZE,
|
||||
err_resp_log,
|
||||
utils::axum_response::{err_resp, succ_resp},
|
||||
};
|
||||
|
||||
use axum::{
|
||||
extract::{Query, State},
|
||||
http::StatusCode,
|
||||
response::IntoResponse,
|
||||
};
|
||||
use chrono::NaiveDate;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::json;
|
||||
use sqlx::{FromRow, PgPool, query_as};
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(FromRow, Serialize)]
|
||||
struct PostBriefModel {
|
||||
id: Uuid,
|
||||
identifier: String,
|
||||
title: String,
|
||||
subtitle: String,
|
||||
tags: Vec<String>,
|
||||
category: String,
|
||||
date_created: NaiveDate,
|
||||
date_updated: Option<NaiveDate>,
|
||||
header_img: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Serialize)]
|
||||
pub struct Pagination {
|
||||
page: Option<u32>,
|
||||
page_size: Option<u32>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct RespPagination {
|
||||
page: u32,
|
||||
page_size: u32,
|
||||
page_count: u32,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct Response {
|
||||
posts: Vec<PostBriefModel>,
|
||||
pagination: RespPagination,
|
||||
}
|
||||
|
||||
#[derive(FromRow)]
|
||||
struct UuidRow {
|
||||
id: Uuid,
|
||||
}
|
||||
|
||||
const GET_POST_WITH_BRIEF_MODEL: &str = include_str!("get_post_with_brief_model.sql");
|
||||
|
||||
pub async fn handler(
|
||||
State(db): State<PgPool>,
|
||||
Query(pagination): Query<Pagination>,
|
||||
) -> impl IntoResponse {
|
||||
let page = pagination.page.unwrap_or(1);
|
||||
let page_size = pagination.page_size.unwrap_or(PAGE_SIZE);
|
||||
let page_count = match sqlx::query_scalar::<_, i64>("SELECT COUNT(*) FROM posts")
|
||||
.fetch_one(&db)
|
||||
.await
|
||||
{
|
||||
Ok(post_count) => ((post_count as f64) / (page_size as f64)).ceil() as u32,
|
||||
Err(e) => return err_resp_log!(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
|
||||
};
|
||||
|
||||
let pagination = RespPagination {
|
||||
page,
|
||||
page_size,
|
||||
page_count,
|
||||
};
|
||||
|
||||
if page > page_count {
|
||||
return err_resp(
|
||||
StatusCode::BAD_REQUEST,
|
||||
"page number should not be greater than page count",
|
||||
Some(json!({"pagination": pagination})),
|
||||
);
|
||||
}
|
||||
|
||||
let offset = page_size * (page - 1);
|
||||
|
||||
let ids = match query_as::<_, UuidRow>(
|
||||
"SELECT id FROM posts ORDER BY date_created DESC LIMIT $1 OFFSET $2",
|
||||
)
|
||||
.bind(page_size as i32)
|
||||
.bind(offset as i32)
|
||||
.fetch_all(&db)
|
||||
.await
|
||||
{
|
||||
Ok(res) => res.into_iter().map(|item| item.id).collect::<Vec<_>>(),
|
||||
Err(e) => return err_resp_log!(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
|
||||
};
|
||||
|
||||
let posts = match query_as::<_, PostBriefModel>(GET_POST_WITH_BRIEF_MODEL)
|
||||
.bind(&ids)
|
||||
.fetch_all(&db)
|
||||
.await
|
||||
{
|
||||
Ok(posts) => posts,
|
||||
Err(e) => return err_resp_log!(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
|
||||
};
|
||||
|
||||
let resp = Response { posts, pagination };
|
||||
succ_resp(StatusCode::OK, serde_json::to_value(resp).unwrap())
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
use crate::{err_resp_log, utils::axum_response::succ_resp};
|
||||
|
||||
use axum::{
|
||||
extract::{Path, State},
|
||||
http::StatusCode,
|
||||
response::IntoResponse,
|
||||
};
|
||||
use chrono::NaiveDate;
|
||||
use futures::future::OptionFuture;
|
||||
use serde_json::Value;
|
||||
use sqlx::{FromRow, PgPool, query_as};
|
||||
use uuid::Uuid;
|
||||
|
||||
const SELECT_POST_BY_UUID: &str = include_str!("get_post_by_uuid.sql");
|
||||
const SELECT_POST_BY_STR_ID: &str = include_str!("get_post_by_str_id.sql");
|
||||
const SELECT_POST_ADJACENT_IDS: &str = include_str!("get_post_adjacent_ids.sql");
|
||||
const SELECT_POST_WITH_ADJACENT_MODEL: &str = include_str!("get_post_with_adjacent_model.sql");
|
||||
|
||||
#[derive(serde::Serialize, FromRow)]
|
||||
struct SelectedPost {
|
||||
id: Uuid,
|
||||
identifier: String,
|
||||
title: String,
|
||||
subtitle: String,
|
||||
status: String,
|
||||
date_created: NaiveDate,
|
||||
date_updated: Option<NaiveDate>,
|
||||
category: String,
|
||||
tags: Vec<String>,
|
||||
content: String,
|
||||
metadata: Option<Value>,
|
||||
}
|
||||
|
||||
#[derive(serde::Serialize, FromRow)]
|
||||
struct AdjacentPost {
|
||||
id: Uuid,
|
||||
identifier: String,
|
||||
title: String,
|
||||
subtitle: String,
|
||||
date_created: NaiveDate,
|
||||
category: String,
|
||||
tags: Vec<String>,
|
||||
header_img: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(FromRow, Debug)]
|
||||
struct AdjacentIds {
|
||||
prev: Option<Uuid>,
|
||||
next: Option<Uuid>,
|
||||
}
|
||||
|
||||
#[derive(serde::Serialize, Default)]
|
||||
struct AdjacentPosts {
|
||||
prev: Option<AdjacentPost>,
|
||||
next: Option<AdjacentPost>,
|
||||
}
|
||||
|
||||
#[derive(serde::Serialize)]
|
||||
struct ResponseModel {
|
||||
post: SelectedPost,
|
||||
adjacent: AdjacentPosts,
|
||||
}
|
||||
|
||||
pub async fn handler(
|
||||
State(db_connection): State<PgPool>,
|
||||
Path(identifier): Path<String>,
|
||||
) -> impl IntoResponse {
|
||||
let post = match if let Ok(id) = identifier.parse::<Uuid>() {
|
||||
select_post_by_uuid(&db_connection, id).await
|
||||
} else {
|
||||
select_post_by_str_id(&db_connection, &identifier).await
|
||||
} {
|
||||
Ok(post) => post,
|
||||
Err(e) => {
|
||||
return match e {
|
||||
sqlx::Error::RowNotFound => {
|
||||
err_resp_log!(StatusCode::NOT_FOUND, "no matching post")
|
||||
}
|
||||
_ => err_resp_log!(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
let adj_ids = query_as::<_, AdjacentIds>(SELECT_POST_ADJACENT_IDS)
|
||||
.bind(post.id)
|
||||
.fetch_one(&db_connection)
|
||||
.await
|
||||
.unwrap();
|
||||
let adjacent_prev = OptionFuture::from(
|
||||
adj_ids
|
||||
.prev
|
||||
.map(|id| select_post_with_adjacent_model(&db_connection, id)),
|
||||
)
|
||||
.await
|
||||
.flatten();
|
||||
let adjacent_next = OptionFuture::from(
|
||||
adj_ids
|
||||
.next
|
||||
.map(|id| select_post_with_adjacent_model(&db_connection, id)),
|
||||
)
|
||||
.await
|
||||
.flatten();
|
||||
let adjacent = AdjacentPosts {
|
||||
prev: adjacent_prev,
|
||||
next: adjacent_next,
|
||||
};
|
||||
|
||||
let response = ResponseModel { post, adjacent };
|
||||
succ_resp(StatusCode::OK, serde_json::to_value(response).unwrap())
|
||||
}
|
||||
|
||||
async fn select_post_by_uuid(db: &PgPool, id: Uuid) -> Result<SelectedPost, sqlx::Error> {
|
||||
query_as::<_, SelectedPost>(SELECT_POST_BY_UUID)
|
||||
.bind(id)
|
||||
.fetch_one(db)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn select_post_by_str_id(db: &PgPool, id: &str) -> Result<SelectedPost, sqlx::Error> {
|
||||
query_as::<_, SelectedPost>(SELECT_POST_BY_STR_ID)
|
||||
.bind(id)
|
||||
.fetch_one(db)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn select_post_with_adjacent_model(db: &PgPool, id: Uuid) -> Option<AdjacentPost> {
|
||||
query_as(SELECT_POST_WITH_ADJACENT_MODEL)
|
||||
.bind(id)
|
||||
.fetch_optional(db)
|
||||
.await
|
||||
.unwrap()
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
WITH target_create_date AS (SELECT p.date_created AS date FROM posts p WHERE p.id = $1)
|
||||
SELECT (SELECT p.id
|
||||
FROM posts p
|
||||
WHERE p.date_created < t.date
|
||||
ORDER BY p.date_created DESC
|
||||
LIMIT 1) AS prev,
|
||||
(SELECT p.id
|
||||
FROM posts p
|
||||
WHERE p.date_created > t.date
|
||||
ORDER BY p.date_created
|
||||
LIMIT 1) AS next
|
||||
FROM target_create_date t
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
SELECT p.id,
|
||||
p.identifier,
|
||||
p.title,
|
||||
p.subtitle,
|
||||
p.status,
|
||||
p.date_created,
|
||||
p.date_updated,
|
||||
c.name AS category,
|
||||
(SELECT array_agg(t.name)
|
||||
FROM tags t
|
||||
JOIN post_tag pt ON pt.tag = t.id
|
||||
WHERE pt.post = p.id) AS tags,
|
||||
p.content,
|
||||
(SELECT json_object_agg(m.meta_key, m.meta_value)
|
||||
FROM metadata m
|
||||
WHERE m.pid = p.id) AS metadata
|
||||
FROM posts p
|
||||
JOIN categories c ON c.id = p.category
|
||||
WHERE p.identifier = $1;
|
||||
@@ -0,0 +1,19 @@
|
||||
SELECT p.id,
|
||||
p.identifier,
|
||||
p.title,
|
||||
p.subtitle,
|
||||
p.status,
|
||||
p.date_created,
|
||||
p.date_updated,
|
||||
c.name AS category,
|
||||
(SELECT array_agg(t.name)
|
||||
FROM tags t
|
||||
JOIN post_tag pt ON pt.tag = t.id
|
||||
WHERE pt.post = p.id) AS tags,
|
||||
p.content,
|
||||
(SELECT json_object_agg(m.meta_key, m.meta_value)
|
||||
FROM metadata m
|
||||
WHERE m.pid = p.id) AS metadata
|
||||
FROM posts p
|
||||
JOIN categories c ON c.id = p.category
|
||||
WHERE p.id = $1;
|
||||
@@ -0,0 +1,17 @@
|
||||
SELECT p.id,
|
||||
identifier,
|
||||
title,
|
||||
subtitle,
|
||||
date_created,
|
||||
c.name AS category,
|
||||
(SELECT array_agg(t.name)
|
||||
FROM tags t
|
||||
JOIN post_tag pt ON pt.tag = t.id
|
||||
WHERE pt.post = p.id) AS tags,
|
||||
(SELECT m.meta_value
|
||||
FROM metadata m
|
||||
WHERE m.pid = p.id
|
||||
AND m.meta_key = 'header_img') AS header_img
|
||||
FROM posts p
|
||||
JOIN public.categories c on c.id = p.category
|
||||
WHERE p.id = $1
|
||||
@@ -0,0 +1,19 @@
|
||||
SELECT p.id,
|
||||
identifier,
|
||||
title,
|
||||
subtitle,
|
||||
date_created,
|
||||
date_updated,
|
||||
c.name AS category,
|
||||
(SELECT array_agg(t.name)
|
||||
FROM tags t
|
||||
JOIN post_tag pt ON pt.tag = t.id
|
||||
WHERE pt.post = p.id) AS tags,
|
||||
(SELECT m.meta_value
|
||||
FROM metadata m
|
||||
WHERE m.pid = p.id
|
||||
AND m.meta_key = 'header_img') AS header_img
|
||||
FROM posts p
|
||||
JOIN public.categories c on c.id = p.category
|
||||
WHERE p.id = ANY ($1)
|
||||
ORDER BY p.date_created DESC;
|
||||
@@ -0,0 +1,3 @@
|
||||
pub mod get;
|
||||
pub mod get_identifier;
|
||||
pub mod pagination;
|
||||
@@ -0,0 +1,52 @@
|
||||
use crate::{constants::blog::PAGE_SIZE, err_resp_log, utils::axum_response::succ_resp};
|
||||
|
||||
use axum::{extract::State, http::StatusCode, response::Response};
|
||||
use serde_json::{Value, json};
|
||||
use sqlx::{FromRow, PgPool, query_as};
|
||||
|
||||
#[derive(FromRow)]
|
||||
struct DBPaginationRow {
|
||||
page_count: i32,
|
||||
post_count: i64,
|
||||
}
|
||||
|
||||
struct PaginationResponse {
|
||||
page_count: i32,
|
||||
post_count: i64,
|
||||
}
|
||||
|
||||
impl From<DBPaginationRow> for PaginationResponse {
|
||||
fn from(value: DBPaginationRow) -> Self {
|
||||
Self {
|
||||
page_count: value.page_count,
|
||||
post_count: value.post_count,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<PaginationResponse> for Value {
|
||||
fn from(value: PaginationResponse) -> Self {
|
||||
json!({
|
||||
"page_count": value.page_count,
|
||||
"post_count": value.post_count
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn handler(State(db_connection): State<PgPool>) -> Response<String> {
|
||||
match query_as::<_, DBPaginationRow>(
|
||||
r#"
|
||||
SELECT
|
||||
cast(ceil(count(*) / cast($1 AS FLOAT)) AS INTEGER) AS page_count,
|
||||
count(*) AS post_count
|
||||
FROM posts;
|
||||
"#,
|
||||
)
|
||||
.bind(PAGE_SIZE as i64)
|
||||
.fetch_one(&db_connection)
|
||||
.await
|
||||
{
|
||||
Ok(res) => succ_resp(StatusCode::OK, PaginationResponse::from(res).into()),
|
||||
Err(e) => err_resp_log!(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
use crate::modules::blog::components::check_update::{
|
||||
changes::{Change, Create, Delete, Move, Update},
|
||||
error::Error,
|
||||
utils::{parse_naive_date_str, parse_post_identifier},
|
||||
};
|
||||
|
||||
use futures::{
|
||||
FutureExt,
|
||||
future::{BoxFuture, join_all},
|
||||
};
|
||||
use sqlx::{PgPool, Postgres, Row, Transaction, query};
|
||||
use tracing::error;
|
||||
|
||||
const DELETE_POST_BY_ID: &str = include_str!("sql/delete_post_by_id.sql");
|
||||
const GET_TAG_ID: &str = include_str!("sql/get_tag_id.sql");
|
||||
const GET_CATEGORY_ID: &str = include_str!("sql/get_category_id.sql");
|
||||
const CREATE_RETURN_TAG_ID: &str = include_str!("sql/create_return_tag_id.sql");
|
||||
const CREATE_RETURN_CATEGORY_ID: &str = include_str!("sql/create_return_category_id.sql");
|
||||
const CREATE_POST_GENERAL: &str = include_str!("sql/create_post_general.sql");
|
||||
const CREATE_POST_TAGS: &str = include_str!("sql/create_post_tags.sql");
|
||||
const CREATE_POST_META: &str = include_str!("sql/create_post_meta.sql");
|
||||
|
||||
pub async fn apply_deltas(db_conn: &PgPool, changes: Vec<Change>) {
|
||||
let handlers = changes
|
||||
.into_iter()
|
||||
.map(|change| match change {
|
||||
Change::Delete(del) => handle_delete(db_conn, del).boxed(),
|
||||
Change::Move(mv) => handle_move(db_conn, mv).boxed(),
|
||||
Change::Update(update) => handle_update(db_conn, update).boxed(),
|
||||
Change::Create(create) => handle_create(db_conn, create).boxed(),
|
||||
})
|
||||
.collect::<Vec<BoxFuture<'_, ()>>>();
|
||||
|
||||
join_all(handlers).await;
|
||||
}
|
||||
|
||||
async fn handle_delete(db: &PgPool, del: Delete) {
|
||||
if let Err(e) = query(DELETE_POST_BY_ID).bind(del.uuid).execute(db).await {
|
||||
error!(
|
||||
"failed to delete post: {}, {}",
|
||||
del.uuid.to_string(),
|
||||
e.to_string()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
async fn handle_move(db: &PgPool, mv: Move) {
|
||||
handle_delete(
|
||||
db,
|
||||
Delete {
|
||||
uuid: mv.uuid,
|
||||
path: Some(mv.from),
|
||||
},
|
||||
)
|
||||
.await;
|
||||
handle_create(
|
||||
db,
|
||||
Create {
|
||||
uuid: mv.uuid,
|
||||
path: mv.to,
|
||||
payload: mv.payload,
|
||||
},
|
||||
)
|
||||
.await;
|
||||
}
|
||||
|
||||
async fn handle_update(db: &PgPool, update: Update) {
|
||||
handle_delete(
|
||||
db,
|
||||
Delete {
|
||||
uuid: update.uuid,
|
||||
path: Some(update.path.clone()),
|
||||
},
|
||||
)
|
||||
.await;
|
||||
handle_create(
|
||||
db,
|
||||
Create {
|
||||
uuid: update.uuid,
|
||||
path: update.path,
|
||||
payload: update.payload,
|
||||
},
|
||||
)
|
||||
.await;
|
||||
}
|
||||
|
||||
async fn handle_create(db: &PgPool, create: Create) {
|
||||
let mut tx = db.begin().await.unwrap();
|
||||
|
||||
let identifier = parse_post_identifier(&create.path).unwrap();
|
||||
|
||||
let tags_json = create.payload.meta["tags"].clone();
|
||||
let tags: Vec<_> = if let Some(tags) = tags_json.as_array() {
|
||||
tags.iter().filter_map(|tag| tag.as_str()).collect()
|
||||
} else {
|
||||
vec![]
|
||||
};
|
||||
let mut tag_ids = vec![];
|
||||
for tag in tags {
|
||||
match get_or_create_tag_id(&mut tx, tag).await {
|
||||
Ok(tid) => tag_ids.push(tid),
|
||||
Err(e) => {
|
||||
error!("failed to fetch or create tag ({}): {}", tag, e);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let category_json = create.payload.meta["category"].clone();
|
||||
let category = category_json.as_str().unwrap_or("Uncategorized");
|
||||
let category_id = match get_or_create_category_id(&mut tx, category).await {
|
||||
Ok(id) => id,
|
||||
Err(e) => {
|
||||
error!(
|
||||
"failed to fetch category id for post {}: {}",
|
||||
&identifier, e
|
||||
);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const KEY_TO_SKIP: &[&str] = &[
|
||||
"category", "status", "id", "date", "update", "tags", "title", "subtitle",
|
||||
];
|
||||
let (post_meta_key, post_meta_value): (Vec<String>, Vec<String>) =
|
||||
if let Some(kv) = create.payload.meta.as_object() {
|
||||
kv.iter()
|
||||
.filter(|(k, _)| !KEY_TO_SKIP.contains(&&***k))
|
||||
.map(|(k, v)| (k.clone(), v.as_str().unwrap().to_string()))
|
||||
.collect()
|
||||
} else {
|
||||
(vec![], vec![])
|
||||
};
|
||||
|
||||
let meta = create.payload.meta;
|
||||
let post_id = create.uuid;
|
||||
let post_identifier = &identifier;
|
||||
let post_title = meta
|
||||
.get("title")
|
||||
.map(|t| t.as_str().unwrap())
|
||||
.unwrap_or("Untitled");
|
||||
let post_subtitle = meta
|
||||
.get("subtitle")
|
||||
.map(|t| t.as_str().unwrap())
|
||||
.unwrap_or("");
|
||||
let post_date_created = if let Some(Some(date)) = meta
|
||||
.get("date")
|
||||
.map(|d| parse_naive_date_str(d.as_str().unwrap_or("")))
|
||||
{
|
||||
date
|
||||
} else {
|
||||
error!("failed to parse `date` for post: {}", post_identifier);
|
||||
return;
|
||||
};
|
||||
let post_date_updated = meta
|
||||
.get("update")
|
||||
.map(|d| parse_naive_date_str(d.as_str().unwrap_or("")))
|
||||
.unwrap_or(None);
|
||||
let post_status = meta.get("status").map(|v| v.as_str()).unwrap_or(None);
|
||||
let post_content = create.payload.content;
|
||||
let post_hash = create.payload.hash;
|
||||
|
||||
if let Err(e) = query(CREATE_POST_GENERAL)
|
||||
.bind(post_id)
|
||||
.bind(post_identifier)
|
||||
.bind(post_title)
|
||||
.bind(post_subtitle)
|
||||
.bind(post_date_created)
|
||||
.bind(post_date_updated)
|
||||
.bind(post_status)
|
||||
.bind(post_content)
|
||||
.bind(post_hash)
|
||||
.bind(category_id)
|
||||
.execute(&mut *tx)
|
||||
.await
|
||||
{
|
||||
error!("failed to insert post {}: {}", &identifier, e);
|
||||
return;
|
||||
}
|
||||
|
||||
if let Err(e) = query(CREATE_POST_TAGS)
|
||||
.bind(post_id)
|
||||
.bind(tag_ids)
|
||||
.execute(&mut *tx)
|
||||
.await
|
||||
{
|
||||
error!("failed to insert post {}: {}", &identifier, e);
|
||||
return;
|
||||
}
|
||||
|
||||
if let Err(e) = query(CREATE_POST_META)
|
||||
.bind(post_id)
|
||||
.bind(post_meta_key)
|
||||
.bind(post_meta_value)
|
||||
.execute(&mut *tx)
|
||||
.await
|
||||
{
|
||||
error!("failed to insert post {}: {}", &identifier, e);
|
||||
return;
|
||||
}
|
||||
|
||||
tx.commit().await.unwrap();
|
||||
}
|
||||
|
||||
async fn get_or_create_tag_id(
|
||||
db: &mut Transaction<'_, Postgres>,
|
||||
tag_name: &str,
|
||||
) -> Result<i32, Error> {
|
||||
get_create_id(db, tag_name, GET_TAG_ID, CREATE_RETURN_TAG_ID).await
|
||||
}
|
||||
|
||||
async fn get_or_create_category_id(
|
||||
db: &mut Transaction<'_, Postgres>,
|
||||
category_name: &str,
|
||||
) -> Result<i32, Error> {
|
||||
get_create_id(
|
||||
db,
|
||||
category_name,
|
||||
GET_CATEGORY_ID,
|
||||
CREATE_RETURN_CATEGORY_ID,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn get_create_id(
|
||||
db: &mut Transaction<'_, Postgres>,
|
||||
field_name: &str,
|
||||
fetch_query: &str,
|
||||
create_fetch_query: &str,
|
||||
) -> Result<i32, Error> {
|
||||
if let Some(id) = query(fetch_query)
|
||||
.bind(field_name)
|
||||
.fetch_optional(&mut **db)
|
||||
.await?
|
||||
{
|
||||
Ok(id.get("id"))
|
||||
} else {
|
||||
let id = query(create_fetch_query)
|
||||
.bind(field_name)
|
||||
.fetch_one(&mut **db)
|
||||
.await?
|
||||
.get("id");
|
||||
Ok(id)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
use std::path::PathBuf;
|
||||
|
||||
use markdown::MdFile;
|
||||
|
||||
use uuid::Uuid;
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[derive(Debug)]
|
||||
pub enum Change {
|
||||
Delete(Delete),
|
||||
Move(Move),
|
||||
Update(Update),
|
||||
Create(Create),
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Delete {
|
||||
pub uuid: Uuid,
|
||||
pub path: Option<PathBuf>,
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Move {
|
||||
pub uuid: Uuid,
|
||||
pub from: PathBuf,
|
||||
pub to: PathBuf,
|
||||
pub payload: MdFile,
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Update {
|
||||
pub uuid: Uuid,
|
||||
pub path: PathBuf,
|
||||
pub payload: MdFile,
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Create {
|
||||
pub uuid: Uuid,
|
||||
pub path: PathBuf,
|
||||
pub payload: MdFile,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub struct CreateDelete2UpdateSlot {
|
||||
pub create: Option<Create>,
|
||||
pub delete: Option<Delete>,
|
||||
}
|
||||
|
||||
impl CreateDelete2UpdateSlot {
|
||||
pub fn to_change(&self) -> Option<Change> {
|
||||
match (&self.create, &self.delete) {
|
||||
(Some(create), Some(delete)) => Some(Change::Move(Move {
|
||||
uuid: create.uuid,
|
||||
from: delete.path.clone()?,
|
||||
to: create.path.clone(),
|
||||
payload: create.payload.clone(),
|
||||
})),
|
||||
(Some(create), None) => Some(Change::Create(create.clone())),
|
||||
(None, Some(delete)) => Some(Change::Delete(delete.clone())),
|
||||
(None, None) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
use markdown::error::Error as MarkdownError;
|
||||
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum Error {
|
||||
#[error("markdown file error")]
|
||||
MdFile(#[from] MarkdownError),
|
||||
|
||||
#[error("db error")]
|
||||
Db(#[from] sqlx::Error),
|
||||
|
||||
#[error("git error")]
|
||||
Git2(#[from] git2::Error),
|
||||
|
||||
#[error("git remote url mismatch")]
|
||||
GitUrlMismatch,
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
pub mod apply;
|
||||
pub mod changes;
|
||||
mod error;
|
||||
mod pull;
|
||||
pub mod utils;
|
||||
|
||||
use std::{env, path::PathBuf, sync::Arc};
|
||||
|
||||
use crate::{
|
||||
constants::config::general::{default_value, var_name},
|
||||
modules::blog::components::{
|
||||
check_update::{apply::apply_deltas, pull::fetch_deltas},
|
||||
static_rsc::GIT_WORK_DIR,
|
||||
},
|
||||
scheduler::task_func::AsyncTaskFunc,
|
||||
};
|
||||
use macros::panic_with_log;
|
||||
|
||||
use sqlx::PgPool;
|
||||
use tracing::{Level, log::error, trace};
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Args {
|
||||
db_connection: PgPool,
|
||||
git_work_dir: PathBuf,
|
||||
git_url: String,
|
||||
git_remote_name: String,
|
||||
git_remote_branch: String,
|
||||
}
|
||||
|
||||
pub fn task(db_connection: PgPool) -> impl AsyncTaskFunc {
|
||||
// clone & check update
|
||||
let git_url = match env::var(var_name::BLOG_GIT_URL) {
|
||||
Ok(url) => url,
|
||||
Err(e) => {
|
||||
panic_with_log!(
|
||||
Level::ERROR,
|
||||
"failed to read `{}`: {}",
|
||||
var_name::BLOG_GIT_URL,
|
||||
e
|
||||
)
|
||||
}
|
||||
};
|
||||
let git_remote_name = env::var(var_name::BLOG_GIT_REMOTE_NAME)
|
||||
.unwrap_or(default_value::BLOG_GIT_REMOTE_NAME.to_string());
|
||||
let git_remote_branch = env::var(var_name::BLOG_GIT_REMOTE_BRANCH)
|
||||
.unwrap_or(default_value::BLOG_GIT_REMOTE_BRANCH.to_string());
|
||||
|
||||
let arc_args = Arc::new(Args {
|
||||
db_connection,
|
||||
git_work_dir: GIT_WORK_DIR.clone(),
|
||||
git_url,
|
||||
git_remote_name,
|
||||
git_remote_branch,
|
||||
});
|
||||
|
||||
move || Box::pin(workflow(arc_args.clone()))
|
||||
}
|
||||
|
||||
async fn workflow(args: Arc<Args>) {
|
||||
let deltas = match fetch_deltas(
|
||||
&args.git_url,
|
||||
&args.git_remote_name,
|
||||
&args.git_remote_branch,
|
||||
&args.git_work_dir,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(updates) => updates,
|
||||
Err(e) => {
|
||||
error!("delta parsing error: {}", e);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
if deltas.is_empty() {
|
||||
trace!("blog git already up-to-date");
|
||||
return;
|
||||
}
|
||||
|
||||
apply_deltas(&args.db_connection, deltas).await;
|
||||
}
|
||||
@@ -0,0 +1,175 @@
|
||||
use std::{collections::HashMap, fs::remove_dir_all, path::Path, path::PathBuf};
|
||||
|
||||
use crate::{
|
||||
modules::blog::components::{
|
||||
check_update::{
|
||||
changes::{Change, Create, CreateDelete2UpdateSlot, Delete, Update},
|
||||
error::Error,
|
||||
utils::extract_post_id,
|
||||
},
|
||||
static_rsc::BLOG_POST_PATH_PATTERN,
|
||||
},
|
||||
utils::{git, git::FileDelta},
|
||||
};
|
||||
use markdown::MdFile;
|
||||
|
||||
use git2::{Delta, Repository};
|
||||
use tracing::{error, warn};
|
||||
use uuid::Uuid;
|
||||
|
||||
pub async fn fetch_deltas(
|
||||
git_url: &str,
|
||||
git_remote_name: &str,
|
||||
git_remote_branch: &str,
|
||||
git_work_dir: &PathBuf,
|
||||
) -> Result<Vec<Change>, Error> {
|
||||
let repo = match Repository::open(git_work_dir) {
|
||||
Ok(repo) => repo,
|
||||
Err(_) => match Repository::clone(git_url, git_work_dir) {
|
||||
Ok(repo) => repo,
|
||||
Err(e) => {
|
||||
error!("failed to clone blog content git({}): {}", &git_url, e);
|
||||
return Err(e.into());
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
let mut remote = match repo.find_remote(git_remote_name) {
|
||||
Ok(remote) => remote,
|
||||
Err(e) => {
|
||||
remove_dir_all(git_work_dir).unwrap();
|
||||
warn!(
|
||||
"cannot find git remote ({}), reinitializing: {}",
|
||||
git_remote_name, e
|
||||
);
|
||||
return Err(e.into());
|
||||
}
|
||||
};
|
||||
if remote.url().is_some_and(|url| url != git_url) {
|
||||
remove_dir_all(git_work_dir).unwrap();
|
||||
warn!(
|
||||
"git remote url mismatch (expected: {}, actual: {}), reinitializing",
|
||||
git_url,
|
||||
remote.url().unwrap()
|
||||
);
|
||||
return Err(Error::GitUrlMismatch);
|
||||
}
|
||||
|
||||
let fetched_commit = git::do_fetch(&repo, &[git_remote_branch], &mut remote)?;
|
||||
let commit_deltas = git::calculate_diff(
|
||||
&repo,
|
||||
&repo.reference_to_annotated_commit(&repo.head()?)?,
|
||||
&fetched_commit,
|
||||
)?;
|
||||
|
||||
// dbg!(&commit_deltas);
|
||||
let mut changes: Vec<Change> = vec![];
|
||||
let mut non_delete_deltas: Vec<FileDelta> = vec![];
|
||||
|
||||
// process deleted deltas before merging commit to prevent "file not found" os error
|
||||
for delta in commit_deltas.into_iter() {
|
||||
let relative_file_path = delta
|
||||
.new_path
|
||||
.clone()
|
||||
.expect("cannot parse modified post `new_path`");
|
||||
|
||||
if !should_delta_tracked(&relative_file_path) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if delta.status == Delta::Deleted {
|
||||
let file_path = &git_work_dir.join(relative_file_path);
|
||||
if let Some(id) = extract_post_id(&MdFile::from_file(file_path)?) {
|
||||
changes.push(Change::Delete(Delete {
|
||||
uuid: id,
|
||||
path: Some(file_path.clone()),
|
||||
}))
|
||||
} else {
|
||||
error!("failed to parse uuid for file {}", file_path.display());
|
||||
// todo: add to unresolved error list
|
||||
}
|
||||
} else {
|
||||
non_delete_deltas.push(delta);
|
||||
}
|
||||
}
|
||||
|
||||
git::do_merge(&repo, git_remote_branch, fetched_commit)?;
|
||||
|
||||
// process adds and modifies deltas
|
||||
for delta in non_delete_deltas.into_iter() {
|
||||
let file_path = &git_work_dir.join(
|
||||
delta
|
||||
.new_path
|
||||
.expect("cannot parse modified post `new_path`"),
|
||||
);
|
||||
match delta.status {
|
||||
Delta::Added => {
|
||||
let md_file = MdFile::from_file(file_path)?;
|
||||
if let Some(id) = extract_post_id(&md_file) {
|
||||
changes.push(Change::Create(Create {
|
||||
uuid: id,
|
||||
path: file_path.clone(),
|
||||
payload: md_file,
|
||||
}))
|
||||
} else {
|
||||
error!("failed to parse uuid for file {}", file_path.display());
|
||||
// todo: add to unresolved error list
|
||||
}
|
||||
}
|
||||
Delta::Modified => {
|
||||
let md_file = MdFile::from_file(file_path)?;
|
||||
if let Some(id) = extract_post_id(&md_file) {
|
||||
changes.push(Change::Update(Update {
|
||||
uuid: id,
|
||||
path: file_path.clone(),
|
||||
payload: md_file,
|
||||
}))
|
||||
} else {
|
||||
error!("failed to parse uuid for file {}", file_path.display());
|
||||
// todo: add to unresolved error list
|
||||
}
|
||||
}
|
||||
Delta::Deleted => continue,
|
||||
_ => {
|
||||
error!("unsupported delta type on file {}", file_path.display());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// merge adds and deletes deltas to moves
|
||||
let changes = merge_changes(changes);
|
||||
|
||||
Ok(changes)
|
||||
}
|
||||
|
||||
fn merge_changes(changes: Vec<Change>) -> Vec<Change> {
|
||||
let mut slots: HashMap<Uuid, CreateDelete2UpdateSlot> = HashMap::new();
|
||||
let mut merged: Vec<Change> = Vec::new();
|
||||
|
||||
for change in changes {
|
||||
match change {
|
||||
Change::Create(create) => {
|
||||
let id = create.uuid;
|
||||
slots.entry(id).or_default().create = Some(create);
|
||||
}
|
||||
Change::Delete(delete) => {
|
||||
let id = delete.uuid;
|
||||
slots.entry(id).or_default().delete = Some(delete);
|
||||
}
|
||||
_ => merged.push(change),
|
||||
}
|
||||
}
|
||||
|
||||
for slot in slots.values() {
|
||||
if let Some(change) = slot.to_change() {
|
||||
merged.push(change);
|
||||
}
|
||||
}
|
||||
|
||||
merged
|
||||
}
|
||||
|
||||
fn should_delta_tracked(path: &Path) -> bool {
|
||||
BLOG_POST_PATH_PATTERN.is_match(path.to_str().unwrap())
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
INSERT INTO posts
|
||||
(id, identifier, title, subtitle, date_created, date_updated, status, content, hash, category)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, COALESCE($7, 'draft'), $8, $9, $10);
|
||||
@@ -0,0 +1,3 @@
|
||||
INSERT INTO metadata (pid, meta_key, meta_value)
|
||||
SELECT $1, key, value
|
||||
FROM UNNEST($2, $3) AS k(key, value);
|
||||
@@ -0,0 +1,3 @@
|
||||
INSERT INTO post_tag (post, tag)
|
||||
SELECT $1, tag
|
||||
FROM UNNEST($2) AS t(tag);
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
INSERT INTO categories(name)
|
||||
VALUES ($1)
|
||||
RETURNING id;
|
||||
@@ -0,0 +1,3 @@
|
||||
INSERT INTO tags(name)
|
||||
VALUES ($1)
|
||||
RETURNING id;
|
||||
@@ -0,0 +1,3 @@
|
||||
DELETE
|
||||
FROM posts
|
||||
WHERE id = $1;
|
||||
@@ -0,0 +1,3 @@
|
||||
SELECT id
|
||||
FROM categories
|
||||
WHERE name = $1;
|
||||
@@ -0,0 +1,3 @@
|
||||
SELECT id
|
||||
FROM tags
|
||||
WHERE name = $1;
|
||||
@@ -0,0 +1,67 @@
|
||||
use std::path::Path;
|
||||
|
||||
use crate::constants::{
|
||||
config::general::{default_value, var_name},
|
||||
time::DEFAULT_NAIVE_DATE_FORMAT,
|
||||
};
|
||||
|
||||
use chrono::NaiveDate;
|
||||
use dirs::home_dir;
|
||||
use markdown::MdFile;
|
||||
use tracing::warn;
|
||||
use uuid::Uuid;
|
||||
|
||||
pub fn expand_path(path: String) -> String {
|
||||
if path.starts_with('~') {
|
||||
home_dir()
|
||||
.map(|dir| {
|
||||
dir.join(path.strip_prefix("~/").unwrap())
|
||||
.into_os_string()
|
||||
.into_string()
|
||||
.unwrap()
|
||||
})
|
||||
.unwrap_or_else(|| {
|
||||
warn!(
|
||||
"failed to parse env var `{}`, using default value `{}`",
|
||||
var_name::WORK_DIR,
|
||||
default_value::WORK_DIR
|
||||
);
|
||||
default_value::WORK_DIR.to_string()
|
||||
})
|
||||
} else {
|
||||
path
|
||||
}
|
||||
}
|
||||
|
||||
pub fn extract_post_id(post: &MdFile) -> Option<Uuid> {
|
||||
match post.meta["id"].as_str() {
|
||||
Some(id) => Uuid::parse_str(id).ok(),
|
||||
None => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse_post_identifier(path: &Path) -> Option<String> {
|
||||
if let Some(comp) = path.components().nth_back(1) {
|
||||
comp.as_os_str().to_str().map(|s| s.to_string())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse_naive_date_str(date_str: &str) -> Option<NaiveDate> {
|
||||
NaiveDate::parse_from_str(date_str, DEFAULT_NAIVE_DATE_FORMAT).ok()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::modules::blog::components::check_update::utils::parse_naive_date_str;
|
||||
use chrono::NaiveDate;
|
||||
|
||||
#[test]
|
||||
fn test_parse_naive_date() {
|
||||
assert_eq!(
|
||||
NaiveDate::from_ymd_opt(2015, 1, 1),
|
||||
parse_naive_date_str("2015-1-01")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
fs,
|
||||
path::{Path, PathBuf},
|
||||
str::FromStr,
|
||||
};
|
||||
|
||||
use crate::modules::blog::components::{
|
||||
check_update::{
|
||||
changes::{Change, Create, Delete, Update},
|
||||
utils::extract_post_id,
|
||||
},
|
||||
consistency_guard::{error::Error, utils::rec_find_dir_entries},
|
||||
static_rsc::BLOG_POST_PATH_PATTERN,
|
||||
};
|
||||
use markdown::MdFile;
|
||||
|
||||
use sqlx::{FromRow, PgPool, query_as};
|
||||
use tracing::error;
|
||||
use uuid::Uuid;
|
||||
|
||||
const FETCH_POST_HASH: &str = include_str!("sql/fetch_post_hash.sql");
|
||||
|
||||
#[derive(Debug, FromRow)]
|
||||
struct PostIdHash {
|
||||
id: Uuid,
|
||||
hash: String,
|
||||
}
|
||||
|
||||
struct PostPath {
|
||||
id: Uuid,
|
||||
path: PathBuf,
|
||||
payload: MdFile,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct DeltaSlot {
|
||||
local: Option<PostPath>,
|
||||
db: Option<PostIdHash>,
|
||||
}
|
||||
|
||||
impl DeltaSlot {
|
||||
pub fn to_change(&self) -> Option<Change> {
|
||||
match (&self.local, &self.db) {
|
||||
(Some(local), Some(db)) => {
|
||||
if local.payload.hash == db.hash {
|
||||
None
|
||||
} else {
|
||||
Some(Change::Update(Update {
|
||||
uuid: local.id,
|
||||
path: local.path.clone(),
|
||||
payload: local.payload.clone(),
|
||||
}))
|
||||
}
|
||||
}
|
||||
(Some(local), None) => Some(Change::Create(Create {
|
||||
uuid: local.id,
|
||||
path: local.path.clone(),
|
||||
payload: local.payload.clone(),
|
||||
})),
|
||||
(None, Some(db)) => Some(Change::Delete(Delete {
|
||||
uuid: db.id,
|
||||
path: None,
|
||||
})),
|
||||
(None, None) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn compare_db_local_post_hash(
|
||||
db: &PgPool,
|
||||
git_work_dir: &Path,
|
||||
) -> Result<Vec<Change>, Error> {
|
||||
let db_post_hashes = query_as::<_, PostIdHash>(FETCH_POST_HASH)
|
||||
.fetch_all(db)
|
||||
.await?;
|
||||
let local_posts = fetch_local_posts(git_work_dir)?;
|
||||
calculate_post_changes(local_posts, db_post_hashes)
|
||||
}
|
||||
|
||||
fn fetch_local_posts(git_work_dir: &Path) -> Result<Vec<PostPath>, Error> {
|
||||
let mut post_hashes = vec![];
|
||||
let entries = rec_find_dir_entries(&git_work_dir.join("posts"))?;
|
||||
|
||||
for entry in entries {
|
||||
let relative_pth = entry.strip_prefix(git_work_dir).unwrap();
|
||||
if !BLOG_POST_PATH_PATTERN.is_match(relative_pth.to_str().unwrap()) {
|
||||
continue;
|
||||
}
|
||||
let post_str = fs::read_to_string(&entry)?;
|
||||
let post = MdFile::from_str(&post_str)?;
|
||||
let post_id = match extract_post_id(&post) {
|
||||
None => {
|
||||
error!(
|
||||
"failed to parse uuid for file {}, skipping",
|
||||
&entry.display()
|
||||
);
|
||||
continue;
|
||||
}
|
||||
Some(v) => v,
|
||||
};
|
||||
post_hashes.push(PostPath {
|
||||
id: post_id,
|
||||
path: entry,
|
||||
payload: post,
|
||||
});
|
||||
}
|
||||
|
||||
Ok(post_hashes)
|
||||
}
|
||||
|
||||
fn calculate_post_changes(local: Vec<PostPath>, db: Vec<PostIdHash>) -> Result<Vec<Change>, Error> {
|
||||
let mut slots: HashMap<Uuid, DeltaSlot> = HashMap::new();
|
||||
for local_post in local {
|
||||
let id = local_post.id;
|
||||
slots.entry(id).or_default().local = Some(local_post);
|
||||
}
|
||||
for db_post in db {
|
||||
let id = db_post.id;
|
||||
slots.entry(id).or_default().db = Some(db_post);
|
||||
}
|
||||
|
||||
let mut changes = vec![];
|
||||
for slot in slots.values() {
|
||||
if let Some(change) = slot.to_change() {
|
||||
changes.push(change);
|
||||
}
|
||||
}
|
||||
Ok(changes)
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
use std::io;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum Error {
|
||||
#[error("db error")]
|
||||
Db(#[from] sqlx::Error),
|
||||
|
||||
#[error("io error")]
|
||||
Io(#[from] io::Error),
|
||||
|
||||
#[error("invalid path: {0}")]
|
||||
InvalidPath(PathBuf),
|
||||
|
||||
#[error("invalid md file")]
|
||||
MdFile(#[from] markdown::error::Error),
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
mod checker;
|
||||
mod error;
|
||||
mod utils;
|
||||
|
||||
use std::{path::PathBuf, sync::Arc};
|
||||
|
||||
use crate::{
|
||||
modules::blog::components::{
|
||||
check_update::apply::apply_deltas, consistency_guard::checker::compare_db_local_post_hash,
|
||||
static_rsc::GIT_WORK_DIR,
|
||||
},
|
||||
scheduler::task_func::AsyncTaskFunc,
|
||||
};
|
||||
|
||||
use sqlx::PgPool;
|
||||
use tracing::{error, trace};
|
||||
|
||||
struct Args {
|
||||
db_connection: PgPool,
|
||||
git_work_dir: PathBuf,
|
||||
}
|
||||
|
||||
pub fn task(db_connection: PgPool) -> impl AsyncTaskFunc {
|
||||
let args = Arc::new(Args {
|
||||
db_connection,
|
||||
git_work_dir: GIT_WORK_DIR.clone(),
|
||||
});
|
||||
move || Box::pin(workflow(args.clone()))
|
||||
}
|
||||
|
||||
async fn workflow(args: Arc<Args>) {
|
||||
let db = &args.db_connection;
|
||||
let git_work_dir = &args.git_work_dir;
|
||||
|
||||
let changes = match compare_db_local_post_hash(db, git_work_dir).await {
|
||||
Ok(c) => c,
|
||||
Err(e) => {
|
||||
error!("failed to compare db and local post list: {}", e);
|
||||
return;
|
||||
}
|
||||
};
|
||||
apply_deltas(db, changes).await;
|
||||
trace!("local-database consistency checked");
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
SELECT id, hash
|
||||
FROM posts
|
||||
@@ -0,0 +1,78 @@
|
||||
use std::{
|
||||
fs,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
|
||||
use crate::modules::blog::components::consistency_guard::error::Error;
|
||||
|
||||
pub fn rec_find_dir_entries(entry: &Path) -> Result<Vec<PathBuf>, Error> {
|
||||
if !entry.exists() {
|
||||
return Err(Error::InvalidPath(entry.to_path_buf()));
|
||||
}
|
||||
|
||||
let mut result = vec![];
|
||||
|
||||
if !entry.is_dir() {
|
||||
return Ok(vec![entry.to_path_buf()]);
|
||||
}
|
||||
|
||||
for entry in fs::read_dir(entry)? {
|
||||
let entry = entry?;
|
||||
let path = entry.path();
|
||||
|
||||
if path.is_dir() {
|
||||
result.extend(rec_find_dir_entries(&path)?);
|
||||
} else {
|
||||
result.push(path);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::fs::{self, File};
|
||||
use tempfile::TempDir;
|
||||
|
||||
#[test]
|
||||
fn test_valid_directory() {
|
||||
let temp_dir = TempDir::new().unwrap();
|
||||
let dir_path = temp_dir.path();
|
||||
|
||||
fs::create_dir(dir_path.join("subdir")).unwrap();
|
||||
File::create(dir_path.join("file1.txt")).unwrap();
|
||||
File::create(dir_path.join("subdir/file2.txt")).unwrap();
|
||||
|
||||
let entries = rec_find_dir_entries(dir_path).unwrap();
|
||||
assert_eq!(entries.len(), 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_non_existent_path() {
|
||||
let non_existent = PathBuf::from("/non/existent/path");
|
||||
assert!(matches!(
|
||||
rec_find_dir_entries(&non_existent),
|
||||
Err(Error::InvalidPath(_))
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_single_file() {
|
||||
let temp_dir = TempDir::new().unwrap();
|
||||
let file_path = temp_dir.path().join("test.txt");
|
||||
File::create(&file_path).unwrap();
|
||||
|
||||
let entries = rec_find_dir_entries(&file_path).unwrap();
|
||||
assert_eq!(entries.len(), 1);
|
||||
assert_eq!(entries[0], file_path);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_empty_directory() {
|
||||
let temp_dir = TempDir::new().unwrap();
|
||||
let entries = rec_find_dir_entries(temp_dir.path()).unwrap();
|
||||
assert!(entries.is_empty());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
pub mod check_update;
|
||||
pub mod consistency_guard;
|
||||
pub mod rag;
|
||||
mod static_rsc;
|
||||
@@ -0,0 +1 @@
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
use std::{
|
||||
env,
|
||||
path::{Path, PathBuf},
|
||||
sync::LazyLock,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
constants::config::general::{default_value, var_name},
|
||||
modules::blog::components::check_update::utils::expand_path,
|
||||
};
|
||||
|
||||
use regex::Regex;
|
||||
use tracing::warn;
|
||||
|
||||
pub static BLOG_POST_PATH_PATTERN: LazyLock<Regex> =
|
||||
LazyLock::new(|| Regex::new(r"^posts/\d{4}/[a-zA-Z0-9-]+/index\.md$").unwrap());
|
||||
|
||||
pub static GIT_WORK_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
|
||||
let path = if let Ok(default_work_path) = env::var(var_name::WORK_DIR) {
|
||||
expand_path(default_work_path)
|
||||
} else {
|
||||
let fallback_path = expand_path(default_value::WORK_DIR.to_string());
|
||||
warn!(
|
||||
"unset env var `{}`, using default path: {}/blog_git",
|
||||
var_name::WORK_DIR,
|
||||
fallback_path
|
||||
);
|
||||
fallback_path
|
||||
};
|
||||
Path::new(&path).join("blog_git")
|
||||
});
|
||||
@@ -0,0 +1,60 @@
|
||||
mod api;
|
||||
mod components;
|
||||
|
||||
use crate::{
|
||||
modules::{
|
||||
Module,
|
||||
blog::{
|
||||
api::{posts, posts::get, posts::pagination},
|
||||
components::{check_update, consistency_guard},
|
||||
},
|
||||
},
|
||||
scheduler::tasks::{CronTask, async_basic::AsyncBasic},
|
||||
};
|
||||
|
||||
use axum::{Router, routing::get};
|
||||
use sqlx::PgPool;
|
||||
|
||||
const MOUNT_POINT: &str = "/blog";
|
||||
|
||||
pub struct Blog {
|
||||
pub db_handler: PgPool,
|
||||
}
|
||||
|
||||
impl Module for Blog {
|
||||
fn get_server_router(&self) -> Router {
|
||||
let db_handler = self.db_handler.clone();
|
||||
// todo: move resource init to new func
|
||||
// todo: remove debug comment
|
||||
Router::new()
|
||||
.route("/posts", get(get::handler))
|
||||
.route("/posts/{identifier}", get(posts::get_identifier::handler))
|
||||
.route("/posts/pagination", get(pagination::handler))
|
||||
.with_state(db_handler)
|
||||
}
|
||||
|
||||
fn get_mount_point(&self) -> &'static str {
|
||||
MOUNT_POINT
|
||||
}
|
||||
|
||||
fn get_cron_tasks(&self) -> Vec<(&str, Box<dyn CronTask>)> {
|
||||
let db_handler = self.db_handler.clone();
|
||||
vec![
|
||||
(
|
||||
"Blog Check Update",
|
||||
AsyncBasic::new(check_update::task(db_handler.clone()), "*/5 * * * * *")
|
||||
.unwrap()
|
||||
.to_task(),
|
||||
),
|
||||
(
|
||||
"Consistency Guard",
|
||||
AsyncBasic::new(
|
||||
consistency_guard::task(db_handler.clone()),
|
||||
"*/15 * * * * *",
|
||||
)
|
||||
.unwrap()
|
||||
.to_task(),
|
||||
),
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
CREATE TABLE tags
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(20) UNIQUE NOT NULL,
|
||||
description TEXT DEFAULT ''
|
||||
);
|
||||
|
||||
CREATE TABLE categories
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(20) UNIQUE NOT NULL,
|
||||
description TEXT DEFAULT ''
|
||||
);
|
||||
|
||||
CREATE TABLE post_status
|
||||
(
|
||||
name VARCHAR(20) PRIMARY KEY
|
||||
);
|
||||
|
||||
INSERT INTO post_status (name)
|
||||
VALUES ('draft'),
|
||||
('published'),
|
||||
('planned'),
|
||||
('hidden');
|
||||
|
||||
CREATE TABLE posts
|
||||
(
|
||||
id UUID PRIMARY KEY,
|
||||
identifier VARCHAR(100) UNIQUE NOT NULL,
|
||||
title VARCHAR(255) NOT NULL,
|
||||
subtitle VARCHAR(255) NOT NULL,
|
||||
date_created DATE NOT NULL,
|
||||
date_updated DATE,
|
||||
status VARCHAR(20) REFERENCES post_status (name) NOT NULL,
|
||||
content TEXT NOT NULL,
|
||||
hash VARCHAR(44) NOT NULL,
|
||||
category INTEGER REFERENCES categories (id) NOT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE post_tag
|
||||
(
|
||||
post UUID REFERENCES posts (id) ON DELETE CASCADE,
|
||||
tag INTEGER REFERENCES tags (id) ON DELETE CASCADE,
|
||||
|
||||
CONSTRAINT post_tag_pk PRIMARY KEY (post, tag)
|
||||
);
|
||||
|
||||
CREATE TABLE metadata
|
||||
(
|
||||
pid UUID REFERENCES posts (id) ON DELETE CASCADE NOT NULL,
|
||||
meta_key VARCHAR(50) NOT NULL,
|
||||
meta_value TEXT NOT NULL,
|
||||
|
||||
CONSTRAINT metadata_pk PRIMARY KEY (pid, meta_key)
|
||||
);
|
||||
|
||||
-- index
|
||||
CREATE INDEX idx_tags_name ON tags (name);
|
||||
CREATE INDEX idx_categories_name ON categories (name);
|
||||
CREATE INDEX idx_posts_identifier ON posts (identifier);
|
||||
CREATE INDEX idx_posts_status ON posts (status);
|
||||
CREATE INDEX idx_posts_category ON posts (category);
|
||||
CREATE INDEX idx_posts_date_created ON posts (date_created);
|
||||
CREATE INDEX idx_post_tag_post ON post_tag (post);
|
||||
CREATE INDEX idx_post_tag_tag ON post_tag (tag);
|
||||
CREATE INDEX idx_metadata_pid ON metadata (pid);
|
||||
@@ -0,0 +1,82 @@
|
||||
use std::{env, num::ParseIntError};
|
||||
|
||||
use crate::{
|
||||
constants::config::server::{default_value, var_name},
|
||||
scheduler::{Scheduler, tasks::CronTask},
|
||||
};
|
||||
use macros::error_panic;
|
||||
|
||||
use axum::Router;
|
||||
use tokio::net::TcpListener;
|
||||
use tracing::{info, warn};
|
||||
|
||||
pub mod blog;
|
||||
|
||||
// todo: merge `get_server_router` & `get_mount_point`, make Option
|
||||
pub trait Module {
|
||||
fn get_server_router(&self) -> Router;
|
||||
|
||||
fn get_mount_point(&self) -> &'static str;
|
||||
|
||||
fn get_cron_tasks(&self) -> Vec<(&str, Box<dyn CronTask>)>;
|
||||
}
|
||||
|
||||
pub struct ModuleTree {
|
||||
pub modules: Vec<Box<dyn Module>>,
|
||||
}
|
||||
|
||||
impl ModuleTree {
|
||||
pub fn new() -> Self {
|
||||
ModuleTree { modules: vec![] }
|
||||
}
|
||||
|
||||
pub fn add_module(&mut self, module: impl Module + 'static) -> &mut Self {
|
||||
self.modules.push(Box::new(module));
|
||||
self
|
||||
}
|
||||
|
||||
pub async fn blocking_serve(&self) {
|
||||
let mut scheduler = Scheduler::new();
|
||||
let mut app = Router::new();
|
||||
|
||||
let port: u32 = match env::var(var_name::PORT) {
|
||||
Ok(value) => value.parse().unwrap_or_else(|e: ParseIntError| {
|
||||
warn!(
|
||||
"failed to parse `{}`, using default port: {}",
|
||||
var_name::PORT,
|
||||
e.to_string()
|
||||
);
|
||||
default_value::PORT
|
||||
}),
|
||||
Err(_) => default_value::PORT,
|
||||
};
|
||||
|
||||
let listener = match TcpListener::bind(format!("{}:{}", default_value::HOST, port)).await {
|
||||
Ok(listener) => {
|
||||
info!("server starting on {}:{}", default_value::HOST, port);
|
||||
listener
|
||||
}
|
||||
Err(e) => {
|
||||
error_panic!(
|
||||
"failed to start server on {}:{}: {}",
|
||||
default_value::HOST,
|
||||
port,
|
||||
e.to_string()
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
for module in &self.modules {
|
||||
let _ = scheduler.insert_list(module.get_cron_tasks());
|
||||
app = app.nest(module.get_mount_point(), module.get_server_router());
|
||||
}
|
||||
|
||||
tokio::spawn(async move {
|
||||
scheduler.start().await;
|
||||
});
|
||||
|
||||
axum::serve(listener, app).await.unwrap_or_else(|e| {
|
||||
error_panic!("failed to start axum: {}", e.to_string());
|
||||
});
|
||||
}
|
||||
}
|
||||
+9
-4
@@ -1,8 +1,13 @@
|
||||
use crate::scheduler::scheduler_error::SchedulerError::MutexPoison;
|
||||
use std::error::Error;
|
||||
use std::fmt::{Debug, Display, Formatter};
|
||||
use std::sync::PoisonError;
|
||||
use std::{
|
||||
error::Error,
|
||||
fmt::{Debug, Display, Formatter},
|
||||
sync::PoisonError,
|
||||
};
|
||||
|
||||
use crate::scheduler::error::SchedulerError::MutexPoison;
|
||||
|
||||
// todo: refactor with thiserror
|
||||
#[allow(dead_code)]
|
||||
pub enum SchedulerError {
|
||||
IdNotFound,
|
||||
IdAlreadyRunning,
|
||||
@@ -0,0 +1,54 @@
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
|
||||
use crate::scheduler::{error::SchedulerError, tasks::CronTask, utils::execute};
|
||||
|
||||
use futures::future::join_all;
|
||||
use tracing::warn;
|
||||
|
||||
pub mod error;
|
||||
pub mod task_func;
|
||||
pub mod tasks;
|
||||
mod utils;
|
||||
|
||||
pub type TaskPool = HashMap<String, Arc<Box<dyn CronTask>>>;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Scheduler {
|
||||
task_pool: TaskPool,
|
||||
}
|
||||
|
||||
impl Scheduler {
|
||||
/// Start all tasks in the scheduler
|
||||
pub async fn start(&self) {
|
||||
let fut = self
|
||||
.task_pool
|
||||
.clone()
|
||||
.into_iter()
|
||||
.map(|(name, task)| execute(name, task))
|
||||
.collect::<Vec<_>>();
|
||||
// self.runner.run_all().await
|
||||
join_all(fut).await;
|
||||
}
|
||||
|
||||
pub fn insert(&mut self, task: (&str, Box<dyn CronTask>)) -> Result<&Self, SchedulerError> {
|
||||
let (k, v) = task;
|
||||
if self.task_pool.insert(k.into(), v.into()).is_some() {
|
||||
warn!("task list duplicated key detected: {}", k);
|
||||
}
|
||||
Ok(self)
|
||||
}
|
||||
|
||||
pub fn insert_list(
|
||||
&mut self,
|
||||
tasks: Vec<(&str, Box<dyn CronTask>)>,
|
||||
) -> Result<&Self, SchedulerError> {
|
||||
for task in tasks {
|
||||
self.insert(task)?;
|
||||
}
|
||||
Ok(self)
|
||||
}
|
||||
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
use std::pin::Pin;
|
||||
|
||||
pub trait TaskFunc: Fn() + Send + Sync + 'static {}
|
||||
|
||||
impl<T> TaskFunc for T where T: Fn() + Send + Sync + Clone + 'static {}
|
||||
|
||||
pub trait AsyncTaskFunc:
|
||||
Fn() -> Pin<Box<dyn Future<Output = ()> + Send>> + Send + Sync + 'static
|
||||
{
|
||||
}
|
||||
|
||||
impl<T> AsyncTaskFunc for T where
|
||||
T: Fn() -> Pin<Box<dyn Future<Output = ()> + Send>> + Send + Sync + Clone + 'static
|
||||
{
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
use std::{error::Error, pin::Pin, str::FromStr};
|
||||
|
||||
use crate::{scheduler::task_func::AsyncTaskFunc, scheduler::tasks::CronTask};
|
||||
|
||||
use chrono::{DateTime, Utc};
|
||||
use cron::Schedule;
|
||||
|
||||
pub struct AsyncBasic {
|
||||
schedule: Schedule,
|
||||
func: Box<dyn AsyncTaskFunc>,
|
||||
}
|
||||
|
||||
impl AsyncBasic {
|
||||
pub fn new<F>(func: F, cron_expr: &str) -> Result<Self, Box<dyn Error>>
|
||||
where
|
||||
F: AsyncTaskFunc,
|
||||
{
|
||||
Ok(AsyncBasic {
|
||||
schedule: Schedule::from_str(cron_expr)?,
|
||||
func: Box::new(func),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn to_task(self) -> Box<dyn CronTask> {
|
||||
Box::new(self)
|
||||
}
|
||||
}
|
||||
|
||||
impl CronTask for AsyncBasic {
|
||||
fn get_next_execution(&self) -> Option<DateTime<Utc>> {
|
||||
self.schedule.upcoming(Utc).next()
|
||||
}
|
||||
|
||||
fn call(&self) -> Pin<Box<(dyn Future<Output = ()> + Send)>> {
|
||||
Box::pin((self.func)())
|
||||
}
|
||||
}
|
||||
+8
-8
@@ -1,9 +1,9 @@
|
||||
use crate::scheduler::task_func::TaskFunc;
|
||||
use crate::scheduler::tasks::Task;
|
||||
use std::{error::Error, pin::Pin, str::FromStr};
|
||||
|
||||
use crate::scheduler::{task_func::TaskFunc, tasks::CronTask};
|
||||
|
||||
use chrono::{DateTime, Utc};
|
||||
use cron::Schedule;
|
||||
use std::error::Error;
|
||||
use std::str::FromStr;
|
||||
|
||||
pub struct BasicTask {
|
||||
schedule: Schedule,
|
||||
@@ -21,17 +21,17 @@ impl BasicTask {
|
||||
})
|
||||
}
|
||||
|
||||
pub fn to_task(self) -> Box<dyn Task> {
|
||||
pub fn to_task(self) -> Box<dyn CronTask> {
|
||||
Box::new(self)
|
||||
}
|
||||
}
|
||||
|
||||
impl Task for BasicTask {
|
||||
impl CronTask for BasicTask {
|
||||
fn get_next_execution(&self) -> Option<DateTime<Utc>> {
|
||||
self.schedule.upcoming(Utc).next()
|
||||
}
|
||||
|
||||
fn call(&self) {
|
||||
(self.func)()
|
||||
fn call(&self) -> Pin<Box<dyn Future<Output = ()> + Send + '_>> {
|
||||
Box::pin(async { (self.func)() })
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
use std::pin::Pin;
|
||||
|
||||
use chrono::{DateTime, Utc};
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub mod async_basic;
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub mod basic;
|
||||
|
||||
pub trait CronTask: Send + Sync {
|
||||
fn get_next_execution(&self) -> Option<DateTime<Utc>>;
|
||||
fn call(&self) -> Pin<Box<dyn Future<Output = ()> + Send + '_>>;
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
use std::{sync::Arc, time::Duration};
|
||||
|
||||
use crate::scheduler::{error::SchedulerError, tasks::CronTask};
|
||||
|
||||
use chrono::{DateTime, Utc};
|
||||
use tokio::time::{Sleep, sleep};
|
||||
|
||||
pub fn duration_from_now(future: DateTime<Utc>) -> Duration {
|
||||
future
|
||||
.signed_duration_since(Utc::now())
|
||||
.to_std()
|
||||
.unwrap_or(Duration::ZERO)
|
||||
}
|
||||
|
||||
pub fn sleeper_from_now(future: DateTime<Utc>) -> Sleep {
|
||||
sleep(duration_from_now(future))
|
||||
}
|
||||
|
||||
#[allow(unused_variables)]
|
||||
pub async fn execute(name: String, func: Arc<Box<dyn CronTask>>) -> Result<(), SchedulerError> {
|
||||
// todo: stats
|
||||
while let Some(next_execution) = func.get_next_execution() {
|
||||
let sleeper = sleeper_from_now(next_execution);
|
||||
tokio::pin!(sleeper);
|
||||
tokio::select! {
|
||||
_ = sleeper => {
|
||||
func.call().await
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
use axum::{
|
||||
http::{StatusCode, header::CONTENT_TYPE},
|
||||
response::Response,
|
||||
};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
#[macro_export]
|
||||
macro_rules! err_resp_log {
|
||||
($code:expr, $msg:expr) => {{
|
||||
use tracing::error;
|
||||
use $crate::utils::axum_response::err_resp;
|
||||
|
||||
error!("{}", $msg);
|
||||
err_resp($code, $msg, None)
|
||||
}};
|
||||
($code:expr, $msg:expr, $body:expr) => {{
|
||||
use tracing::error;
|
||||
use $crate::utils::axum_response::err_resp;
|
||||
|
||||
error!("{}", $msg);
|
||||
err_resp($code, $msg, Some($body))
|
||||
}};
|
||||
}
|
||||
|
||||
pub fn err_resp(code: StatusCode, err_msg: &str, body: Option<Value>) -> Response<String> {
|
||||
let mut payload = json!({
|
||||
"status": "error",
|
||||
"msg": err_msg,
|
||||
});
|
||||
if let Some(body) = body {
|
||||
payload["data"] = body;
|
||||
}
|
||||
|
||||
resp_json(code, payload)
|
||||
}
|
||||
|
||||
pub fn succ_resp(code: StatusCode, payload: Value) -> Response<String> {
|
||||
let payload = json!({
|
||||
"status": "success",
|
||||
"data": payload
|
||||
});
|
||||
resp_json(code, payload)
|
||||
}
|
||||
|
||||
pub fn resp_json(code: StatusCode, payload: Value) -> Response<String> {
|
||||
Response::builder()
|
||||
.status(code)
|
||||
.header(CONTENT_TYPE, "application/json")
|
||||
.body(payload.to_string())
|
||||
.unwrap()
|
||||
}
|
||||
@@ -1,14 +1,13 @@
|
||||
/// git merge
|
||||
/// git operations
|
||||
/// based on https://github.com/rust-lang/git2-rs/blob/master/examples/pull.rs
|
||||
/// https://github.com/rust-lang/git2-rs/commit/f3b87baed1e33d6c2d94fe1fa6aa6503a071d837
|
||||
///
|
||||
use git2::{
|
||||
build, AnnotatedCommit, AutotagOption, Delta, FetchOptions, Reference, Remote, Repository,
|
||||
AnnotatedCommit, AutotagOption, Delta, FetchOptions, Reference, Remote, Repository, build,
|
||||
};
|
||||
use std::path::PathBuf;
|
||||
use tracing::{error, warn};
|
||||
|
||||
|
||||
#[derive(Debug, Eq, PartialEq)]
|
||||
pub struct FileDelta {
|
||||
pub old_path: Option<PathBuf>,
|
||||
@@ -16,15 +15,13 @@ pub struct FileDelta {
|
||||
pub status: Delta,
|
||||
}
|
||||
|
||||
fn do_fetch<'a>(
|
||||
pub fn do_fetch<'a>(
|
||||
repo: &'a Repository,
|
||||
refs: &[&str],
|
||||
remote: &'a mut Remote,
|
||||
) -> Result<AnnotatedCommit<'a>, git2::Error> {
|
||||
let mut fetch_option = FetchOptions::new();
|
||||
|
||||
// Always fetch all tags.
|
||||
// Perform a download and also update tips
|
||||
fetch_option.download_tags(AutotagOption::All);
|
||||
remote.fetch(refs, Some(&mut fetch_option), None)?;
|
||||
|
||||
@@ -42,16 +39,9 @@ fn fast_forward(
|
||||
None => String::from_utf8_lossy(lb.name_bytes()).to_string(),
|
||||
};
|
||||
let msg = format!("fast-forward({}) -> {}", name, rc.id());
|
||||
// println!("{}", msg);
|
||||
lb.set_target(rc.id(), &msg)?;
|
||||
repo.set_head(&name)?;
|
||||
repo.checkout_head(Some(
|
||||
build::CheckoutBuilder::default()
|
||||
// For some reason, the force is required to make the working directory actually get updated
|
||||
// I suspect we should be adding some logic to handle dirty working directory states,
|
||||
// but this is just an example so maybe not.
|
||||
.force(),
|
||||
))?;
|
||||
repo.checkout_head(Some(build::CheckoutBuilder::default().force()))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -73,13 +63,12 @@ fn normal_merge(
|
||||
return Ok(());
|
||||
}
|
||||
let result_tree = repo.find_tree(idx.write_tree_to(repo)?)?;
|
||||
// now create the merge commit
|
||||
|
||||
let msg = format!("merge({}) -> {}", remote.id(), local.id());
|
||||
let sig = repo.signature()?;
|
||||
let local_commit = repo.find_commit(local.id())?;
|
||||
let remote_commit = repo.find_commit(remote.id())?;
|
||||
|
||||
// Do our merge commit and set the current branch head to that commit.
|
||||
let _merge_commit = repo.commit(
|
||||
Some("HEAD"),
|
||||
&sig,
|
||||
@@ -88,34 +77,25 @@ fn normal_merge(
|
||||
&result_tree,
|
||||
&[&local_commit, &remote_commit],
|
||||
)?;
|
||||
// Set working tree to match head.
|
||||
repo.checkout_head(None)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn do_merge<'a>(
|
||||
pub fn do_merge<'a>(
|
||||
repo: &'a Repository,
|
||||
remote_branch: &str,
|
||||
fetch_commit: AnnotatedCommit<'a>,
|
||||
) -> Result<Vec<FileDelta>, git2::Error> {
|
||||
// 1. do a merge analysis
|
||||
) -> Result<(), git2::Error> {
|
||||
let analysis = repo.merge_analysis(&[&fetch_commit])?;
|
||||
|
||||
let head_commit = repo.reference_to_annotated_commit(&repo.head()?)?;
|
||||
|
||||
// 2. Do the appropriate merge
|
||||
if analysis.0.is_fast_forward() {
|
||||
// println!("Doing a fast-forward");
|
||||
// do a fast-forward
|
||||
let ref_name = format!("refs/heads/{}", remote_branch);
|
||||
match repo.find_reference(&ref_name) {
|
||||
Ok(mut r) => {
|
||||
fast_forward(repo, &mut r, &fetch_commit)?;
|
||||
}
|
||||
Err(_) => {
|
||||
// The branch doesn't exist, so set the reference to the
|
||||
// commit directly. Usually this is because you are pulling
|
||||
// into an empty repository.
|
||||
repo.reference(
|
||||
&ref_name,
|
||||
fetch_commit.id(),
|
||||
@@ -132,18 +112,13 @@ fn do_merge<'a>(
|
||||
}
|
||||
};
|
||||
} else if analysis.0.is_normal() {
|
||||
// do a normal merge
|
||||
normal_merge(repo, &head_commit, &fetch_commit)?;
|
||||
}
|
||||
// else {
|
||||
// // already up-to-date
|
||||
// println!("Nothing to do...");
|
||||
// }
|
||||
|
||||
calculate_diff(repo, &head_commit, &fetch_commit)
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn calculate_diff(
|
||||
pub fn calculate_diff(
|
||||
repo: &Repository,
|
||||
local: &AnnotatedCommit,
|
||||
remote: &AnnotatedCommit,
|
||||
@@ -156,23 +131,12 @@ fn calculate_diff(
|
||||
|
||||
if let Err(e) = diff.foreach(
|
||||
&mut |d, _| {
|
||||
// let delta = d.status();
|
||||
//
|
||||
// let n_path = d.new_file().path();
|
||||
// let o_path = d.old_file().path();
|
||||
//
|
||||
// if let Some(path) = n_path {
|
||||
// updated_files.insert(path.to_owned());
|
||||
// }
|
||||
// if let Some(path) = o_path {
|
||||
// updated_files.insert(path.to_owned());
|
||||
// }
|
||||
updated_files.push(FileDelta {
|
||||
old_path: d.old_file().path().map(PathBuf::from),
|
||||
new_path: d.new_file().path().map(PathBuf::from),
|
||||
status: d.status(),
|
||||
});
|
||||
true // Continue
|
||||
true
|
||||
},
|
||||
None,
|
||||
None,
|
||||
@@ -184,6 +148,7 @@ fn calculate_diff(
|
||||
Ok(updated_files.into_iter().collect())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn sync(
|
||||
remote_name: &str,
|
||||
remote_branch: &str,
|
||||
@@ -191,5 +156,11 @@ pub fn sync(
|
||||
) -> Result<Vec<FileDelta>, git2::Error> {
|
||||
let mut remote = repo.find_remote(remote_name)?;
|
||||
let fetch_commit = do_fetch(repo, &[remote_branch], &mut remote)?;
|
||||
do_merge(repo, remote_branch, fetch_commit)
|
||||
let delta = calculate_diff(
|
||||
repo,
|
||||
&repo.reference_to_annotated_commit(&repo.head()?)?,
|
||||
&fetch_commit,
|
||||
);
|
||||
do_merge(repo, remote_branch, fetch_commit)?;
|
||||
delta
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
pub mod axum_response;
|
||||
pub mod git;
|
||||
@@ -0,0 +1,12 @@
|
||||
.venv/
|
||||
|
||||
.idea/
|
||||
|
||||
.DS_store
|
||||
|
||||
__pycache__
|
||||
|
||||
.cache
|
||||
|
||||
content/*
|
||||
/content/
|
||||
@@ -0,0 +1,30 @@
|
||||
## Module Structure
|
||||
|
||||
```shell
|
||||
.
|
||||
├── README.md
|
||||
├── cli
|
||||
├── content
|
||||
│ ├── pages
|
||||
│ │ └── about
|
||||
│ │ └── <static_page>.md
|
||||
│ └── posts
|
||||
│ └── <year>
|
||||
│ └── <identifier>
|
||||
│ ├── assets
|
||||
│ │ └── <assets>
|
||||
│ ├── translate_<lang>.md
|
||||
│ └── index.md
|
||||
├── requirements.txt
|
||||
├── templates
|
||||
│ ├── <template>.py
|
||||
│ └── ...
|
||||
└── utils
|
||||
└── ...
|
||||
```
|
||||
|
||||
### About `posts`
|
||||
|
||||
- Will render to `https://<DOMAIN>/blog/post/<identifier>`.
|
||||
- Files under `assets/` (where images etc. located) should be pushed to OSS.
|
||||
- For identifiers, use prefix `-` to indicate private (hidden) visibility. EX: `-hello-world`.
|
||||
Executable
+27
@@ -0,0 +1,27 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import argparse
|
||||
|
||||
import rich
|
||||
|
||||
from templates.post import BlogPost
|
||||
from utils.cache import init_cache
|
||||
from utils.index import build_post_idx
|
||||
|
||||
|
||||
def main():
|
||||
# if args.new:
|
||||
# new_post()
|
||||
init_cache()
|
||||
build_post_idx()
|
||||
bp = BlogPost()
|
||||
bp.init()
|
||||
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("-n", "--new", help="Create a post with build-in template", type=str)
|
||||
args = parser.parse_args(namespace=rich)
|
||||
# todo: cli
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,4 @@
|
||||
rich~=13.9.4
|
||||
prompt_toolkit~=3.0.50
|
||||
pypinyin~=0.53.0
|
||||
python-frontmatter~=1.1.0
|
||||
@@ -0,0 +1,88 @@
|
||||
import uuid
|
||||
from datetime import date
|
||||
from datetime import datetime as dt
|
||||
from typing import Dict, Optional
|
||||
|
||||
from templates.utils import Template, create_all_files
|
||||
from utils.autocompletion import input_autocompletion, fuzzy_pinyin_matcher
|
||||
from utils.cache import get_tags_cache, get_categories_cache
|
||||
from utils.lang import eprint, wprint
|
||||
|
||||
POST_TEMPLATE = '''
|
||||
---
|
||||
id: {{ id }}
|
||||
title: {{ title }}
|
||||
subtitle: {{ subtitle }}
|
||||
status: {{ status }}
|
||||
date: {{ date }}
|
||||
update: {{ update }}
|
||||
category: {{ category }}
|
||||
tags: {{ tags }}
|
||||
---
|
||||
|
||||
WIP
|
||||
|
||||
'''
|
||||
|
||||
|
||||
def get_title():
|
||||
while True:
|
||||
i = input("title > ")
|
||||
if i.strip() == "":
|
||||
eprint("empty title")
|
||||
continue
|
||||
else:
|
||||
return i.strip()
|
||||
|
||||
|
||||
def get_subtitle():
|
||||
return input("subtitle > ")
|
||||
|
||||
|
||||
def get_date():
|
||||
while True:
|
||||
d = input("date (YYYY-MM-DD) > ")
|
||||
if d == "":
|
||||
wprint("using today's date")
|
||||
return dt.today().strftime("%Y-%m-%d")
|
||||
else:
|
||||
try:
|
||||
_validate = dt.strptime(d, "%Y-%m-%d")
|
||||
return d
|
||||
except ValueError:
|
||||
eprint("invalid date")
|
||||
continue
|
||||
|
||||
|
||||
def get_tags():
|
||||
# todo: multi tags support
|
||||
return input_autocompletion("tags > ", get_tags_cache(), fuzzy_pinyin_matcher)
|
||||
|
||||
|
||||
def get_category():
|
||||
while True:
|
||||
i = input_autocompletion("category > ", get_categories_cache(), fuzzy_pinyin_matcher)
|
||||
if i.strip() == "":
|
||||
eprint("empty category")
|
||||
continue
|
||||
else:
|
||||
return i.strip()
|
||||
|
||||
|
||||
class BlogPost(Template):
|
||||
WORK_PATH: str = "content/posts/{year}/{identifier}/"
|
||||
ITEMS: Dict[str, Optional[str]] = {"index.md": POST_TEMPLATE, "assets/": None}
|
||||
|
||||
def init(self):
|
||||
year = date.today().year
|
||||
|
||||
index_md = POST_TEMPLATE.format(
|
||||
title=get_title(),
|
||||
subtitle=get_subtitle(),
|
||||
date=get_date(),
|
||||
update=dt.today().strftime("%Y-%m-%d"),
|
||||
tags=get_tags(),
|
||||
category=get_category(),
|
||||
id=uuid.uuid4()
|
||||
)
|
||||
create_all_files(self.WORK_PATH.format(year=year, identifier="test"), self.ITEMS)
|
||||
@@ -0,0 +1,17 @@
|
||||
import os
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Dict, Optional
|
||||
|
||||
|
||||
class Template(ABC):
|
||||
@abstractmethod
|
||||
def init(self):
|
||||
pass
|
||||
|
||||
|
||||
def create_all_files(relative_work_path: str, items: Dict[str, Optional[str]]):
|
||||
absolute_path = os.path.abspath(relative_work_path)
|
||||
for item in items:
|
||||
if item.endswith("/"):
|
||||
print(absolute_path + item)
|
||||
# todo: create files
|
||||
@@ -0,0 +1,31 @@
|
||||
class Ansi:
|
||||
HEADER = '\033[95m'
|
||||
BLUE = '\033[94m'
|
||||
GREEN = '\033[92m'
|
||||
WARNING = '\033[93m'
|
||||
FAIL = '\033[91m'
|
||||
BOLD = '\033[1m'
|
||||
UNDERLINE = '\033[4m'
|
||||
END = '\033[0m'
|
||||
|
||||
def disable(self) -> None:
|
||||
self.HEADER = ''
|
||||
self.BLUE = ''
|
||||
self.GREEN = ''
|
||||
self.WARNING = ''
|
||||
self.FAIL = ''
|
||||
self.BOLD = ''
|
||||
self.UNDERLINE = ''
|
||||
self.END = ''
|
||||
|
||||
@staticmethod
|
||||
def blend(color: list[str], text: str) -> str:
|
||||
return f"{"".join(color)}{text}{Ansi.END}"
|
||||
|
||||
@staticmethod
|
||||
def bold(text: str) -> str:
|
||||
return f"{Ansi.BOLD}{text}{Ansi.END}"
|
||||
|
||||
@staticmethod
|
||||
def underline(text: str) -> str:
|
||||
return f"{Ansi.UNDERLINE}{text}{Ansi.END}"
|
||||
@@ -0,0 +1,46 @@
|
||||
from collections.abc import Callable
|
||||
from typing import List, Iterable
|
||||
|
||||
import prompt_toolkit
|
||||
from prompt_toolkit.completion import Completer, CompleteEvent, Completion
|
||||
from prompt_toolkit.document import Document
|
||||
from pypinyin import lazy_pinyin, Style
|
||||
|
||||
|
||||
class AutoCompleter(Completer):
|
||||
def __init__(self, candidates: List[str], matching_algorithm: Callable[[str, str], bool]):
|
||||
self.candidates = candidates
|
||||
self.matching_algorithm = matching_algorithm
|
||||
|
||||
def get_completions(self, document: Document, complete_event: CompleteEvent) -> Iterable[Completion]:
|
||||
curr_word = document.text_before_cursor
|
||||
for c in self.candidates:
|
||||
if self.matching_algorithm(curr_word, c):
|
||||
yield Completion(c, start_position=-len(curr_word))
|
||||
|
||||
|
||||
def exact_matcher(word: str, candidate: str, case_sensitive: bool = False) -> bool:
|
||||
if case_sensitive:
|
||||
return word == candidate
|
||||
else:
|
||||
return word.lower() == candidate.lower()
|
||||
|
||||
|
||||
def fuzzy_matcher(word: str, candidate: str) -> bool:
|
||||
return word.lower() in candidate.lower()
|
||||
|
||||
|
||||
def fuzzy_pinyin_matcher(word: str, candidate: str) -> bool:
|
||||
try:
|
||||
word_matcher = ''.join(lazy_pinyin(word, style=Style.NORMAL))
|
||||
candidate_matcher = ''.join(lazy_pinyin(candidate, style=Style.NORMAL))
|
||||
return candidate_matcher.startswith(word_matcher)
|
||||
|
||||
except e:
|
||||
return fuzzy_matcher(word, candidate)
|
||||
|
||||
|
||||
def input_autocompletion(prompt: str, candidates: List[str],
|
||||
matching_algorithm: Callable[[str, str], bool] = exact_matcher) -> str:
|
||||
completer = AutoCompleter(candidates, matching_algorithm)
|
||||
return prompt_toolkit.prompt(prompt, completer=completer, complete_in_thread=True)
|
||||
@@ -0,0 +1,49 @@
|
||||
import json
|
||||
import os
|
||||
from typing import TextIO
|
||||
|
||||
CACHE_DIR = ".cache"
|
||||
ITEMS = {"register": "register.json"}
|
||||
|
||||
|
||||
def overwrite_json_file(file: TextIO, json_data: dict):
|
||||
file.seek(0)
|
||||
file.write(json.dumps(json_data, indent=4, ensure_ascii=False))
|
||||
file.truncate()
|
||||
|
||||
|
||||
def init_cache():
|
||||
if not os.path.exists(CACHE_DIR):
|
||||
os.makedirs(CACHE_DIR)
|
||||
for item in ITEMS.values():
|
||||
item_path = os.path.join(CACHE_DIR, item)
|
||||
if not os.path.exists(item_path):
|
||||
with open(item_path, 'w') as cache_file:
|
||||
match item:
|
||||
case "register.json":
|
||||
overwrite_json_file(cache_file, {})
|
||||
break
|
||||
|
||||
|
||||
def write_tags_cache(tags: list[str]):
|
||||
with open(os.path.join(CACHE_DIR, ITEMS["register"]), 'r+') as tags_cache_file:
|
||||
cache = json.load(tags_cache_file)
|
||||
cache["tags"] = tags
|
||||
overwrite_json_file(tags_cache_file, cache)
|
||||
|
||||
|
||||
def write_category_cache(categories: list[str]):
|
||||
with open(os.path.join(CACHE_DIR, ITEMS["register"]), 'r+') as categories_cache_file:
|
||||
cache = json.load(categories_cache_file)
|
||||
cache["categories"] = categories
|
||||
overwrite_json_file(categories_cache_file, cache)
|
||||
|
||||
|
||||
def get_tags_cache() -> list[str]:
|
||||
with open(os.path.join(CACHE_DIR, ITEMS["register"]), 'r') as tags_cache_file:
|
||||
return json.load(tags_cache_file)["tags"]
|
||||
|
||||
|
||||
def get_categories_cache() -> list[str]:
|
||||
with open(os.path.join(CACHE_DIR, ITEMS["register"]), 'r') as categories_cache_file:
|
||||
return json.load(categories_cache_file)["categories"]
|
||||
@@ -0,0 +1,27 @@
|
||||
import os
|
||||
|
||||
import frontmatter
|
||||
|
||||
from utils.cache import write_tags_cache, write_category_cache
|
||||
from utils.lang import list_exclude
|
||||
|
||||
EXCLUDE = [".DS_Store"]
|
||||
POSTS_DIR = "content/posts"
|
||||
|
||||
|
||||
def build_post_idx():
|
||||
tags = set()
|
||||
categories = set()
|
||||
for year in list_exclude(os.listdir(POSTS_DIR), EXCLUDE):
|
||||
for post_dir in list_exclude(os.listdir(os.path.join(POSTS_DIR, year)), EXCLUDE):
|
||||
target_file = os.path.join(POSTS_DIR, year, post_dir, "index.md")
|
||||
with open(target_file, "r") as f:
|
||||
post = frontmatter.loads(f.read())
|
||||
try:
|
||||
for tag in post.metadata["tags"]:
|
||||
tags.add(tag)
|
||||
categories.add(post.metadata["category"])
|
||||
except KeyError:
|
||||
print(f"failed to parse {target_file}")
|
||||
write_tags_cache(list(tags))
|
||||
write_category_cache(list(categories))
|
||||
@@ -0,0 +1,13 @@
|
||||
from utils.ansi import Ansi
|
||||
|
||||
|
||||
def list_exclude(source: list, exclude: list):
|
||||
return filter(lambda item: item not in exclude, source)
|
||||
|
||||
|
||||
def eprint(msg: str):
|
||||
print(Ansi.blend([Ansi.FAIL], "error: ") + msg)
|
||||
|
||||
|
||||
def wprint(msg: str):
|
||||
print(Ansi.blend([Ansi.WARNING], "warn: ") + msg)
|
||||
Loaded 100 of 158 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user