From c2167c21261c53c1a3ec6503d1c710ffb955a2ef Mon Sep 17 00:00:00 2001
From: serxoz <serxoz@protonmail.ch>
Date: Mon, 24 Oct 2022 10:23:47 +0200
Subject: [PATCH] conf. en variables de entorno

---
 README.md              |  8 ++++++++
 src/lib.rs             | 19 +++++++++++++++++++
 src/main.rs            |  3 ++-
 src/vistas/download.rs |  5 ++---
 src/vistas/upload.rs   |  6 ++----
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index c9ca1a1..67c7d61 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,14 @@ Servicio para compartir arquivos.
 Recibe un arquivo.
 Devolve un link para descargalo.
 
+## Execución
+```
+UPLOADS="/tmp/uploads/" PORT=4000 cargo run
+```
+As variables de entorno UPLOADS e PORT son opcionais tendo como valores por defecto:
+- UPLOADS = "uploads/"
+- PORT = 3000
+
 ## Funcionamento
 ```
 curl -F'file=@fondo-mobil.jpg' https://sh4r.in
diff --git a/src/lib.rs b/src/lib.rs
index fb533c9..c82a04a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
 use rand::{distributions::Alphanumeric, Rng}; // 0.8
+use std::env;
 
 pub fn randstr() -> String {
     rand::thread_rng()
@@ -7,3 +8,21 @@ pub fn randstr() -> String {
         .map(char::from)
         .collect()
 }
+
+// le a variable de entorno UPLOADS para configurar o directorio de almacenamento
+// por defecto: dir_actual/uploads/
+pub fn env_uploads_dir() -> String {
+    match env::var_os("UPLOADS") {
+        Some(val) => val.into_string().unwrap(),
+        None => "uploads/".to_string(),
+    }
+}
+
+// le a variable de entorno PORT para configurar o porto de escoita
+// por defecto o 3000
+pub fn env_listen_port() -> u16 {
+    match env::var_os("PORT") {
+        Some(val) => val.into_string().unwrap().parse::<u16>().unwrap(),
+        None => 3000,
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index 334d9e5..350d0a3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,6 +6,7 @@ use axum::{
     Router,
 };
 use std::net::SocketAddr;
+use crate::lib::env_listen_port;
 
 use crate::vistas::{download::get_file, root::basic, upload::upload};
 
@@ -22,7 +23,7 @@ async fn main() {
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`
-    let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
+    let addr = SocketAddr::from(([127, 0, 0, 1], env_listen_port()));
     tracing::debug!("listening on {}", addr);
     axum::Server::bind(&addr)
         .serve(app.into_make_service())
diff --git a/src/vistas/download.rs b/src/vistas/download.rs
index dbb8779..97f25db 100644
--- a/src/vistas/download.rs
+++ b/src/vistas/download.rs
@@ -5,8 +5,7 @@ use axum::{
 };
 use tokio::fs::read_dir;
 use tokio_util::io::ReaderStream;
-
-const BASE_PATH: &str = "uploads";
+use crate::lib::env_uploads_dir;
 
 pub async fn get_file(axum::extract::Path(hash): axum::extract::Path<String>) -> impl IntoResponse {
     // find file from hash
@@ -41,7 +40,7 @@ async fn find_file(hash: String) -> Result<(String, String), tokio::io::Error> {
     let mut file_path = String::from("");
     let mut file_name = String::from("");
     let pai = &hash[0..1]; //primeiro char
-    let path = format!("{}/{}/{}", BASE_PATH, pai, hash);
+    let path = format!("{}/{}/{}", env_uploads_dir(), pai, hash);
 
     let mut dir = read_dir(path).await?;
     while let Some(child) = dir.next_entry().await? {
diff --git a/src/vistas/upload.rs b/src/vistas/upload.rs
index cd1196d..a5f1b30 100644
--- a/src/vistas/upload.rs
+++ b/src/vistas/upload.rs
@@ -1,12 +1,10 @@
-use crate::lib::randstr;
+use crate::lib::{randstr, env_uploads_dir};
 use axum::{
     extract::Multipart,
     response::{IntoResponse, Response},
 };
 use tokio::{fs::create_dir_all, fs::File, io::AsyncWriteExt};
 
-const BASE_PATH: &str = "uploads";
-
 // upload view
 pub async fn upload(mut multipart: Multipart) -> Response {
     let mut link = String::from("");
@@ -21,7 +19,7 @@ pub async fn upload(mut multipart: Multipart) -> Response {
 
         let fillo = randstr(); // directorio que aloxará o arquivo
         let pai = &fillo[0..1]; // agrupase por directorios co mesmo comezo (1ºchar)
-        let path = format!("{}/{}/{}", BASE_PATH, pai, fillo);
+        let path = format!("{}/{}/{}", env_uploads_dir(), pai, fillo);
         let dest = format!("{}/{}", path, filename);
 
         create_dir_all(&path)