Multiple enhancements and bugfixes

!Breaking change! - The updated version will not be able to read your old database file

Major improvements:
- Added editable pastas
- Added private pastas
- Added line numbers
- Added support for wide mode (1080p instead of 720p)
- Added syntax highlighting support
- Added read-only mode
- Added built-in help page
- Added option to remove logo, change title and footer text

Minor improvements:
- Improved looks in pure html mode
- Removed link to GitHub repo from navbar
- Broke up 7km long main.rs file into smaller modules
- Moved water.css into a template instead of serving it as an external resource
- Made Save button a bit bigger
- Updated README.MD

Bugfixes:
- Fixed a bug where an incorrect animal ID in a request would cause a crash
- Fixed a bug where an empty or corrupt JSON database would cause a crash

src/endpoints/create.rs

@@ -0,0 +1,142 @@
+use crate::dbio::save_to_file;
+use crate::util::animalnumbers::to_animal_names;
+use crate::util::misc::is_valid_url;
+use crate::{AppState, Pasta, ARGS};
+use actix_multipart::Multipart;
+use actix_web::{get, web, Error, HttpResponse, Responder};
+use askama::Template;
+use futures::TryStreamExt;
+use rand::Rng;
+use std::io::Write;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+#[derive(Template)]
+#[template(path = "index.html")]
+struct IndexTemplate<'a> {
+    args: &'a ARGS,
+}
+
+#[get("/")]
+pub async fn index() -> impl Responder {
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(IndexTemplate { args: &ARGS }.render().unwrap())
+}
+
+pub async fn create(
+    data: web::Data<AppState>,
+    mut payload: Multipart,
+) -> Result<HttpResponse, Error> {
+    if ARGS.readonly {
+        return Ok(HttpResponse::Found()
+            .append_header(("Location", "/"))
+            .finish());
+    }
+
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let timenow: i64 = match SystemTime::now().duration_since(UNIX_EPOCH) {
+        Ok(n) => n.as_secs(),
+        Err(_) => {
+            log::error!("SystemTime before UNIX EPOCH!");
+            0
+        }
+    } as i64;
+
+    let mut new_pasta = Pasta {
+        id: rand::thread_rng().gen::<u16>() as u64,
+        content: String::from("No Text Content"),
+        file: String::from("no-file"),
+        extension: String::from(""),
+        private: false,
+        editable: false,
+        created: timenow,
+        pasta_type: String::from(""),
+        expiration: 0,
+    };
+
+    while let Some(mut field) = payload.try_next().await? {
+        match field.name() {
+            "editable" => {
+                // while let Some(_chunk) = field.try_next().await? {}
+                new_pasta.editable = true;
+                continue;
+            }
+            "private" => {
+                // while let Some(_chunk) = field.try_next().await? {}
+                new_pasta.private = true;
+                continue;
+            }
+            "expiration" => {
+                while let Some(chunk) = field.try_next().await? {
+                    new_pasta.expiration = match std::str::from_utf8(&chunk).unwrap() {
+                        "1min" => timenow + 60,
+                        "10min" => timenow + 60 * 10,
+                        "1hour" => timenow + 60 * 60,
+                        "24hour" => timenow + 60 * 60 * 24,
+                        "1week" => timenow + 60 * 60 * 24 * 7,
+                        "never" => 0,
+                        _ => {
+                            log::error!("{}", "Unexpected expiration time!");
+                            0
+                        }
+                    };
+                }
+
+                continue;
+            }
+            "content" => {
+                while let Some(chunk) = field.try_next().await? {
+                    new_pasta.content = std::str::from_utf8(&chunk).unwrap().to_string();
+                    new_pasta.pasta_type = if is_valid_url(new_pasta.content.as_str()) {
+                        String::from("url")
+                    } else {
+                        String::from("text")
+                    };
+                }
+                continue;
+            }
+            "syntax-highlight" => {
+                while let Some(chunk) = field.try_next().await? {
+                    new_pasta.extension = std::str::from_utf8(&chunk).unwrap().to_string();
+                }
+                continue;
+            }
+            "file" => {
+                let content_disposition = field.content_disposition();
+
+                let filename = match content_disposition.get_filename() {
+                    Some("") => continue,
+                    Some(filename) => filename.replace(' ', "_").to_string(),
+                    None => continue,
+                };
+
+                std::fs::create_dir_all(format!("./pasta_data/{}", &new_pasta.id_as_animals()))
+                    .unwrap();
+
+                let filepath = format!("./pasta_data/{}/{}", &new_pasta.id_as_animals(), &filename);
+
+                new_pasta.file = filename;
+
+                let mut f = web::block(|| std::fs::File::create(filepath)).await??;
+
+                while let Some(chunk) = field.try_next().await? {
+                    f = web::block(move || f.write_all(&chunk).map(|_| f)).await??;
+                }
+
+                new_pasta.pasta_type = String::from("text");
+            }
+            _ => {}
+        }
+    }
+
+    let id = new_pasta.id;
+
+    pastas.push(new_pasta);
+
+    save_to_file(&pastas);
+
+    Ok(HttpResponse::Found()
+        .append_header(("Location", format!("/pasta/{}", to_animal_names(id))))
+        .finish())
+}

