asonix/use-bytes-stream #52

Merged
asonix merged 12 commits from asonix/use-bytes-stream into main 2024-02-23 01:36:10 +00:00
13 changed files with 15 additions and 16 deletions
Showing only changes of commit 0ebee2a07c - Show all commits

View file

@ -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::{

View file

@ -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)]

View file

@ -2,7 +2,7 @@ mod exiftool;
mod ffmpeg;
mod magick;
use actix_web::web::Bytes;
use crate::{bytes_stream::BytesStream, formats::InputFile, state::State};

View file

@ -1,4 +1,4 @@
use actix_web::web::Bytes;
use crate::{
bytes_stream::BytesStream,

View file

@ -13,7 +13,7 @@ use crate::{
process::Process,
state::State,
};
use actix_web::web::Bytes;
use super::Discovery;

View file

@ -1,7 +1,7 @@
#[cfg(test)]
mod tests;
use actix_web::web::Bytes;
use crate::{
bytes_stream::BytesStream,

View file

@ -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 {

View file

@ -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,

View file

@ -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;

View file

@ -14,7 +14,7 @@ use crate::{
process::ProcessRead,
state::State,
};
use actix_web::web::Bytes;
#[derive(Debug, thiserror::Error)]
pub(crate) enum ValidationError {

View file

@ -1,4 +1,4 @@
use actix_web::web::Bytes;
use crate::{
bytes_stream::BytesStream,

View file

@ -1,6 +1,6 @@
use std::{ffi::OsStr, sync::Arc};
use actix_web::web::Bytes;
use uuid::Uuid;
use crate::{

View file

@ -1,6 +1,6 @@
use std::ffi::OsStr;
use actix_web::web::Bytes;
use crate::{
bytes_stream::BytesStream,