eay
/
serves3
forked from matteo/serves3
1
0
Fork 0
Code Pull Requests Activity

Fix display of folders

This commit is contained in:
Matteo Settenvini 2023-07-01 21:31:04 +02:00
parent eccd4ef797
commit 053854ce72
2 changed files with 84 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/main.rs
View File

@ -1,9 +1,10 @@
// SPDX-FileCopyrightText: © Matteo Settenvini <matteo.settenvini@montecristosoftware.eu>
// SPDX-License-Identifier: EUPL-1.2
use s3::serde_types::ListBucketResult;
use {
lazy_static::lazy_static,
rocket::http::ContentType,
rocket::response::Responder,
rocket_dyn_templates::{context, Template},
std::path::PathBuf,
@ -63,44 +64,98 @@ lazy_static! {
}
#[derive(Responder)]
enum Error {
#[response(status = 422)]
InvalidArgument(String),
enum FileView {
#[response(content_type = "text/html")]
Folder(Template),
#[response(content_type = "application/octet-stream")]
File(Vec<u8>),
}
#[derive(Responder, Debug)]
enum Error {
#[response(status = 404)]
NotFound(String),
}
#[rocket::get("/<path..>")]
async fn index(path: PathBuf) -> Result<(ContentType, Template), Error> {
let path: String = path
.to_str()
.ok_or_else(|| Error::InvalidArgument(format!("Invalid path '{}'", path.display())))?
.into();
async fn index(path: PathBuf) -> Result<FileView, Error> {
let parent = path.parent();
let s3_objects = BUCKET
.list(path, Some("/".into()))
.await
.map_err(|_| Error::NotFound("Object not found".into()))?;
let objects: Vec<String> = s3_objects
.into_iter()
.flat_map(|list| -> Vec<String> {
if let Some(common_prefixes) = list.common_prefixes {
common_prefixes.into_iter().map(|dir| dir.prefix).collect()
} else {
list.contents.into_iter().map(|obj| obj.key).collect()
let s3_path = format!(
"{}{}",
path.display(),
match parent {
Some(_) => "/",
None => "",
}
})
.collect();
);
/*
The way things work in S3, the following holds for us:
- we need to use a slash as separator
- folders need to be queried ending with a slash
We try first to retrieve list an object as a folder. If we fail,
we fallback to retrieving the object itself.
*/
let s3_objects = BUCKET.list(s3_path, Some("/".into())).await;
let s3_objects = match s3_objects {
Ok(s3_objects) => s3_objects,
Err(_) => {
// TODO: this can be big, we should use streaming,
// not loading in memory.
let data = BUCKET
.get_object(format!("{}", path.display()))
.await
.map_err(|_| Error::NotFound("Object not found".into()))?
.bytes()
.to_vec();
return Ok(FileView::File(data));
}
};
let objects = s3_fileview(&s3_objects);
let rendered = Template::render(
"index",
context! {
path: format!("{}/", path.display()),
has_parent: !path.as_os_str().is_empty(),
objects
},
);
Ok((ContentType::HTML, rendered))
Ok(FileView::Folder(rendered))
}
fn s3_fileview(s3_objects: &Vec<ListBucketResult>) -> Vec<&str> {
/*
if listing a folder:
- folders will be under 'common_prefixes'
- files will be under the 'contents' property
*/
s3_objects
.iter()
.flat_map(|list| -> Vec<Option<&str>> {
let prefix = if let Some(p) = &list.prefix {
p.as_str()
} else {
""
};
let folders = list
.common_prefixes
.iter()
.flatten()
.map(|dir| dir.prefix.strip_prefix(&prefix));
let files = list
.contents
.iter()
.map(|obj| obj.key.strip_prefix(&prefix));
folders.chain(files).collect()
})
.flatten()
.collect()
}
#[rocket::launch]

5
templates/index.html.tera
View File

@ -6,7 +6,12 @@
<html>
<head></head>
<body>
<h1>{{ path }}</h1>
<ul>
{% if has_parent %}
<li><a href="../">..</a></li>
{% endif %}
{% for object in objects %}
<li><a href="{{ object }}">{{ object }}</a></li>
{% endfor %}