move remaining container_common::files -> filesys crate

crates/lib/deprecated/container_common/src/filesystem/mod.rs

@@ -1,3 +1 @@
-pub mod safe_delete_possible_temp_file;
-pub mod safe_delete_temp_directory;
-pub mod safe_delete_temp_file;
+

crates/lib/files/filesys/src/lib.rs

@@ -29,3 +29,6 @@ pub mod is_filesystem_full_error;
 pub mod path_to_string;
 pub mod rename_across_devices;
 pub mod check_directory_exists;
+pub mod safe_delete_temp_file;
+pub mod safe_delete_possible_temp_file;
+pub mod safe_delete_temp_directory;

crates/lib/files/filesys/src/safe_delete_possible_temp_file.rs

@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use crate::filesystem::safe_delete_temp_file::safe_delete_temp_file;
+use crate::safe_delete_temp_file::safe_delete_temp_file;
 
 pub fn safe_delete_possible_temp_file<P: AsRef<Path>>(maybe_file_path: Option<P>) {
   if let Some(file_path) = maybe_file_path {

crates/service/job/download_job/src/job_loop/process_single_job.rs

@@ -6,7 +6,7 @@ use tempdir::TempDir;
 
 use config::is_bad_download_url::is_bad_download_url;
 use container_common::anyhow_result::AnyhowResult;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;
 use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;
 use mysql_queries::queries::generic_download::job::mark_generic_download_job_done::mark_generic_download_job_done;

crates/service/job/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs

@@ -6,12 +6,12 @@ use anyhow::anyhow;
 use log::{info, warn};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::tts_models::tts_model_type::TtsModelType;
 use enums::common::visibility::Visibility;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;
 use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;

crates/service/job/download_job/src/job_types/tts/vits/process_vits_model.rs

@@ -4,14 +4,14 @@ use anyhow::anyhow;
 use log::{error, info, warn};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::tts_models::tts_model_type::TtsModelType;
 use enums::common::visibility::Visibility;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
 use filesys::file_size::file_size;
 use filesys::filename_concat::filename_concat;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;
 use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;

crates/service/job/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs

@@ -6,11 +6,11 @@ use anyhow::anyhow;
 use log::{info, warn};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::common::vocoder_type::VocoderType;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;
 use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;

crates/service/job/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs

@@ -6,11 +6,11 @@ use anyhow::anyhow;
 use log::{info, warn};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::common::vocoder_type::VocoderType;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;
 use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;

crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/extract_rvc_files.rs

@@ -3,8 +3,8 @@ use std::path::{Path, PathBuf};
 use log::{info, warn};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use errors::AnyhowResult;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use mimetypes::mimetype_for_file::get_mimetype_for_file;
 
 #[derive(Debug)]

crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/pretrained_hubert_model.rs

@@ -5,10 +5,10 @@ use log::info;
 use tempdir::TempDir;
 
 use cloud_storage::bucket_client::BucketClient;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
 use errors::AnyhowResult;
 use filesys::create_dir_all_if_missing::create_dir_all_if_missing;
 use filesys::file_exists::file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
 
 #[derive(Clone)]
 pub struct PretrainedHubertModel {

crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs

@@ -4,15 +4,15 @@ use anyhow::anyhow;
 use log::{error, info, warn};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_possible_temp_file::safe_delete_possible_temp_file;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use crockford::crockford_entropy_lower;
 use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
 use enums::common::visibility::Visibility;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
 use filesys::file_size::file_size;
+use filesys::safe_delete_possible_temp_file::safe_delete_possible_temp_file;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;
 use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;
 use mysql_queries::queries::voice_conversion::models::insert_voice_conversion_model_from_download_job::{insert_voice_conversion_model_from_download_job, InsertVoiceConversionModelArgs};

crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs

@@ -4,13 +4,13 @@ use anyhow::anyhow;
 use log::{error, info, warn};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
 use enums::common::visibility::Visibility;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
 use filesys::file_size::file_size;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;
 use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;

crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs

@@ -6,12 +6,12 @@ use anyhow::anyhow;
 use log::{info, warn};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
 use enums::common::visibility::Visibility;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;
 use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;

crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs

@@ -5,11 +5,11 @@ use anyhow::anyhow;
 use log::{error, info, warn};
 
 use buckets::public::media_files::original_file::MediaFileBucketPath;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
 use filesys::check_file_exists::check_file_exists;
 use filesys::file_size::file_size;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use mimetypes::mimetype_for_file::get_mimetype_for_file;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;

crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs

@@ -7,11 +7,11 @@ use anyhow::anyhow;
 use log::{error, info};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_string::sha256_hash_string;
 use mysql_queries::column_types::vocoder_type::VocoderType;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;

crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs

@@ -7,11 +7,11 @@ use anyhow::anyhow;
 use log::{error, info};
 use tempdir::TempDir;
 
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
 use errors::AnyhowResult;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_string::sha256_hash_string;
 use mysql_queries::column_types::vocoder_type::VocoderType;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;

crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/pretrained_hubert_model.rs

@@ -4,10 +4,10 @@ use anyhow::anyhow;
 use log::{error, info};
 
 use cloud_storage::bucket_client::BucketClient;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
 use filesys::create_dir_all_if_missing::create_dir_all_if_missing;
 use filesys::file_exists::file_exists;
 use filesys::rename_across_devices::rename_across_devices;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
 use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator;

crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/process_job.rs

@@ -6,12 +6,12 @@ use log::{error, info, warn};
 
 use buckets::public::media_files::original_file::MediaFileBucketPath;
 use buckets::public::media_uploads::original_file::MediaUploadOriginalFilePath;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
 use filesys::check_file_exists::check_file_exists;
 use filesys::create_dir_all_if_missing::create_dir_all_if_missing;
 use filesys::file_size::file_size;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use media::decode_basic_audio_info::decode_basic_audio_file_info;
 use mimetypes::mimetype_for_file::get_mimetype_for_file;

crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs

@@ -5,12 +5,12 @@ use log::{error, info, warn};
 
 use buckets::public::media_files::original_file::MediaFileBucketPath;
 use buckets::public::media_uploads::original_file::MediaUploadOriginalFilePath;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
 use filesys::check_file_exists::check_file_exists;
 use filesys::create_dir_all_if_missing::create_dir_all_if_missing;
 use filesys::file_size::file_size;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use media::decode_basic_audio_info::decode_basic_audio_file_info;
 use mimetypes::mimetype_for_file::get_mimetype_for_file;

crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs

@@ -3,10 +3,10 @@ use std::path::Path;
 use log::{error, info, warn};
 
 use cloud_storage::bucket_client::BucketClient;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use filesys::file_size::file_size;
 use filesys::rename_across_devices::{rename_across_devices, RenameError};
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporter;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/util/model_downloader.rs

@@ -5,10 +5,10 @@ use async_trait::async_trait;
 use log::{error, info};
 
 use cloud_storage::bucket_client::BucketClient;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
 use filesys::create_dir_all_if_missing::create_dir_all_if_missing;
 use filesys::file_exists::file_exists;
 use filesys::rename_across_devices::{rename_across_devices, RenameError};
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
 use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator;

crates/service/job/tts_download_job/src/main.rs

@@ -35,11 +35,11 @@ use config::common_env::CommonEnv;
 use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
 use config::shared_constants::DEFAULT_RUST_LOG;
 use container_common::anyhow_result::AnyhowResult;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use enums::by_table::tts_models::tts_model_type::TtsModelType;
 use filesys::check_directory_exists::check_directory_exists;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::noop_logger::NoOpLogger;

crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs

@@ -13,10 +13,10 @@ use log::{error, info, warn};
 use tempdir::TempDir;
 
 use container_common::anyhow_result::AnyhowResult;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use container_common::token::random_uuid::generate_random_uuid;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use hashing::sha256::sha256_hash_string::sha256_hash_string;
 use mysql_queries::column_types::vocoder_type::VocoderType;
 use mysql_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob;

crates/service/job/w2l_download_job/src/main.rs

@@ -35,10 +35,10 @@ use config::is_bad_video_download_url::is_bad_video_download_url;
 use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
 use config::shared_constants::DEFAULT_RUST_LOG;
 use container_common::anyhow_result::AnyhowResult;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use filesys::check_directory_exists::check_directory_exists;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand;
 use hashing::sha256::sha256_hash_file::sha256_hash_file;
 use jobs_common::noop_logger::NoOpLogger;

crates/service/job/w2l_inference_job/src/main.rs

@@ -36,10 +36,10 @@ use config::common_env::CommonEnv;
 use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
 use config::shared_constants::DEFAULT_RUST_LOG;
 use container_common::anyhow_result::AnyhowResult;
-use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory;
-use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file;
 use filesys::check_directory_exists::check_directory_exists;
 use filesys::check_file_exists::check_file_exists;
+use filesys::safe_delete_temp_directory::safe_delete_temp_directory;
+use filesys::safe_delete_temp_file::safe_delete_temp_file;
 use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand;
 use jobs_common::noop_logger::NoOpLogger;
 use jobs_common::redis_job_status_logger::RedisJobStatusLogger;