cargo fmt
This commit is contained in:
parent
3d5010806b
commit
ba3326ef24
4 changed files with 116 additions and 74 deletions
31
src/main.rs
31
src/main.rs
|
@ -3,12 +3,16 @@ mod file;
|
|||
mod upload;
|
||||
mod zip;
|
||||
|
||||
use std::{collections::HashMap, task::Waker, sync::{mpsc::Sender, RwLock}, path::PathBuf};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
path::PathBuf,
|
||||
sync::{mpsc::Sender, RwLock},
|
||||
task::Waker,
|
||||
};
|
||||
|
||||
use actix::Addr;
|
||||
use actix_web::{
|
||||
get, middleware::Logger, web, App, HttpResponse, HttpServer,
|
||||
Responder, HttpRequest,
|
||||
get, middleware::Logger, web, App, HttpRequest, HttpResponse, HttpServer, Responder,
|
||||
};
|
||||
use actix_web_actors::ws;
|
||||
use time::OffsetDateTime;
|
||||
|
@ -31,7 +35,6 @@ impl UploadedFile {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
pub struct DownloadableFile {
|
||||
name: String,
|
||||
size: usize,
|
||||
|
@ -46,16 +49,8 @@ fn storage_dir() -> PathBuf {
|
|||
}
|
||||
|
||||
#[get("/upload")]
|
||||
async fn upload_socket(
|
||||
req: HttpRequest,
|
||||
stream: web::Payload,
|
||||
data: AppData,
|
||||
) -> impl Responder {
|
||||
ws::start(
|
||||
upload::Uploader::new(data),
|
||||
&req,
|
||||
stream
|
||||
)
|
||||
async fn upload_socket(req: HttpRequest, stream: web::Payload, data: AppData) -> impl Responder {
|
||||
ws::start(upload::Uploader::new(data), &req, stream)
|
||||
}
|
||||
|
||||
#[actix_web::main]
|
||||
|
@ -64,8 +59,12 @@ async fn main() -> std::io::Result<()> {
|
|||
|
||||
let data: AppData = web::Data::new(RwLock::new(HashMap::new()));
|
||||
|
||||
let static_dir = PathBuf::from(std::env::var("STATIC_DIR").unwrap_or_else(|_| String::from("static")));
|
||||
let port = std::env::var("PORT").ok().and_then(|p| p.parse::<u16>().ok()).unwrap_or(8080);
|
||||
let static_dir =
|
||||
PathBuf::from(std::env::var("STATIC_DIR").unwrap_or_else(|_| String::from("static")));
|
||||
let port = std::env::var("PORT")
|
||||
.ok()
|
||||
.and_then(|p| p.parse::<u16>().ok())
|
||||
.unwrap_or(8080);
|
||||
|
||||
HttpServer::new(move || {
|
||||
App::new()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue