diff --git a/src/generate.rs b/src/generate.rs index 2fb3cda..9ee0b76 100644 --- a/src/generate.rs +++ b/src/generate.rs @@ -52,7 +52,7 @@ pub(crate) async fn generate( state: &State, format: InputProcessableFormat, variant: String, - thumbnail_args: Vec, + variant_args: Vec, original_details: &Details, hash: Hash, ) -> Result<(Details, Arc), Error> { @@ -82,7 +82,7 @@ pub(crate) async fn generate( state, format, variant.clone(), - thumbnail_args, + variant_args, original_details, hash.clone(), ) @@ -167,7 +167,7 @@ async fn process( state: &State, output_format: InputProcessableFormat, variant: String, - thumbnail_args: Vec, + variant_args: Vec, original_details: &Details, hash: Hash, ) -> Result<(Details, Arc), Error> { @@ -193,7 +193,7 @@ async fn process( let stream = state.store.to_stream(&identifier, None, None).await?; let bytes = - crate::magick::process_image_command(state, thumbnail_args, input_format, format, quality) + crate::magick::process_image_command(state, variant_args, input_format, format, quality) .await? .drive_with_stream(stream) .into_bytes_stream() diff --git a/src/lib.rs b/src/lib.rs index 4cf13bb..f11f600 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -783,9 +783,9 @@ fn prepare_process( .parse::() .map_err(|_| UploadError::UnsupportedProcessExtension)?; - let (variant, thumbnail_args) = self::processor::build_chain(&operations, &format.to_string())?; + let (variant, variant_args) = self::processor::build_chain(&operations, &format.to_string())?; - Ok((format, variant, thumbnail_args)) + Ok((format, variant, variant_args)) } #[tracing::instrument(name = "Fetching derived details", skip(state))] @@ -852,8 +852,7 @@ async fn process( ) -> Result { let alias = proxy_alias_from_query(source.into(), &state).await?; - let (format, variant, thumbnail_args) = - prepare_process(&state.config, operations, ext.as_str())?; + let (format, variant, variant_args) = prepare_process(&state.config, operations, ext.as_str())?; let (hash, alias, not_found) = if let Some(hash) = state.repo.hash(&alias).await? { (hash, alias, false) @@ -892,7 +891,7 @@ async fn process( &state, format, variant, - thumbnail_args, + variant_args, &original_details, hash, )