mirror of
https://git.asonix.dog/asonix/pict-rs
synced 2024-12-25 12:01:24 +00:00
asonix
554d852e68
Add .is_not_found() for Store errors, wire up Object and File storage to properly set NotFound Allow skipping files that are not found during store migration
66 lines
1.7 KiB
Rust
66 lines
1.7 KiB
Rust
use crate::{
|
|
error::{Error, UploadError},
|
|
store::Store,
|
|
};
|
|
use actix_web::{
|
|
http::header::{ByteRangeSpec, ContentRange, ContentRangeSpec, Range},
|
|
web::Bytes,
|
|
};
|
|
use futures_util::stream::{once, Stream};
|
|
use std::future::ready;
|
|
|
|
pub(crate) fn chop_bytes(
|
|
byte_range: &ByteRangeSpec,
|
|
bytes: Bytes,
|
|
length: u64,
|
|
) -> Result<impl Stream<Item = Result<Bytes, Error>>, Error> {
|
|
if let Some((start, end)) = byte_range.to_satisfiable_range(length) {
|
|
// END IS INCLUSIVE
|
|
let end = end as usize + 1;
|
|
return Ok(once(ready(Ok(bytes.slice(start as usize..end)))));
|
|
}
|
|
|
|
Err(UploadError::Range.into())
|
|
}
|
|
|
|
pub(crate) async fn chop_store<S: Store>(
|
|
byte_range: &ByteRangeSpec,
|
|
store: &S,
|
|
identifier: &S::Identifier,
|
|
length: u64,
|
|
) -> Result<impl Stream<Item = std::io::Result<Bytes>>, Error> {
|
|
if let Some((start, end)) = byte_range.to_satisfiable_range(length) {
|
|
// END IS INCLUSIVE
|
|
let end = end + 1;
|
|
return store
|
|
.to_stream(identifier, Some(start), Some(end.saturating_sub(start)))
|
|
.await
|
|
.map_err(Error::from);
|
|
}
|
|
|
|
Err(UploadError::Range.into())
|
|
}
|
|
|
|
pub(crate) fn single_bytes_range(range: &Range) -> Option<&ByteRangeSpec> {
|
|
if let Range::Bytes(ranges) = range {
|
|
if ranges.len() == 1 {
|
|
return ranges.get(0);
|
|
}
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
pub(crate) fn to_content_range(
|
|
byte_range: &ByteRangeSpec,
|
|
instance_length: u64,
|
|
) -> Option<ContentRange> {
|
|
byte_range
|
|
.to_satisfiable_range(instance_length)
|
|
.map(|range| {
|
|
ContentRange(ContentRangeSpec::Bytes {
|
|
range: Some(range),
|
|
instance_length: Some(instance_length),
|
|
})
|
|
})
|
|
}
|