media_files - maybe_media_subtype column

_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/down.sql

@@ -0,0 +1,5 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files DROP COLUMN maybe_media_subtype;

_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/up.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files
+    ADD COLUMN maybe_media_subtype VARCHAR(32) DEFAULT NULL
+    AFTER media_type;

_sql/migrations_squashed/media_files.sql

@@ -81,6 +81,12 @@ CREATE TABLE media_files (
   --   * 'video' for a variety of video types.
   media_type VARCHAR(16) NOT NULL,
 
+  -- A media file's possible subtype. Typically used for Storyteller Studio.
+  -- * 'mixamo' for mixamo animations (eg. for BVH, GLB, FBX, etc. files)
+  -- * 'mocap_net' for mocapnet animations (eg. for BVH files)
+  -- * 'scene' for generic scenes (eg. for BVH, GLB, FBX, etc. files)
+  maybe_media_subtype VARCHAR(32) DEFAULT NULL,
+
   -- The file's mime type.
   maybe_mime_type VARCHAR(32) DEFAULT NULL,
 

crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs

@@ -523,7 +523,8 @@ pub async fn process_job(args: ComfyProcessJobArgs<'_>) -> Result<JobSuccessResu
         }
 
         if use_watermarked_file {
-            final_finished_video_file = output_video_fs_path_watermark.clone();
+            info!("Using watermark file: {:?}", output_video_fs_path_watermark);
+            final_finished_video_file = output_video_fs_path_watermark;
         }
     }