schrottkatze/karton
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 2 Packages Wiki Activity

Allow setting a public url for all paths

Browse source
This commit is contained in:
HeapUnderflow 2022-10-12 17:13:21 +02:00
parent 3ca89291dc
commit a404f9a997
No known key found for this signature in database
GPG key ID: 6BDB4D05427A70A2
9 changed files with 52 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/args.rs
View file

@ -1,4 +1,7 @@
use std::convert::Infallible;
use std::fmt;
use std::net::IpAddr; use std::net::IpAddr;
use std::str::FromStr;
use clap::Parser; use clap::Parser;
use lazy_static::lazy_static; use lazy_static::lazy_static;
@ -48,6 +51,9 @@ pub struct Args {
#[clap(long, env="MICROBIN_PURE_HTML")] #[clap(long, env="MICROBIN_PURE_HTML")]
pub pure_html: bool, pub pure_html: bool,
#[clap(long, env="MICROBIN_PUBLIC_PATH", default_value_t = PublicUrl(String::from("/")))]
pub public_path: PublicUrl,
#[clap(long, env="MICROBIN_READONLY")] #[clap(long, env="MICROBIN_READONLY")]
pub readonly: bool, pub readonly: bool,
@ -60,3 +66,21 @@ pub struct Args {
#[clap(long, env="MICROBIN_WIDE")] #[clap(long, env="MICROBIN_WIDE")]
pub wide: bool, pub wide: bool,
} }
#[derive(Debug, Clone)]
pub struct PublicUrl(pub String);
impl fmt::Display for PublicUrl {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.0)
}
}
impl FromStr for PublicUrl {
type Err = Infallible;
fn from_str(s: &str) -> Result<Self, Self::Err> {
let uri = s.strip_suffix('/').unwrap_or(s).to_owned();
Ok(PublicUrl(uri))
}
}

4
src/endpoints/create.rs
View file

@ -32,7 +32,7 @@ pub async fn create(
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
if ARGS.readonly { if ARGS.readonly {
return Ok(HttpResponse::Found() return Ok(HttpResponse::Found()
.append_header(("Location", "/")) .append_header(("Location", format!("{}/", ARGS.public_path)))
.finish()); .finish());
} }
@ -154,6 +154,6 @@ pub async fn create(
save_to_file(&pastas); save_to_file(&pastas);
Ok(HttpResponse::Found() Ok(HttpResponse::Found()
.append_header(("Location", format!("/pasta/{}", to_animal_names(id)))) .append_header(("Location", format!("{}/pasta/{}", ARGS.public_path, to_animal_names(id))))
.finish()) .finish())
} }

6
src/endpoints/edit.rs
View file

