From 8cedc5fffc0208a879db936ab776c3cf6ce08833 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 18 May 2025 00:45:42 -0400 Subject: [PATCH] move thread modules --- crates/desktop/artcraft/src/lib.rs | 6 +++--- crates/desktop/artcraft/src/services/fal/mod.rs | 3 ++- .../{ => services/fal}/threads/fal_task_polling_thread.rs | 0 crates/desktop/artcraft/src/services/fal/threads/mod.rs | 1 + crates/desktop/artcraft/src/services/sora/mod.rs | 1 + crates/desktop/artcraft/src/services/sora/threads/mod.rs | 1 + .../{ => services/sora}/threads/sora_task_polling_thread.rs | 0 crates/desktop/artcraft/src/threads/mod.rs | 4 +--- 8 files changed, 9 insertions(+), 7 deletions(-) rename crates/desktop/artcraft/src/{ => services/fal}/threads/fal_task_polling_thread.rs (100%) create mode 100644 crates/desktop/artcraft/src/services/fal/threads/mod.rs create mode 100644 crates/desktop/artcraft/src/services/sora/threads/mod.rs rename crates/desktop/artcraft/src/{ => services/sora}/threads/sora_task_polling_thread.rs (100%) diff --git a/crates/desktop/artcraft/src/lib.rs b/crates/desktop/artcraft/src/lib.rs index 2762ed8968..3f85748067 100644 --- a/crates/desktop/artcraft/src/lib.rs +++ b/crates/desktop/artcraft/src/lib.rs @@ -18,6 +18,7 @@ use crate::services::fal::commands::get_fal_api_key_command::get_fal_api_key_com use crate::services::fal::commands::set_fal_api_key_command::set_fal_api_key_command; use crate::services::fal::state::fal_credential_manager::FalCredentialManager; use crate::services::fal::state::fal_task_queue::FalTaskQueue; +use crate::services::fal::threads::fal_task_polling_thread::fal_task_polling_thread; use crate::services::sora::commands::check_sora_session_command::check_sora_session_command; use crate::services::sora::commands::open_sora_login_command::open_sora_login_command; use crate::services::sora::commands::sora_image_generation_command::sora_image_generation_command; @@ -25,15 +26,14 @@ use crate::services::sora::commands::sora_image_remix_command::sora_image_remix_ use crate::services::sora::commands::sora_logout_command::sora_logout_command; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; +use crate::services::sora::threads::sora_task_polling_thread::sora_task_polling_thread; +use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::state::app_preferences::app_preferences_manager::load_app_preferences_or_default; use crate::state::data_dir::app_data_root::AppDataRoot; use crate::state::main_window_position::MainWindowPosition; use crate::state::main_window_size::MainWindowSize; -use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use crate::threads::discord_presence_thread::discord_presence_thread; -use crate::threads::fal_task_polling_thread::fal_task_polling_thread; use crate::threads::main_window_thread::main_window_thread::main_window_thread; -use crate::threads::sora_task_polling_thread::sora_task_polling_thread; use crate::utils::webview_unsafe::webview_unsafe_for_app; use tauri_plugin_dialog; diff --git a/crates/desktop/artcraft/src/services/fal/mod.rs b/crates/desktop/artcraft/src/services/fal/mod.rs index 95cf9b9cef..2e33656fb0 100644 --- a/crates/desktop/artcraft/src/services/fal/mod.rs +++ b/crates/desktop/artcraft/src/services/fal/mod.rs @@ -1,2 +1,3 @@ pub mod commands; -pub mod state; \ No newline at end of file +pub mod state; +pub mod threads; \ No newline at end of file diff --git a/crates/desktop/artcraft/src/threads/fal_task_polling_thread.rs b/crates/desktop/artcraft/src/services/fal/threads/fal_task_polling_thread.rs similarity index 100% rename from crates/desktop/artcraft/src/threads/fal_task_polling_thread.rs rename to crates/desktop/artcraft/src/services/fal/threads/fal_task_polling_thread.rs diff --git a/crates/desktop/artcraft/src/services/fal/threads/mod.rs b/crates/desktop/artcraft/src/services/fal/threads/mod.rs new file mode 100644 index 0000000000..725a68337f --- /dev/null +++ b/crates/desktop/artcraft/src/services/fal/threads/mod.rs @@ -0,0 +1 @@ +pub mod fal_task_polling_thread; \ No newline at end of file diff --git a/crates/desktop/artcraft/src/services/sora/mod.rs b/crates/desktop/artcraft/src/services/sora/mod.rs index 2281c7ca92..c352ff453a 100644 --- a/crates/desktop/artcraft/src/services/sora/mod.rs +++ b/crates/desktop/artcraft/src/services/sora/mod.rs @@ -1,4 +1,5 @@ pub mod commands; pub mod events; pub mod state; +pub mod threads; pub mod windows; \ No newline at end of file diff --git a/crates/desktop/artcraft/src/services/sora/threads/mod.rs b/crates/desktop/artcraft/src/services/sora/threads/mod.rs new file mode 100644 index 0000000000..e55d113fad --- /dev/null +++ b/crates/desktop/artcraft/src/services/sora/threads/mod.rs @@ -0,0 +1 @@ +pub mod sora_task_polling_thread; \ No newline at end of file diff --git a/crates/desktop/artcraft/src/threads/sora_task_polling_thread.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling_thread.rs similarity index 100% rename from crates/desktop/artcraft/src/threads/sora_task_polling_thread.rs rename to crates/desktop/artcraft/src/services/sora/threads/sora_task_polling_thread.rs diff --git a/crates/desktop/artcraft/src/threads/mod.rs b/crates/desktop/artcraft/src/threads/mod.rs index 5b72269773..80525f98bb 100644 --- a/crates/desktop/artcraft/src/threads/mod.rs +++ b/crates/desktop/artcraft/src/threads/mod.rs @@ -1,4 +1,2 @@ pub mod discord_presence_thread; -pub mod fal_task_polling_thread; -pub mod main_window_thread; -pub mod sora_task_polling_thread; \ No newline at end of file +pub mod main_window_thread; \ No newline at end of file