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

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs
View File

@ -7,7 +7,7 @@ use collab::core::collab_plugin::EncodedCollab;
use collab_entity::CollabType;
use tracing::error;
use flowy_database_deps::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};
use flowy_database_pub::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};
use lib_infra::future::FutureResult;
use crate::af_cloud::AFServer;

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs
View File

@ -5,7 +5,7 @@ use collab::core::origin::CollabOrigin;
use collab_document::document::Document;
use collab_entity::CollabType;
use flowy_document_deps::cloud::*;
use flowy_document_pub::cloud::*;
use flowy_error::FlowyError;
use lib_infra::future::FutureResult;

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs
View File

@ -5,7 +5,7 @@ use collab::core::origin::CollabOrigin;
use collab_entity::CollabType;
use flowy_error::FlowyError;
use flowy_folder_deps::cloud::{
use flowy_folder_pub::cloud::{
Folder, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace,
WorkspaceRecord,
};

4
frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs
View File

@ -10,8 +10,8 @@ use collab_entity::CollabObject;
use parking_lot::RwLock;
use flowy_error::{ErrorCode, FlowyError};
use flowy_user_deps::cloud::{UserCloudService, UserCollabParams, UserUpdate, UserUpdateReceiver};
use flowy_user_deps::entities::*;
use flowy_user_pub::cloud::{UserCloudService, UserCollabParams, UserUpdate, UserUpdateReceiver};
use flowy_user_pub::entities::*;
use lib_infra::box_any::BoxAny;
use lib_infra::future::FutureResult;

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs
View File

@ -2,7 +2,7 @@ use anyhow::Error;
use client_api::entity::auth_dto::{UpdateUserParams, UserMetaData};
use client_api::entity::{AFRole, AFUserProfile, AFWorkspaceMember};
use flowy_user_deps::entities::{
use flowy_user_pub::entities::{
Authenticator, Role, UpdateUserProfileParams, UserProfile, WorkspaceMember,
USER_METADATA_ICON_URL, USER_METADATA_OPEN_AI_KEY, USER_METADATA_STABILITY_AI_KEY,
};

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/user/util.rs
View File

@ -1,6 +1,6 @@
use client_api::entity::AFUserProfile;
use flowy_user_deps::entities::EncryptionType;
use flowy_user_pub::entities::EncryptionType;
pub fn encryption_type_from_profile(profile: &AFUserProfile) -> EncryptionType {
match &profile.encryption_sign {

12
frontend/rust-lib/flowy-server/src/af_cloud/server.rs
View File

@ -13,14 +13,14 @@ use tokio::sync::watch;
use tokio_stream::wrappers::WatchStream;
use tracing::{error, event, info};
use flowy_database_deps::cloud::DatabaseCloudService;
use flowy_document_deps::cloud::DocumentCloudService;
use flowy_database_pub::cloud::DatabaseCloudService;
use flowy_document_pub::cloud::DocumentCloudService;
use flowy_error::{ErrorCode, FlowyError};
use flowy_folder_deps::cloud::FolderCloudService;
use flowy_server_config::af_cloud_config::AFCloudConfiguration;
use flowy_folder_pub::cloud::FolderCloudService;
use flowy_server_pub::af_cloud_config::AFCloudConfiguration;
use flowy_storage::FileStorageService;
use flowy_user_deps::cloud::{UserCloudService, UserUpdate};
use flowy_user_deps::entities::UserTokenState;
use flowy_user_pub::cloud::{UserCloudService, UserUpdate};
use flowy_user_pub::entities::UserTokenState;
use lib_dispatch::prelude::af_spawn;
use lib_infra::future::FutureResult;

2
frontend/rust-lib/flowy-server/src/local_server/impls/database.rs
View File

@ -2,7 +2,7 @@ use anyhow::Error;
use collab::core::collab::CollabDocState;
use collab_entity::CollabType;
use flowy_database_deps::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};
use flowy_database_pub::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};
use lib_infra::future::FutureResult;
pub(crate) struct LocalServerDatabaseCloudServiceImpl();

2
frontend/rust-lib/flowy-server/src/local_server/impls/document.rs
View File

@ -1,7 +1,7 @@
use anyhow::Error;
use collab::core::collab::CollabDocState;
use flowy_document_deps::cloud::*;
use flowy_document_pub::cloud::*;
use flowy_error::{ErrorCode, FlowyError};
use lib_infra::future::FutureResult;

2
frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs
View File

@ -4,7 +4,7 @@ use anyhow::{anyhow, Error};
use collab::core::collab::CollabDocState;
use collab_entity::CollabType;
use flowy_folder_deps::cloud::{
use flowy_folder_pub::cloud::{
gen_workspace_id, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace,
WorkspaceRecord,
};

6
frontend/rust-lib/flowy-server/src/local_server/impls/user.rs
View File

@ -8,9 +8,9 @@ use parking_lot::Mutex;
use uuid::Uuid;
use flowy_error::FlowyError;
use flowy_user_deps::cloud::{UserCloudService, UserCollabParams};
use flowy_user_deps::entities::*;
use flowy_user_deps::DEFAULT_USER_NAME;
use flowy_user_pub::cloud::{UserCloudService, UserCollabParams};
use flowy_user_pub::entities::*;
use flowy_user_pub::DEFAULT_USER_NAME;
use lib_infra::box_any::BoxAny;
use lib_infra::future::FutureResult;
use lib_infra::util::timestamp;

10
frontend/rust-lib/flowy-server/src/local_server/server.rs
View File

@ -3,16 +3,16 @@ use std::sync::Arc;
use parking_lot::RwLock;
use tokio::sync::mpsc;
use flowy_database_deps::cloud::DatabaseCloudService;
use flowy_document_deps::cloud::DocumentCloudService;
use flowy_database_pub::cloud::DatabaseCloudService;
use flowy_document_pub::cloud::DocumentCloudService;
use flowy_error::FlowyError;
use flowy_folder_deps::cloud::FolderCloudService;
use flowy_folder_pub::cloud::FolderCloudService;
use flowy_storage::FileStorageService;
// use flowy_user::services::database::{
// get_user_profile, get_user_workspace, open_collab_db, open_user_db,
// };
use flowy_user_deps::cloud::UserCloudService;
use flowy_user_deps::entities::*;
use flowy_user_pub::cloud::UserCloudService;
use flowy_user_pub::entities::*;
use crate::local_server::impls::{
LocalServerDatabaseCloudServiceImpl, LocalServerDocumentCloudServiceImpl,

10
frontend/rust-lib/flowy-server/src/server.rs
View File

@ -8,12 +8,12 @@ use collab_plugins::cloud_storage::RemoteCollabStorage;
use parking_lot::RwLock;
use tokio_stream::wrappers::WatchStream;
use flowy_database_deps::cloud::DatabaseCloudService;
use flowy_document_deps::cloud::DocumentCloudService;
use flowy_folder_deps::cloud::FolderCloudService;
use flowy_database_pub::cloud::DatabaseCloudService;
use flowy_document_pub::cloud::DocumentCloudService;
use flowy_folder_pub::cloud::FolderCloudService;
use flowy_storage::FileStorageService;
use flowy_user_deps::cloud::UserCloudService;
use flowy_user_deps::entities::UserTokenState;
use flowy_user_pub::cloud::UserCloudService;
use flowy_user_pub::entities::UserTokenState;
use lib_infra::future::FutureResult;
pub trait AppFlowyEncryption: Send + Sync + 'static {

2
frontend/rust-lib/flowy-server/src/supabase/api/database.rs
View File

@ -3,7 +3,7 @@ use collab::core::collab::CollabDocState;
use collab_entity::CollabType;
use tokio::sync::oneshot::channel;
use flowy_database_deps::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};
use flowy_database_pub::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};
use lib_dispatch::prelude::af_spawn;
use lib_infra::future::FutureResult;

2
frontend/rust-lib/flowy-server/src/supabase/api/document.rs
View File

@ -6,7 +6,7 @@ use collab_document::document::Document;
use collab_entity::CollabType;
use tokio::sync::oneshot::channel;
use flowy_document_deps::cloud::{DocumentCloudService, DocumentSnapshot};
use flowy_document_pub::cloud::{DocumentCloudService, DocumentSnapshot};
use flowy_error::FlowyError;
use lib_dispatch::prelude::af_spawn;
use lib_infra::future::FutureResult;

2
frontend/rust-lib/flowy-server/src/supabase/api/folder.rs
View File

@ -9,7 +9,7 @@ use serde_json::Value;
use tokio::sync::oneshot::channel;
use yrs::merge_updates_v1;
use flowy_folder_deps::cloud::{
use flowy_folder_pub::cloud::{
gen_workspace_id, Folder, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot,
Workspace, WorkspaceRecord,
};

2
frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rs
View File

@ -6,7 +6,7 @@ use parking_lot::RwLock;
use postgrest::Postgrest;
use flowy_error::{ErrorCode, FlowyError};
use flowy_server_config::supabase_config::SupabaseConfiguration;
use flowy_server_pub::supabase_config::SupabaseConfiguration;
use crate::AppFlowyEncryption;

2
frontend/rust-lib/flowy-server/src/supabase/api/request.rs
View File

@ -15,7 +15,7 @@ use tokio_retry::strategy::FixedInterval;
use tokio_retry::{Action, Condition, RetryIf};
use yrs::merge_updates_v1;
use flowy_database_deps::cloud::CollabDocStateByOid;
use flowy_database_pub::cloud::CollabDocStateByOid;
use lib_infra::util::md5;
use crate::response::ExtendedResponse;

8
frontend/rust-lib/flowy-server/src/supabase/api/user.rs
View File

@ -17,10 +17,10 @@ use tokio_retry::{Action, RetryIf};
use uuid::Uuid;
use flowy_error::FlowyError;
use flowy_folder_deps::cloud::{Folder, FolderData, Workspace};
use flowy_user_deps::cloud::*;
use flowy_user_deps::entities::*;
use flowy_user_deps::DEFAULT_USER_NAME;
use flowy_folder_pub::cloud::{Folder, FolderData, Workspace};
use flowy_user_pub::cloud::*;
use flowy_user_pub::entities::*;
use flowy_user_pub::DEFAULT_USER_NAME;
use lib_dispatch::prelude::af_spawn;
use lib_infra::box_any::BoxAny;
use lib_infra::future::FutureResult;

2
frontend/rust-lib/flowy-server/src/supabase/file_storage/core.rs
View File

@ -10,7 +10,7 @@ use url::Url;
use flowy_encrypt::{decrypt_data, encrypt_data};
use flowy_error::FlowyError;
use flowy_server_config::supabase_config::SupabaseConfiguration;
use flowy_server_pub::supabase_config::SupabaseConfiguration;
use flowy_storage::{FileStoragePlan, FileStorageService, StorageObject};
use lib_infra::future::FutureResult;

10
frontend/rust-lib/flowy-server/src/supabase/server.rs
View File

@ -5,12 +5,12 @@ use collab_entity::CollabObject;
use collab_plugins::cloud_storage::{RemoteCollabStorage, RemoteUpdateSender};
use parking_lot::RwLock;
use flowy_database_deps::cloud::DatabaseCloudService;
use flowy_document_deps::cloud::DocumentCloudService;
use flowy_folder_deps::cloud::FolderCloudService;
use flowy_server_config::supabase_config::SupabaseConfiguration;
use flowy_database_pub::cloud::DatabaseCloudService;
use flowy_document_pub::cloud::DocumentCloudService;
use flowy_folder_pub::cloud::FolderCloudService;
use flowy_server_pub::supabase_config::SupabaseConfiguration;
use flowy_storage::FileStorageService;
use flowy_user_deps::cloud::UserCloudService;
use flowy_user_pub::cloud::UserCloudService;
use crate::supabase::api::{
RESTfulPostgresServer, RealtimeCollabUpdateHandler, RealtimeEventHandler, RealtimeUserHandler,