From 3aae3c77becbd201dcdf5af816975a964c124057 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 9 May 2024 11:39:16 -0700 Subject: [PATCH] csv media type --- .../enums/src/by_table/media_files/media_file_type.rs | 10 ++++++++++ .../users/user_bookmarks/list_user_bookmarks_result.rs | 1 + .../upload/upload_generic/process_upload_media_file.rs | 1 + 3 files changed, 12 insertions(+) diff --git a/crates/_types/enums/src/by_table/media_files/media_file_type.rs b/crates/_types/enums/src/by_table/media_files/media_file_type.rs index 97663c803a..8c9211b2bb 100644 --- a/crates/_types/enums/src/by_table/media_files/media_file_type.rs +++ b/crates/_types/enums/src/by_table/media_files/media_file_type.rs @@ -52,6 +52,9 @@ pub enum MediaFileType { /// "Vocaloid Motion Data", animation data for MikuMikuDance /// See: https://mikumikudance.fandom.com/wiki/VMD_file_format Vmd, + + /// CSV format. (We use these for ArKit) + Csv, } // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests! @@ -74,6 +77,7 @@ impl MediaFileType { Self::SceneJson => "scene_json", Self::Pmd => "pmd", Self::Vmd => "vmd", + Self::Csv => "csv", } } @@ -90,6 +94,7 @@ impl MediaFileType { "scene_json" => Ok(Self::SceneJson), "pmd" => Ok(Self::Pmd), "vmd" => Ok(Self::Vmd), + "csv" => Ok(Self::Csv), _ => Err(format!("invalid value: {:?}", value)), } } @@ -109,6 +114,7 @@ impl MediaFileType { Self::SceneJson, Self::Pmd, Self::Vmd, + Self::Csv, ]) } } @@ -134,6 +140,7 @@ mod tests { assert_serialization(MediaFileType::SceneJson, "scene_json"); assert_serialization(MediaFileType::Pmd, "pmd"); assert_serialization(MediaFileType::Vmd, "vmd"); + assert_serialization(MediaFileType::Csv, "csv"); } } @@ -153,6 +160,7 @@ mod tests { assert_eq!(MediaFileType::SceneJson.to_str(), "scene_json"); assert_eq!(MediaFileType::Pmd.to_str(), "pmd"); assert_eq!(MediaFileType::Vmd.to_str(), "vmd"); + assert_eq!(MediaFileType::Csv.to_str(), "csv"); } #[test] @@ -168,6 +176,7 @@ mod tests { assert_eq!(MediaFileType::from_str("scene_json").unwrap(), MediaFileType::SceneJson); assert_eq!(MediaFileType::from_str("pmd").unwrap(), MediaFileType::Pmd); assert_eq!(MediaFileType::from_str("vmd").unwrap(), MediaFileType::Vmd); + assert_eq!(MediaFileType::from_str("csv").unwrap(), MediaFileType::Csv); assert!(MediaFileType::from_str("foo").is_err()); } } @@ -190,6 +199,7 @@ mod tests { assert_eq!(variants.pop_first(), Some(MediaFileType::SceneJson)); assert_eq!(variants.pop_first(), Some(MediaFileType::Pmd)); assert_eq!(variants.pop_first(), Some(MediaFileType::Vmd)); + assert_eq!(variants.pop_first(), Some(MediaFileType::Csv)); assert_eq!(variants.pop_first(), None); } } diff --git a/crates/lib/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs b/crates/lib/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs index ed228e24c0..83295f7d99 100644 --- a/crates/lib/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs +++ b/crates/lib/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs @@ -159,6 +159,7 @@ impl RawUserBookmarkRecord { MediaFileType::SceneJson => Some("3d scene".to_string()), MediaFileType::Pmd => Some("polygon data".to_string()), MediaFileType::Vmd => Some("motion data".to_string()), + MediaFileType::Csv => Some("animation data".to_string()), }), UserBookmarkEntityType::VoiceConversionModel => self.maybe_descriptive_text_voice_conversion_model_title, UserBookmarkEntityType::ZsVoice => self.maybe_descriptive_text_zs_voice_title, 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 0ea5a4a987..b3972b54c7 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 @@ -302,6 +302,7 @@ pub async fn process_upload_media_file( MediaFileType::SceneJson => MediaFileClass::Dimensional, MediaFileType::Pmd => MediaFileClass::Dimensional, MediaFileType::Vmd => MediaFileClass::Dimensional, + MediaFileType::Csv => MediaFileClass::Dimensional, }; let upload_type = match upload_media_request.media_source {