|
@@ -4,7 +4,7 @@ pub use flowy_net::get_client_server_configuration;
|
|
|
|
|
|
use crate::deps_resolve::*;
|
|
|
use flowy_block::BlockManager;
|
|
|
-use flowy_folder::{controller::FolderManager, errors::FlowyError};
|
|
|
+use flowy_folder::{errors::FlowyError, manager::FolderManager};
|
|
|
use flowy_grid::manager::GridManager;
|
|
|
use flowy_net::ClientServerConfiguration;
|
|
|
use flowy_net::{
|
|
@@ -87,7 +87,7 @@ pub struct FlowySDK {
|
|
|
#[allow(dead_code)]
|
|
|
config: FlowySDKConfig,
|
|
|
pub user_session: Arc<UserSession>,
|
|
|
- pub document_manager: Arc<BlockManager>,
|
|
|
+ pub block_manager: Arc<BlockManager>,
|
|
|
pub folder_manager: Arc<FolderManager>,
|
|
|
pub grid_manager: Arc<GridManager>,
|
|
|
pub dispatcher: Arc<EventDispatcher>,
|
|
@@ -102,9 +102,9 @@ impl FlowySDK {
|
|
|
tracing::debug!("🔥 {:?}", config);
|
|
|
let runtime = tokio_default_runtime().unwrap();
|
|
|
let (local_server, ws_conn) = mk_local_server(&config.server_config);
|
|
|
- let (user_session, document_manager, folder_manager, local_server, grid_manager) = runtime.block_on(async {
|
|
|
+ let (user_session, block_manager, folder_manager, local_server, grid_manager) = runtime.block_on(async {
|
|
|
let user_session = mk_user_session(&config, &local_server, &config.server_config);
|
|
|
- let document_manager = BlockDepsResolver::resolve(
|
|
|
+ let block_manager = BlockDepsResolver::resolve(
|
|
|
local_server.clone(),
|
|
|
ws_conn.clone(),
|
|
|
user_session.clone(),
|
|
@@ -115,7 +115,7 @@ impl FlowySDK {
|
|
|
local_server.clone(),
|
|
|
user_session.clone(),
|
|
|
&config.server_config,
|
|
|
- &document_manager,
|
|
|
+ &block_manager,
|
|
|
ws_conn.clone(),
|
|
|
)
|
|
|
.await;
|
|
@@ -126,17 +126,11 @@ impl FlowySDK {
|
|
|
local_server.run();
|
|
|
}
|
|
|
ws_conn.init().await;
|
|
|
- (
|
|
|
- user_session,
|
|
|
- document_manager,
|
|
|
- folder_manager,
|
|
|
- local_server,
|
|
|
- grid_manager,
|
|
|
- )
|
|
|
+ (user_session, block_manager, folder_manager, local_server, grid_manager)
|
|
|
});
|
|
|
|
|
|
let dispatcher = Arc::new(EventDispatcher::construct(runtime, || {
|
|
|
- mk_modules(&ws_conn, &folder_manager, &grid_manager, &user_session)
|
|
|
+ mk_modules(&ws_conn, &folder_manager, &grid_manager, &user_session, &block_manager)
|
|
|
}));
|
|
|
|
|
|
_start_listening(&dispatcher, &ws_conn, &user_session, &folder_manager);
|
|
@@ -144,7 +138,7 @@ impl FlowySDK {
|
|
|
Self {
|
|
|
config,
|
|
|
user_session,
|
|
|
- document_manager,
|
|
|
+ block_manager,
|
|
|
folder_manager,
|
|
|
grid_manager,
|
|
|
dispatcher,
|