diff --git a/src/job/mod.rs b/src/job/mod.rs deleted file mode 100644 index 3f5f53b55f..0000000000 --- a/src/job/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod job_queries; -pub mod w2l_download_job_queries; \ No newline at end of file diff --git a/src/job_queries/mod.rs b/src/job_queries/mod.rs new file mode 100644 index 0000000000..de78fe1474 --- /dev/null +++ b/src/job_queries/mod.rs @@ -0,0 +1,2 @@ +pub mod tts_download_job_queries; +pub mod w2l_download_job_queries; \ No newline at end of file diff --git a/src/job/job_queries.rs b/src/job_queries/tts_download_job_queries.rs similarity index 100% rename from src/job/job_queries.rs rename to src/job_queries/tts_download_job_queries.rs diff --git a/src/job/w2l_download_job_queries.rs b/src/job_queries/w2l_download_job_queries.rs similarity index 100% rename from src/job/w2l_download_job_queries.rs rename to src/job_queries/w2l_download_job_queries.rs diff --git a/src/main.rs b/src/main.rs index d7de84cbd8..3cc36d9acb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,7 @@ pub mod util; pub mod validations; // NB: This is included so sqlx can generate all the queries. -mod job; +mod job_queries; use actix_cors::Cors; use actix_http::http; diff --git a/src/tts_download_job.rs b/src/tts_download_job.rs index 34c68caf0e..c3acc29e90 100644 --- a/src/tts_download_job.rs +++ b/src/tts_download_job.rs @@ -6,7 +6,7 @@ //#![allow(warnings)] pub mod buckets; -pub mod job; +pub mod job_queries; pub mod util; use anyhow::anyhow; @@ -14,11 +14,11 @@ use chrono::Utc; use crate::buckets::bucket_client::BucketClient; use crate::buckets::bucket_paths::hash_to_bucket_path; use crate::buckets::file_hashing::get_file_hash; -use crate::job::job_queries::TtsUploadJobRecord; -use crate::job::job_queries::insert_tts_model; -use crate::job::job_queries::mark_tts_upload_job_done; -use crate::job::job_queries::mark_tts_upload_job_failure; -use crate::job::job_queries::query_tts_upload_job_records; +use crate::job_queries::tts_download_job_queries::TtsUploadJobRecord; +use crate::job_queries::tts_download_job_queries::insert_tts_model; +use crate::job_queries::tts_download_job_queries::mark_tts_upload_job_done; +use crate::job_queries::tts_download_job_queries::mark_tts_upload_job_failure; +use crate::job_queries::tts_download_job_queries::query_tts_upload_job_records; use crate::util::anyhow_result::AnyhowResult; use crate::util::filesystem::check_directory_exists; use crate::util::random_token::random_token; diff --git a/src/w2l_download_job.rs b/src/w2l_download_job.rs index 6f658f5c2b..80810ba41d 100644 --- a/src/w2l_download_job.rs +++ b/src/w2l_download_job.rs @@ -6,7 +6,7 @@ //#![allow(warnings)] pub mod buckets; -pub mod job; +pub mod job_queries; pub mod util; use anyhow::anyhow; @@ -14,11 +14,11 @@ use chrono::Utc; use crate::buckets::bucket_client::BucketClient; use crate::buckets::bucket_paths::hash_to_bucket_path; use crate::buckets::file_hashing::get_file_hash; -use crate::job::w2l_download_job_queries::W2lTemplateUploadJobRecord; -use crate::job::w2l_download_job_queries::insert_w2l_template; -use crate::job::w2l_download_job_queries::mark_w2l_template_upload_job_done; -use crate::job::w2l_download_job_queries::mark_w2l_template_upload_job_failure; -use crate::job::w2l_download_job_queries::query_w2l_template_upload_job_records; +use crate::job_queries::w2l_download_job_queries::W2lTemplateUploadJobRecord; +use crate::job_queries::w2l_download_job_queries::insert_w2l_template; +use crate::job_queries::w2l_download_job_queries::mark_w2l_template_upload_job_done; +use crate::job_queries::w2l_download_job_queries::mark_w2l_template_upload_job_failure; +use crate::job_queries::w2l_download_job_queries::query_w2l_template_upload_job_records; use crate::util::anyhow_result::AnyhowResult; use crate::util::filesystem::check_directory_exists; use crate::util::random_token::random_token;