@ -28,7 +28,7 @@ pub async fn get_edit(data: web::Data<AppState>, id: web::Path<String>) -> HttpR
if pasta.id == id { if pasta.id == id {
if !pasta.editable { if !pasta.editable {
return HttpResponse::Found() return HttpResponse::Found()
.append_header(("Location", "/")) .append_header(("Location", format!("{}/", ARGS.public_path)))
.finish(); .finish();
} }
return HttpResponse::Ok().content_type("text/html").body( return HttpResponse::Ok().content_type("text/html").body(
@ -55,7 +55,7 @@ pub async fn post_edit(
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
if ARGS.readonly { if ARGS.readonly {
return Ok(HttpResponse::Found() return Ok(HttpResponse::Found()
.append_header(("Location", "/")) .append_header(("Location", format!("{}/", ARGS.public_path)))
.finish()); .finish());
} }
@ -85,7 +85,7 @@ pub async fn post_edit(
save_to_file(&pastas); save_to_file(&pastas);
return Ok(HttpResponse::Found() return Ok(HttpResponse::Found()
.append_header(("Location", format!("/pasta/{}", pastas[i].id_as_animals()))) .append_header(("Location", format!("{}/pasta/{}", ARGS.public_path, pastas[i].id_as_animals())))
.finish()); .finish());
} else { } else {
break; break;

2
src/endpoints/pastalist.rs
View file

@ -17,7 +17,7 @@ struct PastaListTemplate<'a> {
pub async fn list(data: web::Data<AppState>) -> HttpResponse { pub async fn list(data: web::Data<AppState>) -> HttpResponse {
if ARGS.no_listing { if ARGS.no_listing {
return HttpResponse::Found() return HttpResponse::Found()
.append_header(("Location", "/")) .append_header(("Location", format!("{}/", ARGS.public_path)))
.finish(); .finish();
} }

4
src/endpoints/remove.rs
View file

@ -13,7 +13,7 @@ use std::fs;
pub async fn remove(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse { pub async fn remove(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
if ARGS.readonly { if ARGS.readonly {
return HttpResponse::Found() return HttpResponse::Found()
.append_header(("Location", "/")) .append_header(("Location", format!("{}/", ARGS.public_path)))
.finish(); .finish();
} }
@ -39,7 +39,7 @@ pub async fn remove(data: web::Data<AppState>, id: web::Path<String>) -> HttpRes
// remove it from in-memory pasta list // remove it from in-memory pasta list
pastas.remove(i); pastas.remove(i);
return HttpResponse::Found() return HttpResponse::Found()
.append_header(("Location", "/pastalist")) .append_header(("Location", format!("{}/pastalist", ARGS.public_path)))
.finish(); .finish();
} }
} }

2
templates/error.html
View file

@ -4,7 +4,7 @@
<b>Not Found</b> <b>Not Found</b>
<br> <br>
<br> <br>
<a href="/" > Go Home</a> <a href="{{ args.public_path }}/" > Go Home</a>
<br> <br>
<br> <br>
{% include "footer.html" %} {% include "footer.html" %}

8
templates/header.html
View file

@ -10,7 +10,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
{% if !args.pure_html %} {% if !args.pure_html %}
<link rel="stylesheet" href="/static/water.css"> <link rel="stylesheet" href="{{ args.public_path }}/static/water.css">
{%- endif %} {%- endif %}
</head> </head>
{% if args.wide %} {% if args.wide %}
@ -49,11 +49,11 @@
{%- endif %} {%- endif %}
</b> </b>
<a href="/" style="margin-right: 0.5rem; margin-left: 0.5rem">New Pasta</a> <a href="{{ args.public_path }}/" style="margin-right: 0.5rem; margin-left: 0.5rem">New Pasta</a>
<a href="/pastalist" style="margin-right: 0.5rem; margin-left: 0.5rem">Pasta List</a> <a href="{{ args.public_path }}/pastalist" style="margin-right: 0.5rem; margin-left: 0.5rem">Pasta List</a>
<a href="/help" style="margin-right: 0.5rem; margin-left: 0.5rem">Help</a> <a href="{{ args.public_path }}/help" style="margin-right: 0.5rem; margin-left: 0.5rem">Help</a>
<hr> <hr>

10
templates/pasta.html
View file

@ -1,19 +1,19 @@
{% include "header.html" %} {% include "header.html" %}
<div style="float: left"> <div style="float: left">
<a style="margin-right: 0.5rem" href="/raw/{{pasta.id_as_animals()}}">Raw Text Content</a> <a style="margin-right: 0.5rem" href="{{ args.public_path }}/raw/{{pasta.id_as_animals()}}">Raw Text Content</a>
{% if pasta.file.is_some() %} {% if pasta.file.is_some() %}
<a style="margin-right: 0.5rem; margin-left: 0.5rem" <a style="margin-right: 0.5rem; margin-left: 0.5rem"
href="/file/{{pasta.id_as_animals()}}/{{pasta.file.as_ref().unwrap().name()}}"> href="{{ args.public_path }}/file/{{pasta.id_as_animals()}}/{{pasta.file.as_ref().unwrap().name()}}">
Attached file'{{pasta.file.as_ref().unwrap().name()}}' [{{pasta.file.as_ref().unwrap().size}}] Attached file'{{pasta.file.as_ref().unwrap().name()}}' [{{pasta.file.as_ref().unwrap().size}}]
</a> </a>
{%- endif %} {%- endif %}
{% if pasta.editable %} {% if pasta.editable %}
<a style="margin-right: 0.5rem; margin-left: 0.5rem" href="/edit/{{pasta.id_as_animals()}}">Edit</a> <a style="margin-right: 0.5rem; margin-left: 0.5rem" href="{{ args.public_path }}/edit/{{pasta.id_as_animals()}}">Edit</a>
{%- endif %} {%- endif %}
<a style="margin-right: 0.5rem; margin-left: 0.5rem" href="/remove/{{pasta.id_as_animals()}}">Remove</a> <a style="margin-right: 0.5rem; margin-left: 0.5rem" href="{{ args.public_path }}/remove/{{pasta.id_as_animals()}}">Remove</a>
</div> </div>
<div style="float: right"> <div style="float: right">
<a href="/pasta/{{pasta.id_as_animals()}}"><i>{{pasta.id_as_animals()}}</i></a> <a href="{{ args.public_path }}/pasta/{{pasta.id_as_animals()}}"><i>{{pasta.id_as_animals()}}</i></a>
</div> </div>
<br> <br>
<div style="clear: both;"> <div style="clear: both;">

20
templates/pastalist.html
View file

@ -4,7 +4,7 @@
{% if pastas.is_empty() %} {% if pastas.is_empty() %}
<br> <br>
<p> <p>
No pastas yet. 😔 Create one <a href="/">here</a>. No pastas yet. 😔 Create one <a href="{{ args.public_path }}/">here</a>.
</p> </p>
<br> <br>
{%- else %} {%- else %}
@ -38,7 +38,7 @@
{% if pasta.pasta_type == "text" && !pasta.private %} {% if pasta.pasta_type == "text" && !pasta.private %}
<tr> <tr>
<td> <td>
<a href="/pasta/{{pasta.id_as_animals()}}">{{pasta.id_as_animals()}}</a> <a href="{{ args.public_path }}/pasta/{{pasta.id_as_animals()}}">{{pasta.id_as_animals()}}</a>
</td> </td>
<td> <td>
{{pasta.created_as_string()}} {{pasta.created_as_string()}}
@ -47,14 +47,14 @@
{{pasta.expiration_as_string()}} {{pasta.expiration_as_string()}}
</td> </td>
<td> <td>
<a style="margin-right:1rem" href="/raw/{{pasta.id_as_animals()}}">Raw</a> <a style="margin-right:1rem" href="{{ args.public_path }}/raw/{{pasta.id_as_animals()}}">Raw</a>
{% if pasta.file.is_some() %} {% if pasta.file.is_some() %}
<a style="margin-right:1rem" href="/file/{{pasta.id_as_animals()}}/{{pasta.file.as_ref().unwrap().name()}}">File</a> <a style="margin-right:1rem" href="{{ args.public_path }}/file/{{pasta.id_as_animals()}}/{{pasta.file.as_ref().unwrap().name()}}">File</a>
{%- endif %} {%- endif %}
{% if pasta.editable %} {% if pasta.editable %}
<a style="margin-right:1rem" href="/edit/{{pasta.id_as_animals()}}">Edit</a> <a style="margin-right:1rem" href="{{ args.public_path }}/edit/{{pasta.id_as_animals()}}">Edit</a>
{%- endif %} {%- endif %}
<a href="/remove/{{pasta.id_as_animals()}}">Remove</a> <a href="{{ args.public_path }}/remove/{{pasta.id_as_animals()}}">Remove</a>
</td> </td>
</tr> </tr>
{%- endif %} {%- endif %}
@ -90,7 +90,7 @@
{% if pasta.pasta_type == "url" && !pasta.private %} {% if pasta.pasta_type == "url" && !pasta.private %}
<tr> <tr>
<td> <td>
<a href="/url/{{pasta.id_as_animals()}}">{{pasta.id_as_animals()}}</a> <a href="{{ args.public_path }}/url/{{pasta.id_as_animals()}}">{{pasta.id_as_animals()}}</a>
</td> </td>
<td> <td>
{{pasta.created_as_string()}} {{pasta.created_as_string()}}
@ -99,11 +99,11 @@
{{pasta.expiration_as_string()}} {{pasta.expiration_as_string()}}
</td> </td>
<td> <td>
<a style="margin-right:1rem" href="/raw/{{pasta.id_as_animals()}}">Raw</a> <a style="margin-right:1rem" href="{{ args.public_path }}raw/{{pasta.id_as_animals()}}">Raw</a>
{% if pasta.editable %} {% if pasta.editable %}
<a style="margin-right:1rem" href="/edit/{{pasta.id_as_animals()}}">Edit</a> <a style="margin-right:1rem" href="{{ args.public_path }}/edit/{{pasta.id_as_animals()}}">Edit</a>
{%- endif %} {%- endif %}
<a href="/remove/{{pasta.id_as_animals()}}">Remove</a> <a href="{{ args.public_path }}/remove/{{pasta.id_as_animals()}}">Remove</a>
</td> </td>
</tr> </tr>
{%- endif %} {%- endif %}