diff --git a/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs b/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs index 06f94f665e..a507b4c127 100644 --- a/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs +++ b/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs @@ -8,7 +8,7 @@ use sqlx::{MySql, Pool}; use enums::by_table::media_files::media_file_type::MediaFileType; use enums::common::view_as::ViewAs; use errors::AnyhowResult; -use mysql_queries::queries::media_files::delete_media_file::delete_media_file_as_mod; +use mysql_queries::queries::media_files::delete::delete_media_file::delete_media_file_as_mod; use mysql_queries::queries::media_files::list::list_media_files::{list_media_files, ListMediaFilesArgs}; use crate::cli_args::Args; diff --git a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs index a83f163900..303cc17402 100644 --- a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs +++ b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs @@ -6,7 +6,7 @@ use sqlx::{MySql, Pool}; use enums::common::view_as::ViewAs; use errors::{anyhow, AnyhowResult}; -use mysql_queries::queries::media_files::delete_media_file::delete_media_file_as_mod; +use mysql_queries::queries::media_files::delete::delete_media_file::delete_media_file_as_mod; use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs}; use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; diff --git a/crates/lib/mysql_queries/src/queries/media_files/delete_media_file.rs b/crates/lib/mysql_queries/src/queries/media_files/delete/delete_media_file.rs similarity index 100% rename from crates/lib/mysql_queries/src/queries/media_files/delete_media_file.rs rename to crates/lib/mysql_queries/src/queries/media_files/delete/delete_media_file.rs diff --git a/crates/lib/mysql_queries/src/queries/media_files/delete/mod.rs b/crates/lib/mysql_queries/src/queries/media_files/delete/mod.rs new file mode 100644 index 0000000000..872112fb51 --- /dev/null +++ b/crates/lib/mysql_queries/src/queries/media_files/delete/mod.rs @@ -0,0 +1 @@ +pub mod delete_media_file; \ No newline at end of file diff --git a/crates/lib/mysql_queries/src/queries/media_files/edit/mod.rs b/crates/lib/mysql_queries/src/queries/media_files/edit/mod.rs index 54a52a2dd7..3d4634828d 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/edit/mod.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/edit/mod.rs @@ -1,3 +1,4 @@ +pub mod rename_media_file; pub mod set_media_file_cover_image; pub mod update_media_file_engine_category; pub mod update_media_file_stored_cloud_contents; diff --git a/crates/lib/mysql_queries/src/queries/media_files/rename_media_file.rs b/crates/lib/mysql_queries/src/queries/media_files/edit/rename_media_file.rs similarity index 100% rename from crates/lib/mysql_queries/src/queries/media_files/rename_media_file.rs rename to crates/lib/mysql_queries/src/queries/media_files/edit/rename_media_file.rs diff --git a/crates/lib/mysql_queries/src/queries/media_files/get_media_file_for_inference.rs b/crates/lib/mysql_queries/src/queries/media_files/get/get_media_file_for_inference.rs similarity index 100% rename from crates/lib/mysql_queries/src/queries/media_files/get_media_file_for_inference.rs rename to crates/lib/mysql_queries/src/queries/media_files/get/get_media_file_for_inference.rs diff --git a/crates/lib/mysql_queries/src/queries/media_files/get/mod.rs b/crates/lib/mysql_queries/src/queries/media_files/get/mod.rs index 7f8470cb91..bf27e365b7 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/get/mod.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/get/mod.rs @@ -1,3 +1,4 @@ pub mod batch_get_media_files; pub mod batch_get_media_files_by_tokens; -pub mod get_media_file; \ No newline at end of file +pub mod get_media_file; +pub mod get_media_file_for_inference; \ No newline at end of file diff --git a/crates/lib/mysql_queries/src/queries/media_files/mod.rs b/crates/lib/mysql_queries/src/queries/media_files/mod.rs index 956b310d6f..025f530250 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/mod.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/mod.rs @@ -1,8 +1,6 @@ pub mod create; -pub mod delete_media_file; +pub mod delete; pub mod edit; pub mod get; -pub mod get_media_file_for_inference; pub mod list; -pub mod rename_media_file; pub mod upsert; diff --git a/crates/service/job/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs b/crates/service/job/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs index 74b5be31aa..b3c7b40f9c 100644 --- a/crates/service/job/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/format_conversion/fbx_to_gltf/process_job.rs @@ -21,7 +21,7 @@ use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReport use mimetypes::mimetype_for_file::get_mimetype_for_file; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::media_files::create::insert_media_file_generic::{insert_media_file_generic, InsertArgs}; -use mysql_queries::queries::media_files::get_media_file_for_inference::MediaFileForInference; +use mysql_queries::queries::media_files::get::get_media_file_for_inference::MediaFileForInference; use subprocess_common::command_runner::command_runner_args::{FileOrCreate, RunAsSubprocessArgs, StreamRedirection}; use crate::job::job_loop::job_success_result::{JobSuccessResult, ResultEntity}; diff --git a/crates/service/job/inference_job/src/job/job_types/format_conversion/process_single_format_conversion_job.rs b/crates/service/job/inference_job/src/job/job_types/format_conversion/process_single_format_conversion_job.rs index d293c055fc..a12eea6fff 100644 --- a/crates/service/job/inference_job/src/job/job_types/format_conversion/process_single_format_conversion_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/format_conversion/process_single_format_conversion_job.rs @@ -3,7 +3,7 @@ use log::error; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; -use mysql_queries::queries::media_files::get_media_file_for_inference::get_media_file_for_inference; +use mysql_queries::queries::media_files::get::get_media_file_for_inference::get_media_file_for_inference; use tokens::tokens::media_files::MediaFileToken; use crate::job::job_loop::job_success_result::JobSuccessResult; diff --git a/crates/service/job/inference_job/src/job/job_types/render_engine_scene/process_render_engine_scene.rs b/crates/service/job/inference_job/src/job/job_types/render_engine_scene/process_render_engine_scene.rs index 26b9cc1c89..60f0fb893d 100644 --- a/crates/service/job/inference_job/src/job/job_types/render_engine_scene/process_render_engine_scene.rs +++ b/crates/service/job/inference_job/src/job/job_types/render_engine_scene/process_render_engine_scene.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use log::error; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; -use mysql_queries::queries::media_files::get_media_file_for_inference::get_media_file_for_inference; +use mysql_queries::queries::media_files::get::get_media_file_for_inference::get_media_file_for_inference; use tokens::tokens::media_files::MediaFileToken; use crate::job::job_loop::job_success_result::JobSuccessResult; diff --git a/crates/service/job/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs b/crates/service/job/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs index 189b9306b8..3d060b6b5b 100644 --- a/crates/service/job/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/render_engine_scene/render_engine_scene_to_video/process_job.rs @@ -20,7 +20,7 @@ use mimetypes::mimetype_for_file::get_mimetype_for_file; use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::media_files::create::insert_media_file_generic::{insert_media_file_generic, InsertArgs}; -use mysql_queries::queries::media_files::get_media_file_for_inference::MediaFileForInference; +use mysql_queries::queries::media_files::get::get_media_file_for_inference::MediaFileForInference; use subprocess_common::command_runner::command_runner_args::{RunAsSubprocessArgs, StreamRedirection}; use crate::job::job_loop::job_success_result::{JobSuccessResult, ResultEntity}; diff --git a/crates/service/job/inference_job/src/job/job_types/vc/media_for_inference.rs b/crates/service/job/inference_job/src/job/job_types/vc/media_for_inference.rs index 33ba9e0384..7175a244c0 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/media_for_inference.rs +++ b/crates/service/job/inference_job/src/job/job_types/vc/media_for_inference.rs @@ -2,7 +2,7 @@ use std::path::PathBuf; use buckets::public::media_files::bucket_file_path::MediaFileBucketPath; use buckets::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath; -use mysql_queries::queries::media_files::get_media_file_for_inference::MediaFileForInference; +use mysql_queries::queries::media_files::get::get_media_file_for_inference::MediaFileForInference; use mysql_queries::queries::media_uploads::get_media_upload_for_inference::MediaUploadRecordForInference; /// Dynamic payload for inference job media that also serves as an adapter diff --git a/crates/service/job/inference_job/src/job/job_types/vc/process_single_vc_job.rs b/crates/service/job/inference_job/src/job/job_types/vc/process_single_vc_job.rs index 563ffc7fd7..592fff589a 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/process_single_vc_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/vc/process_single_vc_job.rs @@ -4,7 +4,7 @@ use log::{error, info}; use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType; use migration::voice_conversion::query_vc_model_for_migration::{query_vc_model_for_migration, VcModelType}; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; -use mysql_queries::queries::media_files::get_media_file_for_inference::get_media_file_for_inference; +use mysql_queries::queries::media_files::get::get_media_file_for_inference::get_media_file_for_inference; use mysql_queries::queries::media_uploads::get_media_upload_for_inference::get_media_upload_for_inference; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::media_uploads::MediaUploadToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/delete/delete_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/delete/delete_media_file_handler.rs index e79705041b..d46f74e771 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/delete/delete_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/delete/delete_media_file_handler.rs @@ -9,7 +9,7 @@ use log::warn; use utoipa::ToSchema; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use mysql_queries::queries::media_files::delete_media_file::{delete_media_file_as_mod, delete_media_file_as_user, undelete_media_file_as_mod, undelete_media_file_as_user}; +use mysql_queries::queries::media_files::delete::delete_media_file::{delete_media_file_as_mod, delete_media_file_as_user, undelete_media_file_as_mod, undelete_media_file_as_user}; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/rename_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/rename_media_file_handler.rs index 23bab89e37..99e185fc98 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/rename_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/rename_media_file_handler.rs @@ -9,9 +9,8 @@ use log::warn; use utoipa::ToSchema; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; -use mysql_queries::queries::media_files::delete_media_file::{delete_media_file_as_mod, delete_media_file_as_user, undelete_media_file_as_mod, undelete_media_file_as_user}; +use mysql_queries::queries::media_files::edit::rename_media_file::rename_media_file; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; -use mysql_queries::queries::media_files::rename_media_file::rename_media_file; use tokens::tokens::media_files::MediaFileToken; use crate::http_server::web_utils::response_success_helpers::simple_json_success;