visual update

Author: ModProg

Cargo.lock

@@ -8,25 +8,24 @@ edition = "2021"
 actix-multipart = "0.4.0"
 actix-web = "4.0.1"
 actix-web-codegen = { git = "https://github.com/ModProg/actix-web", branch = "advanced_route_macro" }
-actix-web-lab = "0.15.0"
-anyhow = "1.0.56"
+actix-web-lab = "0.16.1"
+anyhow = "1.0.57"
 async-trait = "0.1.53"
 bonsaidb = { git = "https://github.com/khonsulabs/bonsaidb", features = ["local-full"] }
 bonsaidb-files = { git = "https://github.com/khonsulabs/bonsaidb", features = ["async"] }
 derive_more = "0.99.17"
-
 env_logger = "0.9.0"
 futures = "0.3.21"
 futures-util = "0.3.21"
-log = "0.4.16"
+log = "0.4.17"
 rand = "0.8.5"
-serde = "1.0.136"
-thiserror = "1.0.30"
-tokio = { version = "1.17.0", features = ["full"] }
+serde = "1.0.137"
+thiserror = "1.0.31"
+tokio = { version = "1.18.1", features = ["full"] }
 url = { version = "2.2.2", features = ["serde"] }
 mime_guess = "2.0.4"
 serde_with = "1.13.0"
-syntect = "4.6.0"
+syntect = "5.0.0"
 askama = { version = "0.11.1", features = ["with-actix-web"] }
 askama_actix = "0.13.0"
 

Cargo.toml

@@ -2,22 +2,22 @@
 
 ## Simple API
 ### Retrieve Data
-The server will based on the user agent decide whether to send the data as a raw file. 
+The server decides based on the UserAgent whether to send the data as a raw file or embeded in a website. To differentiated browsers from non browsers it uses the `Mozilla` all modern browsers (even IE) send.
 
-As for some reason all browsers send `Mozilla` this is going to be used for now.
+For a browser this will return a HTML with the file embeded and displayed correctly with added controls for e.g. deleting the entry. For all other requests (mainly tools like curl) the file will be returned as raw data.
 
