diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_file_upload.rs b/crates/lib/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_file_upload.rs index 0285b3d242..514b208a3e 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_file_upload.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/specialized_insert/insert_media_file_from_file_upload.rs @@ -131,6 +131,8 @@ SET maybe_creator_file_synthetic_id = ?, maybe_creator_category_synthetic_id = ?, + is_user_upload = TRUE, + maybe_origin_model_type = NULL, maybe_origin_model_token = NULL "#, diff --git a/crates/lib/mysql_queries/src/queries/media_files/upsert/upsert_media_file_from_file_upload.rs b/crates/lib/mysql_queries/src/queries/media_files/upsert/upsert_media_file_from_file_upload.rs index d074a9198e..b5c8d2cb3a 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/upsert/upsert_media_file_from_file_upload.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/upsert/upsert_media_file_from_file_upload.rs @@ -134,6 +134,8 @@ SET maybe_creator_file_synthetic_id = ?, maybe_creator_category_synthetic_id = ?, + is_user_upload = TRUE, + maybe_origin_model_type = NULL, maybe_origin_model_token = NULL @@ -166,6 +168,8 @@ ON DUPLICATE KEY UPDATE maybe_creator_file_synthetic_id = ?, maybe_creator_category_synthetic_id = ?, + + is_user_upload = TRUE, maybe_origin_model_type = NULL, maybe_origin_model_token = NULL diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs index 8aaaae785a..6792a23b66 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_audio_media_file_handler.rs @@ -336,7 +336,7 @@ pub async fn upload_audio_media_file_handler( sha256_checksum: &hash, maybe_title: maybe_title.as_deref(), maybe_scene_source_media_file_token: None, - is_intermediate_system_file: false, + is_intermediate_system_file: false, // NB: is_user_upload = true public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, maybe_public_bucket_extension: Some(&extension), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs index 001f4a16af..a93727a7dd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs @@ -224,7 +224,7 @@ pub async fn upload_engine_asset_media_file_handler( sha256_checksum: &hash, maybe_title: upload_media_request.maybe_title.as_deref(), maybe_scene_source_media_file_token: None, - is_intermediate_system_file: false, + is_intermediate_system_file: false, // NB: is_user_upload = TRUE public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, maybe_public_bucket_extension: Some(suffix), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs index 54ad153fb7..ceee38637c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs @@ -371,7 +371,7 @@ pub async fn process_upload_media_file( sha256_checksum: &hash, maybe_title: upload_media_request.title.as_deref(), maybe_scene_source_media_file_token: None, - is_intermediate_system_file: false, + is_intermediate_system_file: false, // NB: is_user_upload = TRUE public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, maybe_public_bucket_extension: extension.as_deref(), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs index 6c7ba1fd23..5c5b314455 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_image_media_file_handler.rs @@ -280,7 +280,7 @@ pub async fn upload_image_media_file_handler( sha256_checksum: &hash, maybe_title: maybe_title.as_deref(), maybe_scene_source_media_file_token: None, - is_intermediate_system_file, + is_intermediate_system_file, // NB: is_user_upload = TRUE public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, maybe_public_bucket_extension: Some(&extension), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs index 3c41fdaa0b..01acb4c74f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_engine_asset_media_file_handler.rs @@ -221,7 +221,7 @@ pub async fn upload_new_engine_asset_media_file_handler( maybe_duration_millis: file_info.maybe_duration_millis, sha256_checksum: &file_info.sha256_checksum, maybe_scene_source_media_file_token: None, - is_intermediate_system_file: false, + is_intermediate_system_file: false, // NB: is_user_upload = TRUE maybe_title: file_info.maybe_title.as_deref(), public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs index f189a5c2bb..0a09a386eb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_scene_media_file_handler.rs @@ -248,7 +248,7 @@ pub async fn upload_new_scene_media_file_handler( sha256_checksum: &hash, maybe_title: maybe_title.as_deref(), maybe_scene_source_media_file_token: None, - is_intermediate_system_file: false, + is_intermediate_system_file: false, // NB: is_user_upload = TRUE public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, maybe_public_bucket_extension: Some(SUFFIX), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_video_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_video_media_file_handler.rs index 4164d3743e..394dd190da 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_video_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_new_video_media_file_handler.rs @@ -318,7 +318,7 @@ pub async fn upload_new_video_media_file_handler( sha256_checksum: &hash, maybe_title: maybe_title.as_deref(), maybe_scene_source_media_file_token, - is_intermediate_system_file, + is_intermediate_system_file, // NB: is_user_upload = TRUE public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, maybe_public_bucket_extension: Some(&extension), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs index e298b57519..4d7a62e7ff 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs @@ -280,7 +280,7 @@ pub async fn upload_pmx_media_file_handler( maybe_duration_millis, sha256_checksum: &pmx_details.sha256_checksum, maybe_scene_source_media_file_token: None, - is_intermediate_system_file: false, + is_intermediate_system_file: false, // NB: is_user_upload = TRUE maybe_title: maybe_title.as_deref(), public_bucket_directory_hash: pmx_details.pmx_public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs index b4e2ee2f9a..c377f32303 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_scene_snapshot_media_file_handler.rs @@ -241,6 +241,7 @@ pub async fn upload_scene_snapshot_media_file_handler( sha256_checksum: &hash, maybe_title: maybe_title.as_deref(), maybe_scene_source_media_file_token: maybe_scene_source_media_file_token.as_ref(), + // NB: is_user_upload = TRUE is_intermediate_system_file: true, // NB: This is a snapshot, so we shouldn't show it off in lists. public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_video_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_video_media_file_handler.rs index 208ae4539e..1abb1af7f3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_video_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_video_media_file_handler.rs @@ -235,7 +235,7 @@ pub async fn upload_video_media_file_handler( sha256_checksum: &hash, maybe_title: upload_media_request.title.as_deref(), maybe_scene_source_media_file_token: None, - is_intermediate_system_file: false, + is_intermediate_system_file: false, // NB: is_user_upload = TRUE public_bucket_directory_hash: public_upload_path.get_object_hash(), maybe_public_bucket_prefix: PREFIX, maybe_public_bucket_extension: Some(&extension),