xenofem
/
transbeam
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

clippy and fmt

main
xenofem 2022-05-24 16:52:00 -04:00
parent 8497b4137d
commit 62e6d64253
3 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/download.rs
View File

@ -16,8 +16,8 @@ use inotify::{Inotify, WatchMask};
use log::trace;
use pin_project_lite::pin_project;
use serde::{de, Deserialize, Deserializer};
use time::OffsetDateTime;
use std::{os::unix::fs::MetadataExt, time::SystemTime};
use time::OffsetDateTime;
use actix_web::{
body::{self, BoxBody, SizedStream},
@ -64,7 +64,9 @@ impl<'de> de::Visitor<'de> for SelectionVisitor {
}
fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
where E: de::Error {
where
E: de::Error,
{
if v == "all" {
Ok(DownloadSelection::All)
} else if let Ok(n) = v.parse::<usize>() {
@ -76,9 +78,7 @@ impl<'de> de::Visitor<'de> for SelectionVisitor {
}
impl<'de> Deserialize<'de> for DownloadSelection {
fn deserialize<D: Deserializer<'de>>(
de: D
) -> Result<DownloadSelection, D::Error> {
fn deserialize<D: Deserializer<'de>>(de: D) -> Result<DownloadSelection, D::Error> {
de.deserialize_any(SelectionVisitor)
}
}
@ -122,8 +122,10 @@ impl DownloadingFile {
}
fn baseline_offset(&self) -> u64 {
if let (DownloadSelection::One(n), Some(files)) = (self.selection, self.info.contents.as_ref()) {
crate::zip::file_data_offset(&files, n)
if let (DownloadSelection::One(n), Some(files)) =
(self.selection, self.info.contents.as_ref())
{
crate::zip::file_data_offset(files, n)
} else {
0
}
@ -184,12 +186,7 @@ impl DownloadingFile {
res.insert_header((
header::CONTENT_RANGE,
format!(
"bytes {}-{}/{}",
offset,
offset + length - 1,
total_size,
),
format!("bytes {}-{}/{}", offset, offset + length - 1, total_size,),
));
} else {
res.insert_header((header::CONTENT_RANGE, format!("bytes */{}", length)));
@ -209,7 +206,12 @@ impl DownloadingFile {
.map_into_boxed_body();
}
let reader = new_live_reader(length, self.baseline_offset() + offset, self.file, self.storage_path);
let reader = new_live_reader(
length,
self.baseline_offset() + offset,
self.file,
self.storage_path,
);
if offset != 0 || length != total_size {
res.status(StatusCode::PARTIAL_CONTENT);

43
src/main.rs
View File

@ -8,8 +8,8 @@ use std::{fmt::Debug, path::PathBuf, str::FromStr};
use actix_files::NamedFile;
use actix_web::{
error::InternalError, get, http::StatusCode, middleware::Logger, post, web, App, HttpRequest, HttpResponse,
HttpServer, Responder,
error::InternalError, get, http::StatusCode, middleware::Logger, post, web, App, HttpRequest,
HttpResponse, HttpServer, Responder,
};
use actix_web_actors::ws;
use askama::Template;
@ -51,7 +51,6 @@ pub fn log_auth_failure(ip_addr: &str) {
warn!("Incorrect authentication attempt from {}", ip_addr);
}
#[derive(Deserialize)]
struct DownloadRequest {
code: String,
@ -81,7 +80,7 @@ async fn handle_download(
let info = if let Some(i) = info {
i
} else {
return not_found(req, data, true)
return not_found(req, data, true);
};
let storage_path = data.config.storage_dir.join(code);
@ -102,15 +101,19 @@ async fn handle_download(
info,
selection,
}
.into_response(&req))
.into_response(&req))
} else {
let offsets = info.contents.as_deref().map(zip::file_data_offsets);
Ok(HttpResponse::Ok().body(DownloadInfo {
file: info,
code: code.clone(),
available: file.metadata().await?.len(),
offsets,
}.render().unwrap()))
Ok(HttpResponse::Ok().body(
DownloadInfo {
file: info,
code: code.clone(),
available: file.metadata().await?.len(),
offsets,
}
.render()
.unwrap(),
))
}
}
@ -133,7 +136,7 @@ async fn download_info(
let info = if let Some(i) = info {
i
} else {
return not_found(req, data, true)
return not_found(req, data, true);
};
let storage_path = data.config.storage_dir.join(code);
@ -146,18 +149,18 @@ async fn download_info(
}))
}
fn not_found<T>(
req: HttpRequest,
data: web::Data<AppState>,
report: bool,
) -> actix_web::Result<T> {
fn not_found<T>(req: HttpRequest, data: web::Data<AppState>, report: bool) -> actix_web::Result<T> {
if report {
let ip_addr = get_ip_addr(&req, data.config.reverse_proxy);
log_auth_failure(&ip_addr);
}
Err(InternalError::from_response("Download not found", NamedFile::open(data.config.static_dir.join("404.html"))?
.set_status_code(StatusCode::NOT_FOUND)
.into_response(&req)).into())
Err(InternalError::from_response(
"Download not found",
NamedFile::open(data.config.static_dir.join("404.html"))?
.set_status_code(StatusCode::NOT_FOUND)
.into_response(&req),
)
.into())
}
#[get("/upload")]

9
src/timestamp.rs
View File

@ -3,10 +3,7 @@ use core::fmt;
use serde::{de::Visitor, Deserializer, Serializer};
use time::OffsetDateTime;
pub(crate) fn serialize<S: Serializer>(
time: &OffsetDateTime,
ser: S,
) -> Result<S::Ok, S::Error> {
pub(crate) fn serialize<S: Serializer>(time: &OffsetDateTime, ser: S) -> Result<S::Ok, S::Error> {
ser.serialize_i64(time.unix_timestamp())
}
@ -28,9 +25,7 @@ impl<'de> Visitor<'de> for I64Visitor {
}
}
pub(crate) fn deserialize<'de, D: Deserializer<'de>>(
de: D,
) -> Result<OffsetDateTime, D::Error> {
pub(crate) fn deserialize<'de, D: Deserializer<'de>>(de: D) -> Result<OffsetDateTime, D::Error> {
Ok(
OffsetDateTime::from_unix_timestamp(de.deserialize_i64(I64Visitor)?)
.unwrap_or_else(|_| OffsetDateTime::now_utc()),