ash/tinyfui
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chore: Run cargo fmt

Browse source
This commit is contained in:
Ashhhleyyy 2022-07-05 14:45:44 +01:00
parent 415b8208df
commit 503324fe5c
Signed by: ash
GPG key ID: 83B789081A0878FB
4 changed files with 83 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -2,7 +2,11 @@ mod routes;
mod share;
mod templates;
use std::{net::SocketAddr, path::Path, fs::{self, File}};
use std::{
fs::{self, File},
net::SocketAddr,
path::Path,
};
use axum::Extension;
use clap::Parser;
@ -10,7 +14,7 @@ use tera::Tera;
use tower_http::trace::TraceLayer;
use tracing_subscriber::prelude::*;
use crate::share::{ShareInfo, ShareFile};
use crate::share::{ShareFile, ShareInfo};
#[derive(clap::Parser)]
enum Cli {
@ -96,7 +100,9 @@ async fn create_share(name: &str, update: bool) -> color_eyre::Result<()> {
update_share(&share_path).await?;
}
tracing::info!("Success! Created a new share in {share_path:?}. The access token is {secret:?}");
tracing::info!(
"Success! Created a new share in {share_path:?}. The access token is {secret:?}"
);
Ok(())
}
@ -144,7 +150,8 @@ async fn update_share(path: &Path) -> color_eyre::Result<()> {
tracing::info!(?path, ?filename, "adding to index");
let is_image = mime_guess::from_path(entry.path())
.first_or_octet_stream()
.type_() == mime::IMAGE;
.type_()
== mime::IMAGE;
share_info.files.push(if is_image {
ShareFile::Image(filename.to_owned())
} else {

15
src/routes.rs
View file

@ -1,17 +1,20 @@
use std::path::Path;
use axum::{Router, routing::any_service, http::StatusCode};
use axum::{http::StatusCode, routing::any_service, Router};
use tower_http::services::ServeDir;
mod share;
pub fn routes() -> Router {
Router::new()
.nest("/assets", any_service(ServeDir::new(&Path::new("assets")))
.handle_error(|err: std::io::Error| async move {
tracing::error!("unhandled error in static file server: {}", err);
(StatusCode::INTERNAL_SERVER_ERROR, "internal server error")
})
.nest(
"/assets",
any_service(ServeDir::new(&Path::new("assets"))).handle_error(
|err: std::io::Error| async move {
tracing::error!("unhandled error in static file server: {}", err);
(StatusCode::INTERNAL_SERVER_ERROR, "internal server error")
},
),
)
.nest("/share", share::routes())
}

86
src/routes/share.rs
View file

@ -1,13 +1,24 @@
use std::path::{self, PathBuf};
use axum::{response::IntoResponse, extract::{Path, FromRequest, Query}, async_trait, http::{StatusCode, Request}, Router, routing::get, body::Body};
use serde::{Serialize, Deserialize};
use axum::{
async_trait,
body::Body,
extract::{FromRequest, Path, Query},
http::{Request, StatusCode},
response::IntoResponse,
routing::get,
Router,
};
use serde::{Deserialize, Serialize};
use tera::Context;
use tokio::fs;
use tower_http::services::ServeFile;
use tower_service::Service;
use crate::{templates::{Renderer, TemplateRenderer}, share::ShareInfo};
use crate::{
share::ShareInfo,
templates::{Renderer, TemplateRenderer},
};
struct Share {
info: ShareInfo,
@ -15,10 +26,15 @@ struct Share {
}
#[async_trait]
impl<B> FromRequest<B> for Share where B: Send {
impl<B> FromRequest<B> for Share
where
B: Send,
{
type Rejection = StatusCode;
async fn from_request(req: &mut axum::extract::RequestParts<B>) -> Result<Self, Self::Rejection> {
async fn from_request(
req: &mut axum::extract::RequestParts<B>,
) -> Result<Self, Self::Rejection> {
#[derive(Deserialize)]
struct P {
share: String,
@ -29,11 +45,12 @@ impl<B> FromRequest<B> for Share where B: Send {
}
let Path(P { share }) = Path::<P>::from_request(req).await.unwrap();
let Query(Q { token }) = Query::<Q>::from_request(req).await.map_err(|_| StatusCode::NOT_FOUND)?;
let Query(Q { token }) = Query::<Q>::from_request(req)
.await
.map_err(|_| StatusCode::NOT_FOUND)?;
async {
let share_dir = path::Path::new("shares")
.join(share);
let share_dir = path::Path::new("shares").join(share);
if share_dir.exists() {
let share_info = share_dir.join(".share.json");
@ -50,17 +67,21 @@ impl<B> FromRequest<B> for Share where B: Send {
} else {
Ok::<_, color_eyre::Report>(None)
}
}.await
.map_err(|e| {
tracing::error!(%e, "failed to load share info");
StatusCode::INTERNAL_SERVER_ERROR
})
.and_then(|share| share.ok_or(StatusCode::NOT_FOUND))
}
.await
.map_err(|e| {
tracing::error!(%e, "failed to load share info");
StatusCode::INTERNAL_SERVER_ERROR
})
.and_then(|share| share.ok_or(StatusCode::NOT_FOUND))
}
}
async fn index(share: Share, tera: Renderer) -> impl IntoResponse {
tera.response("share/index.html", Context::from_serialize(&share.info).unwrap())
tera.response(
"share/index.html",
Context::from_serialize(&share.info).unwrap(),
)
}
#[derive(Deserialize)]
@ -68,21 +89,27 @@ struct RawPath {
file_id: usize,
}
async fn raw(share: Share, path: Path<RawPath>, req: Request<Body>) -> Result<impl IntoResponse, StatusCode> {
async fn raw(
share: Share,
path: Path<RawPath>,
req: Request<Body>,
) -> Result<impl IntoResponse, StatusCode> {
if let Some(file) = share.info.files.get(path.file_id) {
let path = share.path.join(file.name());
ServeFile::new(path).call(req)
.await
.map_err(|e| {
tracing::error!(%e, "failed to serve static file");
StatusCode::INTERNAL_SERVER_ERROR
})
ServeFile::new(path).call(req).await.map_err(|e| {
tracing::error!(%e, "failed to serve static file");
StatusCode::INTERNAL_SERVER_ERROR
})
} else {
Err(StatusCode::NOT_FOUND)
}
}
async fn file(share: Share, path: Path<RawPath>, tera: Renderer) -> Result<impl IntoResponse, StatusCode> {
async fn file(
share: Share,
path: Path<RawPath>,
tera: Renderer,
) -> Result<impl IntoResponse, StatusCode> {
if let Some(file) = share.info.files.get(path.file_id) {
#[derive(Serialize)]
struct File {
@ -93,11 +120,14 @@ async fn file(share: Share, path: Path<RawPath>, tera: Renderer) -> Result<impl
let mut context = Context::new();
context.insert("share", &share.info);
context.insert("file_count", &share.info.files.len());
context.insert("file", &File {
name: file.name(),
is_image: file.is_image(),
index: path.file_id,
});
context.insert(
"file",
&File {
name: file.name(),
is_image: file.is_image(),
index: path.file_id,
},
);
tera.response("share/file.html", context)
} else {
Err(StatusCode::NOT_FOUND)

12
src/templates.rs
View file

@ -1,4 +1,4 @@
use axum::{response::Html, http::StatusCode, Extension};
use axum::{http::StatusCode, response::Html, Extension};
use tera::Tera;
pub trait TemplateRenderer {
@ -8,12 +8,10 @@ pub trait TemplateRenderer {
impl TemplateRenderer for Tera {
fn response(&self, name: &str, context: tera::Context) -> Result<Html<String>, StatusCode> {
let result = self.render(name, &context);
result
.map(|rendered| Html(rendered))
.map_err(|e| {
tracing::error!("failed to render template {:?}", e);
StatusCode::INTERNAL_SERVER_ERROR
})
result.map(|rendered| Html(rendered)).map_err(|e| {
tracing::error!("failed to render template {:?}", e);
StatusCode::INTERNAL_SERVER_ERROR
})
}
}