diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs index 8aab2e3fd9..ab050af1f6 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files.rs @@ -55,6 +55,8 @@ pub struct MediaFileListItem { pub maybe_text_transcript: Option, pub maybe_prompt_args: Option, + pub maybe_duration_millis: Option, + pub creator_set_visibility: Visibility, pub maybe_file_cover_image_public_bucket_hash: Option, @@ -132,6 +134,7 @@ pub async fn list_media_files(args: ListMediaFilesArgs<'_>) -> AnyhowResult, maybe_text_transcript: Option, maybe_other_prompt_args: Option, + maybe_duration_millis: Option, created_at: DateTime, updated_at: DateTime, @@ -400,6 +405,7 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal { maybe_title: row.try_get("maybe_title")?, maybe_text_transcript: row.try_get("maybe_text_transcript")?, maybe_other_prompt_args: row.try_get("maybe_other_prompt_args")?, + maybe_duration_millis: row.try_get("maybe_duration_millis")?, created_at: row.try_get("created_at")?, updated_at: row.try_get("updated_at")?, comment_count: row.try_get("comment_count")?, diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs index c52a770af0..53dc86656a 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs @@ -48,6 +48,8 @@ pub struct MediaFileListItem { pub maybe_text_transcript: Option, pub maybe_prompt_args: Option, + pub maybe_duration_millis: Option, + pub maybe_ratings_positive_count: Option, pub maybe_ratings_negative_count: Option, pub maybe_bookmark_count: Option, @@ -120,6 +122,7 @@ pub async fn list_media_files_by_batch_token(args: ListMediaFileByBatchArgs<'_>) .transpose() .ok() // NB: Fail open .flatten(), + maybe_duration_millis: record.maybe_duration_millis.map(|d| d as u64), maybe_ratings_positive_count: record.maybe_ratings_positive_count, maybe_ratings_negative_count: record.maybe_ratings_negative_count, maybe_bookmark_count: record.maybe_bookmark_count, @@ -162,6 +165,7 @@ fn select_result_fields() -> String { m.maybe_title, m.maybe_text_transcript, prompts.maybe_other_args as maybe_other_prompt_args, + m.maybe_duration_millis, entity_stats.ratings_positive_count as maybe_ratings_positive_count, entity_stats.ratings_negative_count as maybe_ratings_negative_count, @@ -269,6 +273,7 @@ struct MediaFileListItemInternal { maybe_ratings_positive_count: Option, maybe_ratings_negative_count: Option, maybe_bookmark_count: Option, + maybe_duration_millis: Option, created_at: DateTime, updated_at: DateTime, @@ -304,6 +309,7 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal { maybe_title: row.try_get("maybe_title")?, maybe_text_transcript: row.try_get("maybe_text_transcript")?, maybe_other_prompt_args: row.try_get("maybe_other_prompt_args")?, + maybe_duration_millis: row.try_get("maybe_duration_millis")?, maybe_ratings_positive_count: row.try_get("maybe_ratings_positive_count")?, maybe_ratings_negative_count: row.try_get("maybe_ratings_negative_count")?, maybe_bookmark_count: row.try_get("maybe_bookmark_count")?, diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_tokens.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_tokens.rs index eb51be0da8..ba8a611e1d 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_tokens.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_by_tokens.rs @@ -46,6 +46,8 @@ pub struct MediaFilesByTokensRecord { pub maybe_text_transcript: Option, pub maybe_prompt_args: Option, + pub maybe_duration_millis: Option, + pub maybe_file_cover_image_public_bucket_hash: Option, pub maybe_file_cover_image_public_bucket_prefix: Option, pub maybe_file_cover_image_public_bucket_extension: Option, @@ -101,6 +103,7 @@ async fn get_raw_media_files_by_tokens( m.maybe_title, m.maybe_text_transcript, prompts.maybe_other_args as maybe_other_prompt_args, + m.maybe_duration_millis, entity_stats.ratings_positive_count as maybe_ratings_positive_count, entity_stats.ratings_negative_count as maybe_ratings_negative_count, @@ -151,6 +154,7 @@ async fn get_raw_media_files_by_tokens( m.maybe_title, m.maybe_text_transcript, prompts.maybe_other_args as maybe_other_prompt_args, + m.maybe_duration_millis, entity_stats.ratings_positive_count as maybe_ratings_positive_count, entity_stats.ratings_negative_count as maybe_ratings_negative_count, @@ -243,6 +247,8 @@ fn map_to_media_files(dataset:Vec) -> Vec) -> Vec, pub maybe_text_transcript: Option, pub maybe_other_prompt_args: Option, + pub maybe_duration_millis: Option, pub maybe_file_cover_image_public_bucket_hash: Option, pub maybe_file_cover_image_public_bucket_prefix: Option, @@ -330,6 +337,7 @@ impl FromRow<'_, MySqlRow> for RawMediaFileJoinUser { maybe_title: row.try_get("maybe_title")?, maybe_text_transcript: row.try_get("maybe_text_transcript")?, maybe_other_prompt_args: row.try_get("maybe_other_prompt_args")?, + maybe_duration_millis: row.try_get("maybe_duration_millis")?, maybe_file_cover_image_public_bucket_hash: row.try_get("maybe_file_cover_image_public_bucket_hash")?, maybe_file_cover_image_public_bucket_prefix: row.try_get("maybe_file_cover_image_public_bucket_prefix")?, maybe_file_cover_image_public_bucket_extension: row.try_get("maybe_file_cover_image_public_bucket_extension")?, diff --git a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs index d2b198d37c..82b2d5532a 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/list/list_media_files_for_user.rs @@ -57,6 +57,8 @@ pub struct MediaFileListItem { pub maybe_text_transcript: Option, pub maybe_prompt_args: Option, + pub maybe_duration_millis: Option, + pub maybe_ratings_positive_count: Option, pub maybe_ratings_negative_count: Option, pub maybe_bookmark_count: Option, @@ -142,6 +144,7 @@ pub async fn list_media_files_for_user(args: ListMediaFileForUserArgs<'_>) -> An .transpose() .ok() // NB: Fail open .flatten(), + maybe_duration_millis: record.maybe_duration_millis.map(|d| d as u64), maybe_ratings_positive_count: record.maybe_ratings_positive_count, maybe_ratings_negative_count: record.maybe_ratings_negative_count, maybe_bookmark_count: record.maybe_bookmark_count, @@ -189,6 +192,7 @@ fn select_result_fields() -> String { m.maybe_title, m.maybe_text_transcript, prompts.maybe_other_args as maybe_other_prompt_args, + m.maybe_duration_millis, entity_stats.ratings_positive_count as maybe_ratings_positive_count, entity_stats.ratings_negative_count as maybe_ratings_negative_count, @@ -325,6 +329,7 @@ struct MediaFileListItemInternal { // NB: The title won't be populated for `tts_models` records or non-`model_weights` records. maybe_origin_model_title: Option, maybe_other_prompt_args: Option, + maybe_duration_millis: Option, media_type: MediaFileType, media_class: MediaFileClass, @@ -375,6 +380,7 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal { maybe_origin_model_token: row.try_get("maybe_origin_model_token")?, maybe_origin_model_title: row.try_get("maybe_origin_model_title")?, maybe_other_prompt_args: row.try_get("maybe_other_prompt_args")?, + maybe_duration_millis: row.try_get("maybe_duration_millis")?, media_type: MediaFileType::try_from_mysql_row(row, "media_type")?, media_class: MediaFileClass::try_from_mysql_row(row, "media_class")?, public_bucket_directory_hash: row.try_get("public_bucket_directory_hash")?, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs index 50ab4a5a95..63e173ce53 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs @@ -72,6 +72,10 @@ pub struct MediaFile { /// the name of the selected style. pub maybe_style_name: Option, + /// Duration for audio and video files, if available. + /// Measured in milliseconds. + pub maybe_duration_millis: Option, + /// Statistics about the media file pub stats: SimpleEntityStats, @@ -199,6 +203,7 @@ pub async fn list_featured_media_files_handler( .as_ref() .and_then(|args| args.style_name.as_ref()) .and_then(|style| style.to_style_name()), + maybe_duration_millis: m.maybe_duration_millis, stats: SimpleEntityStats { positive_rating_count: m.maybe_ratings_positive_count.unwrap_or(0), bookmark_count: m.maybe_bookmark_count.unwrap_or(0), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs index c7c20c7428..7c07a9533b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs @@ -90,6 +90,10 @@ pub struct MediaFilesByBatchListItem { /// the name of the selected style. pub maybe_style_name: Option, + /// Duration for audio and video files, if available. + /// Measured in milliseconds. + pub maybe_duration_millis: Option, + /// Statistics about the media file pub stats: SimpleEntityStats, @@ -232,6 +236,7 @@ pub async fn list_media_files_by_batch_token_handler( .as_ref() .and_then(|args| args.style_name.as_ref()) .and_then(|style| style.to_style_name()), + maybe_duration_millis: record.maybe_duration_millis, stats: SimpleEntityStats { positive_rating_count: record.maybe_ratings_positive_count.unwrap_or(0), bookmark_count: record.maybe_bookmark_count.unwrap_or(0), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs index c18aab7cad..5c1250118c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs @@ -100,6 +100,10 @@ pub struct MediaFileForUserListItem { /// the name of the selected style. pub maybe_style_name: Option, + /// Duration for audio and video files, if available. + /// Measured in milliseconds. + pub maybe_duration_millis: Option, + /// Statistics about the media file pub stats: SimpleEntityStats, @@ -272,6 +276,7 @@ pub async fn list_media_files_for_user_handler( .as_ref() .and_then(|args| args.style_name.as_ref()) .and_then(|style| style.to_style_name()), + maybe_duration_millis: record.maybe_duration_millis, stats: SimpleEntityStats { positive_rating_count: record.maybe_ratings_positive_count.unwrap_or(0), bookmark_count: record.maybe_bookmark_count.unwrap_or(0), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs index b53fa6061a..8dc142ab7a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs @@ -91,6 +91,10 @@ pub struct MediaFileListItem { /// the name of the selected style. pub maybe_style_name: Option, + /// Duration for audio and video files, if available. + /// Measured in milliseconds. + pub maybe_duration_millis: Option, + pub created_at: DateTime, pub updated_at: DateTime, } @@ -273,6 +277,7 @@ pub async fn list_media_files_handler( .as_ref() .and_then(|args| args.style_name.as_ref()) .and_then(|style| style.to_style_name()), + maybe_duration_millis: record.maybe_duration_millis, created_at: record.created_at, updated_at: record.updated_at, })