From d81bd219a29b9538d44dc5073c519f54bb3a2965 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sat, 22 Jun 2024 18:31:50 -0400
Subject: [PATCH] cleanup modules, rename

---
 .../workflow/comfy_ui/video_style_transfer/process_job.rs   | 4 ++--
 .../workflow/comfy_ui/video_style_transfer/steps/mod.rs     | 2 +-
 ...ocess_video.rs => preprocess_trim_and_resample_video.rs} | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/{trim_and_preprocess_video.rs => preprocess_trim_and_resample_video.rs} (96%)

diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/process_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/process_job.rs
index 1c1f1d7d2f..0362fdceb6 100644
--- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/process_job.rs
+++ b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/process_job.rs
@@ -50,7 +50,7 @@ use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::down
 use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::download_input_video::{download_input_video, DownloadInputVideoArgs};
 use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::post_process_add_watermark::{post_process_add_watermark, PostProcessAddWatermarkArgs};
 use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::post_process_restore_audio::{post_process_restore_audio, PostProcessRestoreVideoArgs};
-use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::trim_and_preprocess_video::{trim_and_preprocess_video, TrimAndProcessVideoArgs};
+use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::preprocess_trim_and_resample_video::{preprocess_trim_and_resample_video, ProcessTrimAndResampleVideoArgs};
 use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::validate_and_save_results::{SaveResultsArgs, validate_and_save_results};
 use crate::job::job_types::workflow::comfy_ui::video_style_transfer::video_paths::VideoPaths;
 use crate::job::job_types::workflow::comfy_ui::video_style_transfer::write_workflow_prompt::{WorkflowPromptArgs, write_workflow_prompt};
@@ -254,7 +254,7 @@ pub async fn process_job(args: ComfyProcessJobArgs<'_>) -> Result<JobSuccessResu
 
     // ========================= TRIM AND PREPROCESS VIDEO ======================== //
 
-    trim_and_preprocess_video(TrimAndProcessVideoArgs {
+    preprocess_trim_and_resample_video(ProcessTrimAndResampleVideoArgs {
         comfy_args,
         comfy_deps: model_dependencies,
         videos: &videos,
diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/mod.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/mod.rs
index a937210ac4..fa8a360e29 100644
--- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/mod.rs
+++ b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/mod.rs
@@ -3,5 +3,5 @@ pub mod download_global_ipa_image;
 pub mod download_input_video;
 pub mod post_process_add_watermark;
 pub mod post_process_restore_audio;
-pub mod trim_and_preprocess_video;
+pub mod preprocess_trim_and_resample_video;
 pub mod validate_and_save_results;
diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/trim_and_preprocess_video.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/preprocess_trim_and_resample_video.rs
similarity index 96%
rename from crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/trim_and_preprocess_video.rs
rename to crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/preprocess_trim_and_resample_video.rs
index fbf590533d..aa1fb764b5 100644
--- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/trim_and_preprocess_video.rs
+++ b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/video_style_transfer/steps/preprocess_trim_and_resample_video.rs
@@ -15,14 +15,14 @@ use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
 use crate::job::job_types::workflow::comfy_ui::comfy_ui_dependencies::ComfyDependencies;
 use crate::job::job_types::workflow::comfy_ui::video_style_transfer::video_paths::VideoPaths;
 
-pub struct TrimAndProcessVideoArgs<'a> {
+pub struct ProcessTrimAndResampleVideoArgs<'a> {
   pub comfy_args: &'a WorkflowArgs,
   pub comfy_deps: &'a ComfyDependencies,
   pub videos: &'a VideoPaths,
 }
 
-pub fn trim_and_preprocess_video(
-  args: TrimAndProcessVideoArgs<'_>
+pub fn preprocess_trim_and_resample_video(
+  args: ProcessTrimAndResampleVideoArgs<'_>
 ) -> Result<(), ProcessSingleJobError> {
   let target_fps = args.comfy_args.target_fps.unwrap_or(24);