-For a browser this will return a HTML with the file embeded with added controlls for e.g. delete the entry. For all other requests (mainly things like curl) the file will be returned as raw data.
-
-- get("/:id")                   ->  return entry as text
-- get("/:id.bin")               ->  return entry as binary
-- get("/:id.bin?mime={mime}")   ->  return entry as binary, set mime type to `mime`
-- get("/:id.:ext")              ->  return entry as the expect type for the extension
+- get("/:id")      ->  return entry as text
+- get("/:id.:ext") ->  return entry as the expect type for the extension
+    - for code files this will return highlighted code (as long as it is supported by [syntect](https://github.com/trishume/syntect))
+    - for image files it will embed the file in an `<img>` tag to display.
 
 ### Delete entry
-There is the semantically correct way of deleting data using delete requests, but to make the website work without JS because there are people like that, it also supports using ?delete with a get request.
+There is the semantically correct way of deleting data using delete requests, but to make the website work without JS, it also supports using a get endpoint for deletion. The extension is optional and will be ignored.
+
+Deleting a file can either be done by the original uploader, identified via a cookie or a random passphrase imidiatly, as well as anyone viewing it with a 30 minute delay.
 
-- delete("/:id")
-- get("/:id/delete")
+- delete("/:id<.:ext>")
+- get("delete/:id<.:ext>")
 
 ### Add entry
 There are multiple ways of to add entries.

README.md

@@ -1 +1,3 @@
+max_age = 172800
+time_to_delete = 1800
 base_url = "http://localhost:8000"

config.toml

@@ -6,11 +6,11 @@ use figment::{
     Figment,
 };
 use serde::Deserialize;
-use url::Url;
 
 #[derive(Deserialize)]
 pub struct Config {
-    pub base_url: Url,
+    pub max_age: f64,
+    pub time_to_delete: f64,
 }
 
 impl Config {

src/config.rs

@@ -0,0 +1,61 @@
+use crate::{util::ReadableAlphanumeric, StorageConfiguration, RESERVED_URLS};
+use bonsaidb::{
+    core::schema,
+    local::{config::Builder, AsyncDatabase},
+};
+use bonsaidb_files::{
+    direct::{Async, File},
+    BonsaiFiles, FileConfig, FilesSchema, Truncate,
+};
+use rand::distributions::DistString;
+
+type Result<T> = std::result::Result<T, bonsaidb::core::Error>;
+type FileResult<T> = std::result::Result<T, bonsaidb_files::Error>;
+
+#[derive(Debug, schema::Schema)]
+#[schema(name = "paste", include=[FilesSchema<BonsaiFiles>])]
+struct Schema;
+
+pub struct DB(pub AsyncDatabase);
+
+impl DB {
+    pub async fn new() -> Result<Self> {
+        Ok(Self(
+            AsyncDatabase::open::<Schema>(StorageConfiguration::new("data.bonsaidb")).await?,
+        ))
+    }
+
+    pub async fn load_file(&self, name: &str) -> FileResult<Option<File<Async<AsyncDatabase>>>> {
+        // TODO delete file if marked for deletion
+        BonsaiFiles::load_async(name, &self.0).await
+    }
+
+    pub async fn new_file(&self) -> FileResult<File<Async<AsyncDatabase>>> {
+        let mut tries = 0;
+        // TODO auto increase
+        let length = 4;
+        Ok(loop {
+            let name = loop {
+                let id = ReadableAlphanumeric.sample_string(&mut rand::thread_rng(), length);
+                if !RESERVED_URLS.contains(&id.as_str()) {
+                    break id;
+                }
+            };
+            tries += 1;
+            match BonsaiFiles::build(&name).create_async(&self.0).await {
+                Ok(file) => break file,
+                Err(bonsaidb_files::Error::Database(
+                    bonsaidb::core::Error::UniqueKeyViolation { .. },
+                )) if tries > 5 => {
+                    let file = BonsaiFiles::load_or_create_async(&name, true, &self.0).await?;
+                    file.truncate(0, Truncate::RemovingStart).await?;
+                    break file;
+                }
+                Err(bonsaidb_files::Error::Database(
+                    bonsaidb::core::Error::UniqueKeyViolation { .. },
+                )) => continue,
+                Err(err) => return Err(err),
+            }
+        })
+    }
+}

src/db.rs

@@ -2,33 +2,20 @@ use std::{env, path::PathBuf};
 
 use actix_web::{web::Data, App, HttpServer};
 use anyhow::Result;
-use bonsaidb::{
-    core::schema::{self, Collection},
-    local::{
-        config::{Builder, StorageConfiguration},
-        AsyncDatabase,
-    },
-};
-use bonsaidb_files::{BonsaiFiles, FilesSchema};
+use bonsaidb::local::config::StorageConfiguration;
 use log::{error, info};
-use serde::{Deserialize, Serialize};
 use syntect::parsing::SyntaxSet;
 
-use crate::config::Config;
+use config::Config;
+use db::DB;
 
 mod config;
+mod db;
 mod simple;
 mod util;
 
-#[derive(Debug, schema::Schema)]
-#[schema(name = "paste", include=[FilesSchema<BonsaiFiles>])]
-struct Schema;
 
-#[derive(Deserialize, Serialize, Collection, Debug, Clone)]
-#[collection(name = "entries")]
-struct ActiveEntries {
-    name: String,
-}
+pub const RESERVED_URLS: &[&str] = &["raw", "download", "delete"];
 
 #[tokio::main]
 async fn main() -> Result<()> {
@@ -48,8 +35,7 @@ async fn main() -> Result<()> {
 
     let config = Config::load(&config_path)?;
 
-    let database =
-        Data::new(AsyncDatabase::open::<Schema>(StorageConfiguration::new("data.bonsaidb")).await?);
+    let database = Data::new(DB::new().await?);
     let config = Data::new(config);
     let syntaxes = Data::new(SyntaxSet::load_defaults_newlines());