jutty/en
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Reorganize module structure

Browse source
This commit is contained in:
Juno Takano 2025-12-24 12:45:14 -03:00
commit 14dc84cc43
14 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib.rs
View file

@ -4,10 +4,8 @@ pub mod prelude {
pub use crate::log;
}
pub mod formats;
pub mod types;
pub mod router;
pub mod handlers;
pub mod syntax;
pub mod dev;

4
src/main.rs
View file

@ -1,10 +1,10 @@
use std::{backtrace, io, panic};
use en::{prelude::*, ONSET, formats::populate_graph, syntax};
use en::{prelude::*, ONSET, syntax::serial::populate_graph, syntax};
#[tokio::main]
async fn main() -> io::Result<()> {
let args = syntax::arguments::Arguments::new().parse();
let args = syntax::command::Arguments::new().parse();
let address = args.make_address();
panic::set_hook(Box::new(|info| {

4
src/router.rs
View file

@ -1,6 +1,8 @@
use axum::{routing::get, Router};
use crate::{formats::Format, handlers, types::Graph};
use crate::{syntax::serial::Format, types::Graph};
mod handlers;
pub fn new(graph: &Graph) -> Router {
let mut router = Router::new()

0
src/handlers.rs → src/router/handlers.rs
View file

4
src/handlers/error.rs → src/router/handlers/error.rs
View file

@ -3,9 +3,9 @@ use axum::{
http::{Response, StatusCode, header},
};
use crate::{formats::populate_graph, handlers};
use crate::{syntax::serial::populate_graph, router::handlers};
pub(in crate::handlers) fn by_code(
pub(in crate::router::handlers) fn by_code(
code: Option<u16>,
message: Option<&str>,
) -> Response<Body> {

4
src/handlers/fixed.rs → src/router/handlers/fixed.rs
View file

@ -5,9 +5,9 @@ use axum::{
use crate::prelude::*;
use crate::{
formats::{Format, populate_graph, serialize_graph},
router::handlers,
syntax::serial::{Format, populate_graph, serialize_graph},
};
use crate::handlers;
/// # Panics
/// Will panic if file read fails.

2
src/handlers/graph.rs → src/router/handlers/graph.rs
View file

@ -3,7 +3,7 @@ use axum::{body::Body, extract::Path, http::Response, response::Redirect};
use crate::syntax::content;
use crate::{formats::populate_graph, handlers, types::Node};
use crate::{syntax::serial::populate_graph, router::handlers, types::Node};
pub async fn node(Path(id): Path<String>) -> Response<Body> {
let graph = populate_graph();

2
src/handlers/navigation.rs → src/router/handlers/navigation.rs
View file

@ -5,7 +5,7 @@ use axum::{
Form,
};
use crate::{formats::populate_graph, handlers, types::Node};
use crate::{syntax::serial::populate_graph, router::handlers, types::Node};
#[expect(clippy::unused_async)]
pub async fn page(template: &str) -> Response<Body> {

2
src/handlers/raw.rs → src/router/handlers/raw.rs
View file

@ -5,7 +5,7 @@ use axum::{
use crate::prelude::*;
pub(in crate::handlers) fn make_response(
pub(in crate::router::handlers) fn make_response(
body: &str,
status_code: u16,
headers: &[(header::HeaderName, &str)],

11
src/handlers/template.rs → src/router/handlers/template.rs
View file

@ -3,9 +3,9 @@ use axum::{
http::{header, Response, StatusCode},
};
use crate::{prelude::*, handlers::raw::make_response};
use crate::{prelude::*, router::handlers::raw::make_response};
pub(in crate::handlers) fn by_filename(
pub(in crate::router::handlers) fn by_filename(
name: &str,
context: &tera::Context,
error_code: u16,
@ -19,12 +19,7 @@ pub(in crate::handlers) fn by_filename(
make_response(&body, status_code, &[(header::CONTENT_TYPE, "text/html")])
}
#[expect(clippy::unused_async)]
pub async fn fixed(name: &str) -> Response<Body> {
by_filename(name, &tera::Context::new(), 500, None, false)
}
pub(in crate::handlers) fn render(
pub(in crate::router::handlers) fn render(
name: &str,
// TODO take Option, skip context if None,
// then template_handler can replace static_template_handler

3
src/syntax.rs
View file

@ -1,2 +1,3 @@
pub mod arguments;
pub mod command;
pub mod content;
pub mod serial;

0
src/syntax/arguments.rs → src/syntax/command.rs
View file

2
src/syntax/content/parser.rs
View file

@ -1,6 +1,6 @@
use std::collections::{HashMap};
use crate::{formats::populate_graph, types::Config};
use crate::{syntax::serial::populate_graph, types::Config};
use super::{Parseable as _, Token, LexMap};
use token::{
anchor::Anchor, linebreak::LineBreak, paragraph::Paragraph, header::Header,

2
src/formats.rs → src/syntax/serial.rs
View file

@ -1,7 +1,7 @@
use std::collections::HashMap;
use crate::{
syntax::arguments::Arguments,
syntax::command::Arguments,
types::{Edge, Graph, Node},
};