diff --git a/src/concurrent_processor.rs b/src/concurrent_processor.rs index e7d0fc3..b15b521 100644 --- a/src/concurrent_processor.rs +++ b/src/concurrent_processor.rs @@ -3,7 +3,7 @@ use crate::{ error::{Error, UploadError}, repo::Hash, }; -use actix_web::web; + use dashmap::{mapref::entry::Entry, DashMap}; use flume::{r#async::RecvFut, Receiver, Sender}; use std::{ diff --git a/src/details.rs b/src/details.rs index d4fd6c0..90a7333 100644 --- a/src/details.rs +++ b/src/details.rs @@ -6,7 +6,7 @@ use crate::{ serde_str::Serde, state::State, }; -use actix_web::web; + use time::{format_description::well_known::Rfc3339, OffsetDateTime}; #[derive(Copy, Clone, Debug, serde::Deserialize, serde::Serialize)] diff --git a/src/discover.rs b/src/discover.rs index a6adc7f..362a4cf 100644 --- a/src/discover.rs +++ b/src/discover.rs @@ -2,7 +2,7 @@ mod exiftool; mod ffmpeg; mod magick; -use actix_web::web::Bytes; + use crate::{bytes_stream::BytesStream, formats::InputFile, state::State}; diff --git a/src/discover/exiftool.rs b/src/discover/exiftool.rs index 98534d2..2549827 100644 --- a/src/discover/exiftool.rs +++ b/src/discover/exiftool.rs @@ -1,4 +1,4 @@ -use actix_web::web::Bytes; + use crate::{ bytes_stream::BytesStream, diff --git a/src/discover/ffmpeg.rs b/src/discover/ffmpeg.rs index 1162489..f4d3d19 100644 --- a/src/discover/ffmpeg.rs +++ b/src/discover/ffmpeg.rs @@ -13,7 +13,7 @@ use crate::{ process::Process, state::State, }; -use actix_web::web::Bytes; + use super::Discovery; diff --git a/src/discover/magick.rs b/src/discover/magick.rs index 349af37..fb77356 100644 --- a/src/discover/magick.rs +++ b/src/discover/magick.rs @@ -1,7 +1,7 @@ #[cfg(test)] mod tests; -use actix_web::web::Bytes; + use crate::{ bytes_stream::BytesStream, diff --git a/src/exiftool.rs b/src/exiftool.rs index 5086ce6..027b53b 100644 --- a/src/exiftool.rs +++ b/src/exiftool.rs @@ -3,7 +3,7 @@ use crate::{ error_code::ErrorCode, process::{Process, ProcessError, ProcessRead}, }; -use actix_web::web::Bytes; + #[derive(Debug, thiserror::Error)] pub(crate) enum ExifError { diff --git a/src/generate.rs b/src/generate.rs index 9373d83..43f7360 100644 --- a/src/generate.rs +++ b/src/generate.rs @@ -2,7 +2,6 @@ mod ffmpeg; mod magick; use crate::{ - bytes_stream::BytesStream, concurrent_processor::ProcessMap, details::Details, error::{Error, UploadError}, @@ -12,7 +11,7 @@ use crate::{ state::State, store::Store, }; -use actix_web::web::Bytes; + use std::{ path::PathBuf, sync::Arc, diff --git a/src/process.rs b/src/process.rs index 89239bc..1189de2 100644 --- a/src/process.rs +++ b/src/process.rs @@ -1,4 +1,4 @@ -use actix_web::web::Bytes; + use std::{ ffi::OsStr, future::Future, @@ -6,9 +6,9 @@ use std::{ sync::Arc, time::{Duration, Instant}, }; -use streem::IntoStreamer; + use tokio::{ - io::{AsyncReadExt, AsyncWriteExt}, + io::{AsyncReadExt}, process::{Child, ChildStdin, Command}, }; use tokio_util::io::ReaderStream; diff --git a/src/validate.rs b/src/validate.rs index 751877e..4358491 100644 --- a/src/validate.rs +++ b/src/validate.rs @@ -14,7 +14,7 @@ use crate::{ process::ProcessRead, state::State, }; -use actix_web::web::Bytes; + #[derive(Debug, thiserror::Error)] pub(crate) enum ValidationError { diff --git a/src/validate/exiftool.rs b/src/validate/exiftool.rs index fe757ae..2705c11 100644 --- a/src/validate/exiftool.rs +++ b/src/validate/exiftool.rs @@ -1,4 +1,4 @@ -use actix_web::web::Bytes; + use crate::{ bytes_stream::BytesStream, diff --git a/src/validate/ffmpeg.rs b/src/validate/ffmpeg.rs index a5039c2..b67ac80 100644 --- a/src/validate/ffmpeg.rs +++ b/src/validate/ffmpeg.rs @@ -1,6 +1,6 @@ use std::{ffi::OsStr, sync::Arc}; -use actix_web::web::Bytes; + use uuid::Uuid; use crate::{ diff --git a/src/validate/magick.rs b/src/validate/magick.rs index e90b2b3..d6c1ab1 100644 --- a/src/validate/magick.rs +++ b/src/validate/magick.rs @@ -1,6 +1,6 @@ use std::ffi::OsStr; -use actix_web::web::Bytes; + use crate::{ bytes_stream::BytesStream,