fionera
/
datatrash
forked from neri/datatrash
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade dependencies

This commit is contained in:
neri 2022-07-02 22:28:48 +02:00
parent 36b9096325
commit bf7c762f83
4 changed files with 216 additions and 390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

585
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

14
Cargo.toml
View File

@ -1,30 +1,30 @@
[package] [package]
name = "datatrash" name = "datatrash"
version = "1.1.2" version = "1.1.3"
authors = ["neri"] authors = ["neri"]
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
actix-web = { version = "4.0.1", default-features = false, features = [ actix-web = { version = "4.1.0", default-features = false, features = [
"macros", "macros",
"compress-gzip", "compress-gzip",
"compress-zstd", "compress-zstd",
] } ] }
sqlx = { version = "0.5.13", default-features = false, features = [ sqlx = { version = "0.6.0", default-features = false, features = [
"runtime-tokio-rustls", "runtime-tokio-rustls",
"postgres", "postgres",
"time", "time",
] } ] }
env_logger = "0.9.0" env_logger = "0.9.0"
log = "0.4.16" log = "0.4.17"
actix-files = "0.6.0" actix-files = "0.6.1"
tokio = { version = "1.17.0", features = ["rt", "macros", "sync"] } tokio = { version = "1.19.2", features = ["rt", "macros", "sync"] }
actix-multipart = "0.4.0" actix-multipart = "0.4.0"
futures-util = "0.3.21" futures-util = "0.3.21"
rand = "0.8.5" rand = "0.8.5"
time = "0.2.27" time = "0.3.11"
htmlescape = "0.3.1" htmlescape = "0.3.1"
urlencoding = "2.1.0" urlencoding = "2.1.0"
tree_magic_mini = { version = "3.0.3", features = ["with-gpl-data"] } tree_magic_mini = { version = "3.0.3", features = ["with-gpl-data"] }

2
src/db.rs
View File

@ -7,7 +7,7 @@ pub async fn setup_db() -> PgPool {
let pool = PgPoolOptions::new() let pool = PgPoolOptions::new()
.max_connections(5) .max_connections(5)
.connect_timeout(std::time::Duration::from_secs(5)) .acquire_timeout(std::time::Duration::from_secs(5))
.connect(conn_url) .connect(conn_url)
.await .await
.expect("could not create db pool"); .expect("could not create db pool");

5
src/multipart.rs
View File

@ -3,8 +3,7 @@ use actix_multipart::{Field, Multipart};
use actix_web::{error, http::header::DispositionParam, Error}; use actix_web::{error, http::header::DispositionParam, Error};
use futures_util::{StreamExt, TryStreamExt}; use futures_util::{StreamExt, TryStreamExt};
use std::path::Path; use std::path::Path;
use time::OffsetDateTime; use time::{Duration, OffsetDateTime};
use time::{ext::NumericalDuration, Duration};
use tokio::{fs::File, io::AsyncWriteExt}; use tokio::{fs::File, io::AsyncWriteExt};
const MAX_UPLOAD_SECONDS: i64 = 31 * 24 * 60 * 60; const MAX_UPLOAD_SECONDS: i64 = 31 * 24 * 60 * 60;
@ -72,7 +71,7 @@ pub(crate) async fn parse_multipart(
.transpose() .transpose()
.map_err(|e| error::ErrorBadRequest(format!("field keep_for is not a number: {}", e)))? .map_err(|e| error::ErrorBadRequest(format!("field keep_for is not a number: {}", e)))?
.unwrap_or(DEFAULT_UPLOAD_SECONDS); .unwrap_or(DEFAULT_UPLOAD_SECONDS);
let valid_duration = keep_for.seconds(); let valid_duration = Duration::seconds(keep_for.into());
let valid_till = OffsetDateTime::now_utc() + valid_duration; let valid_till = OffsetDateTime::now_utc() + valid_duration;
let upload_config = UploadConfig { let upload_config = UploadConfig {