LemmyNet/pict-rs
2
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs synced 2025-01-09 19:21:41 +00:00
Code Releases Activity

Update dependencies

Browse source
This commit is contained in:
asonix 2022-09-10 11:01:28 -05:00
parent 885567b4e7
commit ea60fe7e1d
4 changed files with 514 additions and 512 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1007
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

6
Cargo.toml
View file

@ -42,7 +42,7 @@ reqwest = { version = "0.11.5", default-features = false, features = [
"rustls-tls", "rustls-tls",
"stream", "stream",
], optional = true } ], optional = true }
rust-s3 = { version = "0.29.0", default-features = false, features = [ rust-s3 = { version = "0.31.0", default-features = false, features = [
"fail-on-err", "fail-on-err",
"with-reqwest", "with-reqwest",
], optional = true, git = "https://github.com/asonix/rust-s3", branch = "asonix/generic-client" } ], optional = true, git = "https://github.com/asonix/rust-s3", branch = "asonix/generic-client" }
@ -68,10 +68,10 @@ tracing-subscriber = { version = "0.3.0", features = [
"tracing-log", "tracing-log",
] } ] }
url = { version = "2.2", features = ["serde"] } url = { version = "2.2", features = ["serde"] }
uuid = { version = "0.8.2", features = ["v4", "serde"] } uuid = { version = "1.1.2", features = ["v4", "serde"] }
[dependencies.tracing-actix-web] [dependencies.tracing-actix-web]
version = "0.5.0" version = "0.6.0"
default-features = false default-features = false
features = ["emit_event_on_error", "opentelemetry_0_17"] features = ["emit_event_on_error", "opentelemetry_0_17"]

2
src/magick.rs
View file

@ -180,7 +180,7 @@ where
parse_details(s) parse_details(s)
} }
pub(crate) async fn details_file(path_str: &str) -> Result<Details, Error> { async fn details_file(path_str: &str) -> Result<Details, Error> {
let process = Process::run( let process = Process::run(
"magick", "magick",
&["identify", "-ping", "-format", "%w %h | %m\n", path_str], &["identify", "-ping", "-format", "%w %h | %m\n", path_str],

11
src/store/object_store.rs
View file

@ -2,7 +2,8 @@ use crate::store::Store;
use actix_web::web::Bytes; use actix_web::web::Bytes;
use futures_util::stream::Stream; use futures_util::stream::Stream;
use s3::{ use s3::{
client::Client, command::Command, creds::Credentials, request_trait::Request, Bucket, Region, client::Client, command::Command, creds::Credentials, error::S3Error, request_trait::Request,
Bucket, Region,
}; };
use std::{ use std::{
pin::Pin, pin::Pin,
@ -31,6 +32,9 @@ pub(crate) enum ObjectError {
#[error(transparent)] #[error(transparent)]
Utf8(#[from] FromUtf8Error), Utf8(#[from] FromUtf8Error),
#[error(transparent)]
Upstream(#[from] S3Error),
#[error("Invalid length")] #[error("Invalid length")]
Length, Length,
@ -171,7 +175,7 @@ impl ObjectStore {
Ok(ObjectStore { Ok(ObjectStore {
path_gen, path_gen,
settings_tree, settings_tree,
bucket: Bucket::new_with_path_style( bucket: Bucket::new(
bucket_name, bucket_name,
match region { match region {
Region::Custom { endpoint, .. } => Region::Custom { Region::Custom { endpoint, .. } => Region::Custom {
@ -186,7 +190,8 @@ impl ObjectStore {
security_token, security_token,
session_token, session_token,
}, },
)?, )?
.with_path_style(),
client, client,
}) })
} }