src/endpoints/edit.rs

@@ -0,0 +1,99 @@
+use crate::args::Args;
+use crate::dbio::save_to_file;
+use crate::endpoints::errors::ErrorTemplate;
+use crate::util::animalnumbers::to_u64;
+use crate::util::misc::remove_expired;
+use crate::{AppState, Pasta, ARGS};
+use actix_multipart::Multipart;
+use actix_web::{get, post, web, Error, HttpResponse};
+use askama::Template;
+use futures::TryStreamExt;
+
+#[derive(Template)]
+#[template(path = "edit.html", escape = "none")]
+struct EditTemplate<'a> {
+    pasta: &'a Pasta,
+    args: &'a Args,
+}
+
+#[get("/edit/{id}")]
+pub async fn get_edit(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    remove_expired(&mut pastas);
+
+    for pasta in pastas.iter() {
+        if pasta.id == id {
+            if !pasta.editable {
+                return HttpResponse::Found()
+                    .append_header(("Location", "/"))
+                    .finish();
+            }
+            return HttpResponse::Found().content_type("text/html").body(
+                EditTemplate {
+                    pasta: &pasta,
+                    args: &ARGS,
+                }
+                .render()
+                .unwrap(),
+            );
+        }
+    }
+
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
+}
+
+#[post("/edit/{id}")]
+pub async fn post_edit(
+    data: web::Data<AppState>,
+    id: web::Path<String>,
+    mut payload: Multipart,
+) -> Result<HttpResponse, Error> {
+    if ARGS.readonly {
+        return Ok(HttpResponse::Found()
+            .append_header(("Location", "/"))
+            .finish());
+    }
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    let mut pastas = data.pastas.lock().unwrap();
+
+    remove_expired(&mut pastas);
+
+    let mut new_content = String::from("");
+
+    while let Some(mut field) = payload.try_next().await? {
+        match field.name() {
+            "content" => {
+                while let Some(chunk) = field.try_next().await? {
+                    new_content = std::str::from_utf8(&chunk).unwrap().to_string();
+                }
+            }
+            _ => {}
+        }
+    }
+
+    for (i, pasta) in pastas.iter().enumerate() {
+        if pasta.id == id {
+            if pasta.editable {
+                pastas[i].content.replace_range(.., &*new_content);
+                save_to_file(&pastas);
+
+                return Ok(HttpResponse::Found()
+                    .append_header(("Location", format!("/pasta/{}", pastas[i].id_as_animals())))
+                    .finish());
+            } else {
+                break;
+            }
+        }
+    }
+
+    Ok(HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap()))
+}

src/endpoints/errors.rs

@@ -0,0 +1,16 @@
+use actix_web::{Error, HttpResponse};
+use askama::Template;
+
+use crate::args::{Args, ARGS};
+
+#[derive(Template)]
+#[template(path = "error.html")]
+pub struct ErrorTemplate<'a> {
+    pub args: &'a Args,
+}
+
+pub async fn not_found() -> Result<HttpResponse, Error> {
+    Ok(HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap()))
+}

src/endpoints/help.rs

@@ -0,0 +1,23 @@
+use crate::args::{Args, ARGS};
+use actix_web::{get, HttpResponse};
+use askama::Template;
+use std::marker::PhantomData;
+
+#[derive(Template)]
+#[template(path = "help.html")]
+struct Help<'a> {
+    args: &'a Args,
+    _marker: PhantomData<&'a ()>,
+}
+
+#[get("/help")]
+pub async fn help() -> HttpResponse {
+    HttpResponse::Found().content_type("text/html").body(
+        Help {
+            args: &ARGS,
+            _marker: Default::default(),
+        }
+        .render()
+        .unwrap(),
+    )
+}

src/endpoints/pasta.rs

