Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: deps crates (#4362)

Browse Source 
* refactor: rename flowy-folder-deps to flowy-folder-pub

* chore: rename crates

* chore: move flowy-task to lib-infra

* chore: rename crates

* refactor: user manager dir
This commit is contained in:
Nathan.fooo
2024-01-11 14:42:03 +08:00
committed by GitHub
parent dd8b9dd43e
commit 307556b7dd
133 changed files with 362 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/rust-lib/flowy-core/Cargo.toml
View File

@ -9,18 +9,17 @@ edition = "2018"
lib-dispatch = { workspace = true }
lib-log = { workspace = true }
flowy-user = { workspace = true }
flowy-user-deps = { workspace = true }
flowy-user-pub = { workspace = true }
flowy-folder = { workspace = true }
flowy-folder-deps = { workspace = true }
flowy-folder-pub = { workspace = true }
flowy-database2 = { workspace = true }
flowy-database-deps = { workspace = true }
flowy-database-pub = { workspace = true }
flowy-sqlite = { workspace = true }
flowy-document = { workspace = true }
flowy-document-deps = { workspace = true }
flowy-document-pub = { workspace = true }
flowy-error = { workspace = true }
flowy-task = { workspace = true }
flowy-server = { workspace = true }
flowy-server-config = { workspace = true }
flowy-server-pub = { workspace = true }
flowy-config = { workspace = true }
flowy-date = { workspace = true }
collab-integrate = { workspace = true }

4
frontend/rust-lib/flowy-core/src/config.rs
View File

@ -4,8 +4,8 @@ use std::path::Path;
use base64::Engine;
use tracing::{error, info};
use flowy_server_config::af_cloud_config::AFCloudConfiguration;
use flowy_server_config::supabase_config::SupabaseConfiguration;
use flowy_server_pub::af_cloud_config::AFCloudConfiguration;
use flowy_server_pub::supabase_config::SupabaseConfiguration;
use flowy_user::services::entities::URL_SAFE_ENGINE;
use lib_infra::file_util::copy_dir_recursive;

2
frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs
View File

@ -7,7 +7,7 @@ use flowy_sqlite::{
prelude::*,
schema::{collab_snapshot, collab_snapshot::dsl},
};
use flowy_user::manager::UserManager;
use flowy_user::user_manager::UserManager;
use lib_infra::util::timestamp;
use std::sync::Weak;
use tracing::debug;

6
frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rs
View File

@ -5,10 +5,10 @@ use tokio::sync::RwLock;
use collab_integrate::collab_builder::AppFlowyCollabBuilder;
use collab_integrate::CollabKVDB;
use flowy_database2::{DatabaseManager, DatabaseUser};
use flowy_database_deps::cloud::DatabaseCloudService;
use flowy_database_pub::cloud::DatabaseCloudService;
use flowy_error::FlowyError;
use flowy_task::TaskDispatcher;
use flowy_user::manager::UserManager;
use flowy_user::user_manager::UserManager;
use lib_infra::priority_task::TaskDispatcher;
pub struct DatabaseDepsResolver();

4
frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs
View File

@ -6,10 +6,10 @@ use collab_integrate::CollabKVDB;
use flowy_database2::DatabaseManager;
use flowy_document::entities::{DocumentSnapshotData, DocumentSnapshotMeta};
use flowy_document::manager::{DocumentManager, DocumentSnapshotService, DocumentUserService};
use flowy_document_deps::cloud::DocumentCloudService;
use flowy_document_pub::cloud::DocumentCloudService;
use flowy_error::{FlowyError, FlowyResult};
use flowy_storage::FileStorageService;
use flowy_user::manager::UserManager;
use flowy_user::user_manager::UserManager;
pub struct DocumentDepsResolver();
impl DocumentDepsResolver {

6
frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs
View File

@ -22,10 +22,10 @@ use flowy_folder::share::ImportType;
use flowy_folder::view_operation::{FolderOperationHandler, FolderOperationHandlers, View};
use flowy_folder::ViewLayout;
use flowy_folder_deps::entities::ImportData;
use flowy_folder_deps::folder_builder::{ParentChildViews, WorkspaceViewBuilder};
use flowy_user::manager::UserManager;
use flowy_folder_pub::entities::ImportData;
use flowy_folder_pub::folder_builder::{ParentChildViews, WorkspaceViewBuilder};
use flowy_user::services::data_import::ImportDataSource;
use flowy_user::user_manager::UserManager;
use crate::integrate::server::ServerProvider;
use lib_dispatch::prelude::ToBytes;

2
frontend/rust-lib/flowy-core/src/integrate/collab_interact.rs
View File

@ -5,7 +5,7 @@ use std::sync::Weak;
use flowy_database2::DatabaseManager;
use flowy_document::manager::DocumentManager;
use flowy_document::reminder::{DocumentReminder, DocumentReminderAction};
use flowy_folder_deps::cloud::Error;
use flowy_folder_pub::cloud::Error;
use flowy_user::services::collab_interact::CollabInteract;
use lib_infra::future::FutureResult;

1
frontend/rust-lib/flowy-core/src/integrate/log.rs
View File

@ -32,7 +32,6 @@ pub(crate) fn create_log_filter(level: String, with_crates: Vec<String>) -> Stri
filters.push(format!("flowy_server={}", level));
filters.push(format!("flowy_notification={}", "info"));
filters.push(format!("lib_infra={}", level));
filters.push(format!("flowy_task={}", level));
// filters.push(format!("lib_dispatch={}", level));
filters.push(format!("dart_ffi={}", "info"));

8
frontend/rust-lib/flowy-core/src/integrate/server.rs
View File

@ -10,11 +10,11 @@ use flowy_server::af_cloud::AppFlowyCloudServer;
use flowy_server::local_server::{LocalServer, LocalServerDB};
use flowy_server::supabase::SupabaseServer;
use flowy_server::{AppFlowyEncryption, AppFlowyServer, EncryptionImpl};
use flowy_server_config::af_cloud_config::AFCloudConfiguration;
use flowy_server_config::supabase_config::SupabaseConfiguration;
use flowy_server_config::AuthenticatorType;
use flowy_server_pub::af_cloud_config::AFCloudConfiguration;
use flowy_server_pub::supabase_config::SupabaseConfiguration;
use flowy_server_pub::AuthenticatorType;
use flowy_sqlite::kv::StorePreferences;
use flowy_user_deps::entities::*;
use flowy_user_pub::entities::*;
use crate::AppFlowyCoreConfig;

14
frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs
View File

@ -14,18 +14,18 @@ use tracing::{debug, instrument};
use collab_integrate::collab_builder::{
CollabCloudPluginProvider, CollabPluginProviderContext, CollabPluginProviderType,
};
use flowy_database_deps::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};
use flowy_database_pub::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};
use flowy_document::deps::DocumentData;
use flowy_document_deps::cloud::{DocumentCloudService, DocumentSnapshot};
use flowy_document_pub::cloud::{DocumentCloudService, DocumentSnapshot};
use flowy_error::FlowyError;
use flowy_folder_deps::cloud::{
use flowy_folder_pub::cloud::{
FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace, WorkspaceRecord,
};
use flowy_server_config::af_cloud_config::AFCloudConfiguration;
use flowy_server_config::supabase_config::SupabaseConfiguration;
use flowy_server_pub::af_cloud_config::AFCloudConfiguration;
use flowy_server_pub::supabase_config::SupabaseConfiguration;
use flowy_storage::{FileStorageService, StorageObject};
use flowy_user_deps::cloud::{UserCloudService, UserCloudServiceProvider};
use flowy_user_deps::entities::{Authenticator, UserTokenState};
use flowy_user_pub::cloud::{UserCloudService, UserCloudServiceProvider};
use flowy_user_pub::entities::{Authenticator, UserTokenState};
use lib_infra::future::{to_fut, Fut, FutureResult};
use crate::integrate::server::{Server, ServerProvider};

4
frontend/rust-lib/flowy-core/src/integrate/user.rs
View File

@ -10,8 +10,8 @@ use flowy_document::manager::DocumentManager;
use flowy_error::FlowyResult;
use flowy_folder::manager::{FolderInitDataSource, FolderManager};
use flowy_user::event_map::UserStatusCallback;
use flowy_user_deps::cloud::{UserCloudConfig, UserCloudServiceProvider};
use flowy_user_deps::entities::{Authenticator, UserProfile, UserWorkspace};
use flowy_user_pub::cloud::{UserCloudConfig, UserCloudServiceProvider};
use flowy_user_pub::entities::{Authenticator, UserProfile, UserWorkspace};
use lib_infra::future::{to_fut, Fut};
use crate::integrate::server::{Server, ServerProvider};

6
frontend/rust-lib/flowy-core/src/lib.rs
View File

@ -13,13 +13,13 @@ use flowy_document::manager::DocumentManager;
use flowy_folder::manager::FolderManager;
use flowy_sqlite::kv::StorePreferences;
use flowy_storage::FileStorageService;
use flowy_task::{TaskDispatcher, TaskRunner};
use flowy_user::manager::UserManager;
use flowy_user::services::entities::UserConfig;
use flowy_user_deps::cloud::UserCloudServiceProvider;
use flowy_user::user_manager::UserManager;
use flowy_user_pub::cloud::UserCloudServiceProvider;
use lib_dispatch::prelude::*;
use lib_dispatch::runtime::AFPluginRuntime;
use lib_infra::priority_task::{TaskDispatcher, TaskRunner};
use module::make_plugins;
use crate::config::AppFlowyCoreConfig;

2
frontend/rust-lib/flowy-core/src/module.rs
View File

@ -3,7 +3,7 @@ use std::sync::Weak;
use flowy_database2::DatabaseManager;
use flowy_document::manager::DocumentManager as DocumentManager2;
use flowy_folder::manager::FolderManager;
use flowy_user::manager::UserManager;
use flowy_user::user_manager::UserManager;
use lib_dispatch::prelude::AFPlugin;
pub fn make_plugins(