Anri/mylloon.fr
1
0
Fork 0
Code Issues 21 Pull requests 2 Releases Packages 1 Activity Actions

Basic cours support #44

Merged
Anri merged 67 commits from cours into main 2024-04-01 18:11:49 +02:00
Conversation 2 Commits 67 Files changed 32 +590 -154
4 changed files with 590 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3c46774463 - Show all commits

725
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

12
Cargo.toml
View file

@ -10,20 +10,20 @@ publish = false
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
[dependencies] [dependencies]
actix-web = { version = "4.4", default-features = false, features = ["macros", "compress-brotli"] } actix-web = { version = "4.5", default-features = false, features = ["macros", "compress-brotli"] }
actix-files = "0.6" actix-files = "0.6"
cached = { version = "0.49", features = ["async"] } cached = { version = "0.49", features = ["async"] }
ramhorns = "0.14" ramhorns = "1.0"
toml = "0.8" toml = "0.8"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_yaml = "0.9" serde_yml = "0.0.2"
serde_json = "1.0" serde_json = "1.0"
minify-html = "0.15" minify-html = "0.15"
minify-js = "0.6" minify-js = "0.6"
glob = "0.3" glob = "0.3"
comrak = "0.21" comrak = "0.22"
reqwest = { version = "0.11", features = ["json"] } reqwest = { version = "0.12", features = ["json"] }
chrono = { version = "0.4.30", default-features = false, features = ["clock"]} chrono = { version = "0.4", default-features = false, features = ["clock"]}
chrono-tz = "0.8" chrono-tz = "0.8"
rss = { version = "2.0", features = ["atom"] } rss = { version = "2.0", features = ["atom"] }
lol_html = "1.2" lol_html = "1.2"

4
src/misc/markdown.rs
View file

@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for Tag {
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
match <&str>::deserialize(deserializer) { match <&str>::deserialize(deserializer) {
Ok(s) => match serde_yaml::from_str(s) { Ok(s) => match serde_yml::from_str(s) {
Ok(tag) => Ok(Self { name: tag }), Ok(tag) => Ok(Self { name: tag }),
Err(e) => Err(serde::de::Error::custom(e)), Err(e) => Err(serde::de::Error::custom(e)),
}, },
@ -228,7 +228,7 @@ pub fn read_file(filename: &str, expected_file: TypeFileMetadata) -> Option<File
/// Deserialize metadata based on a type /// Deserialize metadata based on a type
fn deserialize_metadata<T: Default + serde::de::DeserializeOwned>(text: &str) -> T { fn deserialize_metadata<T: Default + serde::de::DeserializeOwned>(text: &str) -> T {
serde_yaml::from_str(text.trim().trim_matches(&['-'] as &[_])).unwrap_or_default() serde_yml::from_str(text.trim().trim_matches(&['-'] as &[_])).unwrap_or_default()
} }
/// Fetch metadata from AST /// Fetch metadata from AST

3
src/misc/utils.rs
View file

@ -1,9 +1,10 @@
use actix_web::{ use actix_web::{
http::header::{self, ContentType, TryIntoHeaderValue}, http::header::{self, ContentType, TryIntoHeaderValue},
http::StatusCode,
HttpRequest, HttpResponse, Responder, HttpRequest, HttpResponse, Responder,
}; };
use cached::proc_macro::cached; use cached::proc_macro::cached;
use reqwest::{Client, StatusCode}; use reqwest::Client;
use crate::config::FileConfig; use crate::config::FileConfig;