Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use extension trait for resolving paths

Browse source
This commit is contained in:
Joscha 2024-05-12 14:52:23 +02:00
parent 5409e176b1
commit cf96b72dfb
10 changed files with 88 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/server/web/base.rs
View file

@ -1,5 +1,3 @@
use std::fmt;
use maud::{html, Markup, DOCTYPE};
use crate::config::ServerConfig;
@ -7,6 +5,7 @@ use crate::config::ServerConfig;
use super::{
paths::{PathGraph, PathIndex, PathQueue},
r#static::{BASE_CSS, LOGO_SVG},
server_config_ext::{AbsPath, ServerConfigExt},
};
pub enum Tab {
@ -18,18 +17,17 @@ pub enum Tab {
#[derive(Clone)]
pub struct Base {
pub link_logo_svg: Link,
pub link_base_css: Link,
pub link_index: Link,
pub link_graph: Link,
pub link_queue: Link,
pub web_base: String,
pub repo_name: String,
pub link_logo_svg: AbsPath,
pub link_base_css: AbsPath,
pub link_index: AbsPath,
pub link_graph: AbsPath,
pub link_queue: AbsPath,
pub config: &'static ServerConfig,
pub tab: &'static str,
}
impl Base {
pub fn new(config: &ServerConfig, tab: Tab) -> Self {
pub fn new(config: &'static ServerConfig, tab: Tab) -> Self {
let tab = match tab {
Tab::None => "",
Tab::Index => "index",
@ -37,32 +35,16 @@ impl Base {
Tab::Queue => "queue",
};
Self {
link_logo_svg: Self::link_with_config(config, LOGO_SVG),
link_base_css: Self::link_with_config(config, BASE_CSS),
link_index: Self::link_with_config(config, PathIndex {}),
link_graph: Self::link_with_config(config, PathGraph {}),
link_queue: Self::link_with_config(config, PathQueue {}),
web_base: config.web_base.clone(),
repo_name: config.repo_name.clone(),
link_logo_svg: config.path(LOGO_SVG),
link_base_css: config.path(BASE_CSS),
link_index: config.path(PathIndex {}),
link_graph: config.path(PathGraph {}),
link_queue: config.path(PathQueue {}),
config,
tab,
}
}
fn link_with_base<P: fmt::Display>(base: &str, to: P) -> Link {
let to = format!("{to}");
assert!(!base.ends_with('/'));
assert!(to.starts_with('/'));
Link(format!("{base}{to}"))
}
pub fn link_with_config<P: fmt::Display>(config: &ServerConfig, to: P) -> Link {
Self::link_with_base(&config.web_base, to)
}
pub fn link<P: fmt::Display>(&self, to: P) -> Link {
Self::link_with_base(&self.web_base, to)
}
pub fn html(&self, title: &str, head: Markup, body: Markup) -> Markup {
html!(
(DOCTYPE)
@ -70,7 +52,7 @@ impl Base {
head {
meta charset="utf-8";
meta name="viewport" content="width=device-width";
title { (title) " - " (self.repo_name) }
title { (title) " - " (self.config.repo_name) }
link rel="icon" href=(self.link_logo_svg);
link rel="stylesheet" href=(self.link_base_css);
(head)
@ -79,7 +61,7 @@ impl Base {
nav {
a .current[self.tab == "index"] href=(self.link_index) {
img src=(self.link_logo_svg) alt="";
(self.repo_name)
(self.config.repo_name)
}
a .current[self.tab == "graph"] href=(self.link_graph) { "graph" }
a .current[self.tab == "queue"] href=(self.link_queue) { "queue" }
@ -90,12 +72,3 @@ impl Base {
)
}
}
#[derive(Clone)]
pub struct Link(String);
impl fmt::Display for Link {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}