From b7091b8b072e1fda4868dc396728ede2300d8031 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 28 Aug 2024 01:50:21 -0400 Subject: [PATCH] heuristic for frame type --- .../extract_frames_from_zip.rs | 16 ++++++++++++++-- .../upload_studio_shot/ffmpeg_frames_to_mp4.rs | 6 +----- .../upload/upload_studio_shot/frame_type.rs | 6 ++++++ .../media_files/upload/upload_studio_shot/mod.rs | 5 +++-- .../upload_studio_shot_media_file_handler.rs | 8 ++++---- 5 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/frame_type.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/extract_frames_from_zip.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/extract_frames_from_zip.rs index 14964d976e..8535bc2edd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/extract_frames_from_zip.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/extract_frames_from_zip.rs @@ -8,6 +8,7 @@ use zip::ZipArchive; use filesys::path_to_string::path_to_string; +use crate::http_server::endpoints::media_files::upload::upload_studio_shot::frame_type::FrameType; use crate::http_server::web_utils::open_zip_archive::{open_zip_archive, OpenZipError}; static ALLOWED_FRAME_EXTENSIONS: Lazy> = Lazy::new(|| { @@ -33,7 +34,7 @@ pub enum ExtractFramesError { pub fn extract_frames_from_zip>( zip_container_file_bytes: &[u8], frame_temp_dir: P, -) -> Result<(), ExtractFramesError> { +) -> Result { info!("Opening archive..."); @@ -47,6 +48,8 @@ pub fn extract_frames_from_zip>( let entries = get_relevant_zip_entries(&mut archive)?; + let mut maybe_frame_type = None; + for entry in entries.iter() { debug!("Entry: {:?}", entry); @@ -87,9 +90,18 @@ pub fn extract_frames_from_zip>( error!("Problem copying file bytes {:?} : {:?}", output_path, err); ExtractFramesError::ExtractionError })?; + + // Lazy heuristic to determine the frame type. + if maybe_frame_type.is_none() { + maybe_frame_type = Some(match filesystem_name { + name if name.ends_with(".png") => FrameType::Png, + name if name.ends_with(".jpg") => FrameType::Jpg, + _ => FrameType::Jpg, + }); + } } - Ok(()) + Ok(maybe_frame_type.unwrap_or(FrameType::Jpg)) } #[derive(Debug, Clone)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/ffmpeg_frames_to_mp4.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/ffmpeg_frames_to_mp4.rs index ec45f01815..10cec0c982 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/ffmpeg_frames_to_mp4.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/ffmpeg_frames_to_mp4.rs @@ -9,11 +9,7 @@ use errors::AnyhowResult; use filesys::path_to_string::path_to_string; use videos::ffprobe_get_info::{ffprobe_get_info, VideoDimensions, VideoDuration}; -#[derive(Copy,Clone,Debug)] -pub enum FrameType { - Png, - Jpg, -} +use crate::http_server::endpoints::media_files::upload::upload_studio_shot::frame_type::FrameType; pub struct OutputFile { pub path: PathBuf, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/frame_type.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/frame_type.rs new file mode 100644 index 0000000000..659b46ccdb --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/frame_type.rs @@ -0,0 +1,6 @@ + +#[derive(Copy,Clone,Debug)] +pub enum FrameType { + Png, + Jpg, +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/mod.rs index 170fdf246e..2cda1b788a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/mod.rs @@ -1,3 +1,4 @@ pub mod extract_frames_from_zip; -pub mod upload_studio_shot_media_file_handler; -mod ffmpeg_frames_to_mp4; \ No newline at end of file +pub mod ffmpeg_frames_to_mp4; +pub mod frame_type; +pub mod upload_studio_shot_media_file_handler; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs index ad39ad54c1..46b7705416 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_studio_shot/upload_studio_shot_media_file_handler.rs @@ -26,8 +26,8 @@ use http_server_common::request::get_request_ip::get_request_ip; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; use mimetypes::mimetype_to_extension::mimetype_to_extension; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; use mysql_queries::queries::media_files::create::insert_media_file_from_studio_scene_render::{insert_media_file_from_studio_scene_render, InsertStudioSceneRenderArgs}; +use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType}; use tokens::tokens::media_files::MediaFileToken; use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len}; @@ -37,7 +37,7 @@ use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileU use crate::http_server::endpoints::media_files::upload::upload_new_scene_media_file_handler::UploadNewSceneMediaFileForm; use crate::http_server::endpoints::media_files::upload::upload_pmx::extract_and_upload_pmx_files::{extract_and_upload_pmx_files, PmxError}; use crate::http_server::endpoints::media_files::upload::upload_studio_shot::extract_frames_from_zip::{extract_frames_from_zip, ExtractFramesError}; -use crate::http_server::endpoints::media_files::upload::upload_studio_shot::ffmpeg_frames_to_mp4::{ffmpeg_frames_to_mp4, FrameType}; +use crate::http_server::endpoints::media_files::upload::upload_studio_shot::ffmpeg_frames_to_mp4::ffmpeg_frames_to_mp4; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::web_utils::user_session::require_moderator::{require_moderator, RequireModeratorError, UseDatabase}; use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection; @@ -228,7 +228,7 @@ pub async fn upload_studio_shot_media_file_handler( MediaFileUploadError::ServerError })?; - extract_frames_from_zip(&file_bytes, frame_temp_dir.path()) + let frame_type = extract_frames_from_zip(&file_bytes, frame_temp_dir.path()) .map_err(|err| { warn!("Extract frames error: {:?}", err); match err { @@ -248,7 +248,7 @@ pub async fn upload_studio_shot_media_file_handler( .map(|fps| *fps) .unwrap_or(DEFAULT_FPS); - let video_file_details = ffmpeg_frames_to_mp4(frame_temp_dir.path(), FrameType::Png, frame_rate) + let video_file_details = ffmpeg_frames_to_mp4(frame_temp_dir.path(), frame_type, frame_rate) .map_err(|err| { warn!("FFMPEG error: {:?}", err); MediaFileUploadError::ServerError