neri
/
datatrash
1
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

Remove Baseurl Env var and add more flexible db config #3

Merged
neri merged 3 commits from fionera/datatrash:master into master 2020-08-02 23:12:25 +00:00
Conversation 0 Commits 3 Files Changed 3 +7 -15
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64be9b7f0c - Show all commits

18
src/main.rs
View File

@ -4,13 +4,7 @@ mod multipart;
use actix_files::{Files, NamedFile}; use actix_files::{Files, NamedFile};
use actix_multipart::Multipart; use actix_multipart::Multipart;
use actix_web::{ use actix_web::{error, http::header::{ContentDisposition, DispositionParam, DispositionType}, middleware, web::{self, Bytes}, App, Error, FromRequest, HttpRequest, HttpResponse, HttpServer};
error,
http::header::{ContentDisposition, DispositionParam, DispositionType},
middleware,
web::{self, Bytes},
App, Error, FromRequest, HttpRequest, HttpResponse, HttpServer,
};
use async_std::{ use async_std::{
fs, fs,
path::PathBuf, path::PathBuf,
@ -79,10 +73,10 @@ async fn upload(
.finish()) .finish())
} }
async fn uploaded(id: web::Path<String>, config: web::Data<Config>) -> Result<HttpResponse, Error> { async fn uploaded(id: web::Path<String>, req: web::HttpRequest) -> Result<HttpResponse, Error> {
let url = req.url_for("file", &[id.as_str()])?;
let upload_html = UPLOAD_HTML let upload_html = UPLOAD_HTML
.replace("{id}", id.as_ref()) .replace("{url}", url.as_str());
.replace("{server}", &config.server_url);
Ok(HttpResponse::Ok() Ok(HttpResponse::Ok()
.content_type("text/html") .content_type("text/html")
.body(upload_html)) .body(upload_html))
@ -175,7 +169,6 @@ async fn setup_db() -> PgPool {
#[derive(Clone)] #[derive(Clone)]
struct Config { struct Config {
server_url: String,
files_dir: PathBuf, files_dir: PathBuf,
} }
@ -188,7 +181,6 @@ async fn main() -> std::io::Result<()> {
let pool: PgPool = setup_db().await; let pool: PgPool = setup_db().await;
let config = Config { let config = Config {
server_url: env::var("SERVER_URL").unwrap_or_else(|_| "http://localhost:8000".to_owned()),
files_dir: PathBuf::from(env::var("FILES_DIR").unwrap_or_else(|_| "./files".to_owned())), files_dir: PathBuf::from(env::var("FILES_DIR").unwrap_or_else(|_| "./files".to_owned())),
}; };
fs::create_dir_all(&config.files_dir) fs::create_dir_all(&config.files_dir)
@ -223,7 +215,7 @@ async fn main() -> std::io::Result<()> {
.service(web::resource("/").route(web::get().to(index))) .service(web::resource("/").route(web::get().to(index)))
.service(web::resource("/upload").route(web::post().to(upload))) .service(web::resource("/upload").route(web::post().to(upload)))
.service(web::resource("/upload/{id}").route(web::get().to(uploaded))) .service(web::resource("/upload/{id}").route(web::get().to(uploaded)))
.service(web::resource("/file/{id}").route(web::get().to(download))) .service(web::resource("/file/{id}").name("file").route(web::get().to(download)))
.service(Files::new("/static", "static").disable_content_disposition()) .service(Files::new("/static", "static").disable_content_disposition())
} }
}) })

4
template/upload.html
View File

@ -11,8 +11,8 @@
<h1><a href="/">datatrash</a></h1> <h1><a href="/">datatrash</a></h1>
<p> <p>
Datei-Link: Datei-Link:
<a href="{server}/file/{id}"> <a href="{url}">
{server}/files/{id} {url}
</a> </a>
</p> </p>
</main> </main>