@@ -0,0 +1,88 @@
+use actix_web::{get, web, HttpResponse};
+use askama::Template;
+
+use crate::args::{Args, ARGS};
+use crate::endpoints::errors::ErrorTemplate;
+use crate::pasta::Pasta;
+use crate::util::animalnumbers::to_u64;
+use crate::util::misc::remove_expired;
+use crate::AppState;
+
+#[derive(Template)]
+#[template(path = "pasta.html", escape = "none")]
+struct PastaTemplate<'a> {
+    pasta: &'a Pasta,
+    args: &'a Args,
+}
+
+#[get("/pasta/{id}")]
+pub async fn getpasta(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    println!("{}", id);
+
+    remove_expired(&mut pastas);
+
+    for pasta in pastas.iter() {
+        if pasta.id == id {
+            return HttpResponse::Found().content_type("text/html").body(
+                PastaTemplate {
+                    pasta: &pasta,
+                    args: &ARGS,
+                }
+                .render()
+                .unwrap(),
+            );
+        }
+    }
+
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
+}
+
+#[get("/url/{id}")]
+pub async fn redirecturl(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    remove_expired(&mut pastas);
+
+    for pasta in pastas.iter() {
+        if pasta.id == id {
+            if pasta.pasta_type == "url" {
+                return HttpResponse::Found()
+                    .append_header(("Location", String::from(&pasta.content)))
+                    .finish();
+            } else {
+                return HttpResponse::Found()
+                    .content_type("text/html")
+                    .body(ErrorTemplate { args: &ARGS }.render().unwrap());
+            }
+        }
+    }
+
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
+}
+
+#[get("/raw/{id}")]
+pub async fn getrawpasta(data: web::Data<AppState>, id: web::Path<String>) -> String {
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    remove_expired(&mut pastas);
+
+    for pasta in pastas.iter() {
+        if pasta.id == id {
+            return pasta.content.to_owned();
+        }
+    }
+
+    String::from("Pasta not found! :-(")
+}

src/endpoints/pastalist.rs

@@ -0,0 +1,38 @@
+use actix_web::{get, web, HttpResponse};
+use askama::Template;
+
+use crate::args::{Args, ARGS};
+use crate::pasta::Pasta;
+use crate::util::misc::remove_expired;
+use crate::AppState;
+
+#[derive(Template)]
+#[template(path = "pastalist.html")]
+struct PastaListTemplate<'a> {
+    pastas: &'a Vec<Pasta>,
+    args: &'a Args,
+}
+
+#[get("/pastalist")]
+pub async fn list(data: web::Data<AppState>) -> HttpResponse {
+    if ARGS.no_listing {
+        return HttpResponse::Found()
+            .append_header(("Location", "/"))
+            .finish();
+    }
+
+    let mut pastas = data.pastas.lock().unwrap();
+
+    pastas.retain(|p| !p.private);
+
+    remove_expired(&mut pastas);
+
+    HttpResponse::Found().content_type("text/html").body(
+        PastaListTemplate {
+            pastas: &pastas,
+            args: &ARGS,
+        }
+        .render()
+        .unwrap(),
+    )
+}

src/endpoints/remove.rs

@@ -0,0 +1,36 @@
+use actix_web::{get, web, HttpResponse};
+
+use crate::args::ARGS;
+use crate::endpoints::errors::ErrorTemplate;
+use crate::util::animalnumbers::to_u64;
+use crate::util::misc::remove_expired;
+use crate::AppState;
+use askama::Template;
+
+#[get("/remove/{id}")]
+pub async fn remove(data: web::Data<AppState>, id: web::Path<String>) -> HttpResponse {
+    if ARGS.readonly {
+        return HttpResponse::Found()
+            .append_header(("Location", "/"))
+            .finish();
+    }
+
+    let mut pastas = data.pastas.lock().unwrap();
+
+    let id = to_u64(&*id.into_inner()).unwrap_or(0);
+
+    remove_expired(&mut pastas);
+
+    for (i, pasta) in pastas.iter().enumerate() {
+        if pasta.id == id {
+            pastas.remove(i);
+            return HttpResponse::Found()
+                .append_header(("Location", "/pastalist"))
+                .finish();
+        }
+    }
+
+    HttpResponse::Found()
+        .content_type("text/html")
+        .body(ErrorTemplate { args: &ARGS }.render().unwrap())
+}

src/endpoints/static_resources.rs

@@ -0,0 +1,23 @@
+use actix_web::{get, web, HttpResponse};
+use askama::Template;
+use std::marker::PhantomData;
+
+#[derive(Template)]
+#[template(path = "water.css", escape = "none")]
+struct WaterCSS<'a> {
+    _marker: PhantomData<&'a ()>,
+}
+
+#[get("/static/{resource}")]
+pub async fn static_resources(resource_id: web::Path<String>) -> HttpResponse {
+    match resource_id.into_inner().as_str() {
+        "water.css" => HttpResponse::Found().content_type("text/html").body(
+            WaterCSS {
+                _marker: Default::default(),
+            }
+            .render()
+            .unwrap(),
+        ),
+        _ => HttpResponse::NotFound().content_type("text/html").finish(),
+    }
+}