chore: update all dependencies to latest

This commit is contained in:
2025-07-10 12:37:13 -05:00
parent babae191a4
commit 32b55c918c
6 changed files with 245 additions and 274 deletions

View File

@@ -31,16 +31,18 @@ async fn main() {
let app = Router::new()
.route("/", get(index_handler))
.route("/:path", get(implicit_handler))
.route("/rel/:path", get(relative_handler))
.route("/relative/:path", get(relative_handler))
.route("/absolute/:path", get(absolute_handler))
.route("/abs/:path", get(absolute_handler))
.route("/{path}", get(implicit_handler))
.route("/rel/{path}", get(relative_handler))
.route("/relative/{path}", get(relative_handler))
.route("/absolute/{path}", get(absolute_handler))
.route("/abs/{path}", get(absolute_handler))
.fallback(fallback_handler);
let addr = SocketAddr::from((config.socket_addr(), config.port));
axum::Server::bind(&addr)
.serve(app.into_make_service_with_connect_info::<SocketAddr>())
.await
.unwrap();
axum::serve(
tokio::net::TcpListener::bind(addr).await.unwrap(),
app.into_make_service_with_connect_info::<SocketAddr>(),
)
.await
.unwrap();
}

View File

@@ -1,6 +1,6 @@
use std::default;
use resvg::usvg::{fontdb, TreeParsing, TreeTextToPath};
use resvg::usvg::fontdb;
use resvg::{tiny_skia, usvg};
#[derive(Debug, Clone)]
@@ -33,28 +33,32 @@ impl Rasterizer {
pub fn render(&self, svg_data: Vec<u8>) -> Result<Vec<u8>, RenderError> {
let tree = {
let opt = usvg::Options::default();
let mut tree_result = usvg::Tree::from_data(&*svg_data, &opt);
let mut opt = usvg::Options::default();
opt.fontdb = std::sync::Arc::new(self.font_db.clone());
let tree_result = usvg::Tree::from_data(&*svg_data, &opt);
if tree_result.is_err() {
return Err(RenderError {
message: Some("Failed to parse".to_string()),
});
}
let tree = tree_result.as_mut().unwrap();
tree.convert_text(&self.font_db);
resvg::Tree::from_usvg(&tree)
tree_result.unwrap()
};
let content_area = tree.content_area.unwrap();
let zoom = 0.90;
let pixmap_size = tree.size().to_int_size();
let mut pixmap = tiny_skia::Pixmap::new(pixmap_size.width(), pixmap_size.height()).unwrap();
let mut pixmap = tiny_skia::Pixmap::new(
(content_area.width() + content_area.left() * 2f32).ceil() as u32,
(content_area.height() + content_area.top() * 2f32).ceil() as u32,
)
.unwrap();
tree.render(tiny_skia::Transform::default(), &mut pixmap.as_mut());
// Calculate center point for scaling
let center_x = pixmap_size.width() as f32 / 2.0;
let center_y = pixmap_size.height() as f32 / 2.0;
// Create transform that scales from center: translate to center, scale, translate back
let render_ts = tiny_skia::Transform::from_translate(-center_x, -center_y)
.post_scale(zoom, zoom)
.post_translate(center_x, center_y);
resvg::render(&tree, render_ts, &mut pixmap.as_mut());
pixmap.encode_png().map_err(|_| RenderError {
message: Some("Failed to encode".to_string()),

View File

@@ -1,5 +1,5 @@
use crate::error::{get_error_response, TimeBannerError};
use axum::body::{Bytes, Full};
use axum::body::{Body, Bytes};
use axum::extract::Path;
use axum::http::header;
use axum::response::{Redirect, Response};
@@ -9,7 +9,7 @@ use chrono::{DateTime, NaiveDateTime, Offset, Utc};
use crate::raster::Rasterizer;
use crate::template::{render_template, OutputForm, RenderContext};
fn split_on_extension(path: &str) -> Option<(&str, &str)> {
pub fn split_on_extension(path: &str) -> Option<(&str, &str)> {
let split = path.rsplit_once('.');
if split.is_none() {
return None;
@@ -109,7 +109,7 @@ pub async fn implicit_handler(Path(path): Path<String>) -> impl IntoResponse {
if rendered_template.is_err() {
return Response::builder()
.status(StatusCode::INTERNAL_SERVER_ERROR)
.body(Full::from(format!(
.body(Body::from(format!(
"Template Could Not Be Rendered :: {}",
rendered_template.err().unwrap()
)))