Skip to content

Commit 96f6a1d

Browse files
committed
remove unuse code
1 parent 3fd3389 commit 96f6a1d

File tree

51 files changed

+570
-788
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+570
-788
lines changed

backend/tests/document_test/edit_script.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![cfg_attr(rustfmt, rustfmt::skip)]
33
use std::convert::TryInto;
44
use actix_web::web::Data;
5-
use flowy_document::services::doc::edit::ClientDocumentEditor;
5+
use flowy_document::core::edit::ClientDocumentEditor;
66
use flowy_test::{helper::ViewTest, FlowySDKTest};
77
use flowy_user::services::user::UserSession;
88
use futures_util::{stream, stream::StreamExt};

backend/tests/util/helper.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ use backend::{
66
use backend_service::{
77
configuration::{get_client_server_configuration, ClientServerConfiguration},
88
errors::ServerError,
9-
user_request::*,
10-
workspace_request::*,
9+
http_request::*,
1110
};
1211
use flowy_collaboration::{
1312
document::default::initial_delta_string,
1413
entities::doc::{CreateDocParams, DocumentId, DocumentInfo},
1514
};
1615
use flowy_core_data_model::entities::prelude::*;
17-
use flowy_document::services::server::{create_doc_request, read_doc_request};
16+
use flowy_document::server::{create_doc_request, read_doc_request};
1817
use flowy_user_data_model::entities::*;
1918
use lib_infra::uuid_string;
2019
use sqlx::{Connection, Executor, PgConnection, PgPool};
File renamed without changes.

frontend/rust-lib/flowy-core/src/core/aggregate_tasks/mod.rs

Lines changed: 0 additions & 3 deletions
This file was deleted.

frontend/rust-lib/flowy-core/src/core/aggregate_tasks/workspace_task.rs

Lines changed: 0 additions & 60 deletions
This file was deleted.

frontend/rust-lib/flowy-core/src/core/event_handler.rs

Lines changed: 0 additions & 56 deletions
This file was deleted.

frontend/rust-lib/flowy-core/src/core/mod.rs

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
use crate::{
2+
context::CoreContext,
3+
errors::FlowyError,
4+
notify::{send_dart_notification, WorkspaceNotification},
5+
services::{
6+
get_current_workspace,
7+
read_local_workspace_apps,
8+
workspace::sql::{WorkspaceTable, WorkspaceTableSql},
9+
},
10+
};
11+
use flowy_core_data_model::entities::{
12+
view::View,
13+
workspace::{CurrentWorkspaceSetting, QueryWorkspaceRequest, RepeatedWorkspace, WorkspaceId},
14+
};
15+
use lib_dispatch::prelude::{data_result, Data, DataResult, Unit};
16+
use std::{convert::TryInto, sync::Arc};
17+
18+
#[tracing::instrument(skip(data, core), err)]
19+
pub(crate) async fn read_workspaces_handler(
20+
data: Data<QueryWorkspaceRequest>,
21+
core: Unit<Arc<CoreContext>>,
22+
) -> DataResult<RepeatedWorkspace, FlowyError> {
23+
let params: WorkspaceId = data.into_inner().try_into()?;
24+
let user_id = core.user.user_id()?;
25+
let conn = &*core.database.db_connection()?;
26+
let workspace_controller = core.workspace_controller.clone();
27+
28+
let trash_controller = core.trash_controller.clone();
29+
let workspaces = conn.immediate_transaction::<_, FlowyError, _>(|| {
30+
let mut workspaces = workspace_controller.read_local_workspaces(params.workspace_id.clone(), &user_id, conn)?;
31+
for workspace in workspaces.iter_mut() {
32+
let apps = read_local_workspace_apps(&workspace.id, trash_controller.clone(), conn)?.into_inner();
33+
workspace.apps.items = apps;
34+
}
35+
Ok(workspaces)
36+
})?;
37+
38+
let _ = read_workspaces_on_server(core, user_id, params);
39+
40+
data_result(workspaces)
41+
}
42+
43+
#[tracing::instrument(skip(core), err)]
44+
pub async fn read_cur_workspace_handler(
45+
core: Unit<Arc<CoreContext>>,
46+
) -> DataResult<CurrentWorkspaceSetting, FlowyError> {
47+
let workspace_id = get_current_workspace()?;
48+
let user_id = core.user.user_id()?;
49+
let params = WorkspaceId {
50+
workspace_id: Some(workspace_id.clone()),
51+
};
52+
let conn = &*core.database.db_connection()?;
53+
let workspace = core
54+
.workspace_controller
55+
.read_local_workspace(workspace_id, &user_id, conn)?;
56+
57+
let latest_view: Option<View> = core.view_controller.latest_visit_view().unwrap_or(None);
58+
let setting = CurrentWorkspaceSetting { workspace, latest_view };
59+
let _ = read_workspaces_on_server(core, user_id, params);
60+
data_result(setting)
61+
}
62+
63+
#[tracing::instrument(level = "debug", skip(core), err)]
64+
fn read_workspaces_on_server(
65+
core: Unit<Arc<CoreContext>>,
66+
user_id: String,
67+
params: WorkspaceId,
68+
) -> Result<(), FlowyError> {
69+
let (token, server) = (core.user.token()?, core.server.clone());
70+
let app_ctrl = core.app_controller.clone();
71+
let view_ctrl = core.view_controller.clone();
72+
let conn = core.database.db_connection()?;
73+
74+
tokio::spawn(async move {
75+
// Opti: handle the error and retry?
76+
let workspaces = server.read_workspace(&token, params).await?;
77+
let _ = (&*conn).immediate_transaction::<_, FlowyError, _>(|| {
78+
tracing::debug!("Save {} workspace", workspaces.len());
79+
for workspace in &workspaces.items {
80+
let m_workspace = workspace.clone();
81+
let apps = m_workspace.apps.clone().into_inner();
82+
let workspace_table = WorkspaceTable::new(m_workspace, &user_id);
83+
84+
let _ = WorkspaceTableSql::create_workspace(workspace_table, &*conn)?;
85+
tracing::debug!("Save {} apps", apps.len());
86+
for app in apps {
87+
let views = app.belongings.clone().into_inner();
88+
match app_ctrl.save_app(app, &*conn) {
89+
Ok(_) => {},
90+
Err(e) => log::error!("create app failed: {:?}", e),
91+
}
92+
93+
tracing::debug!("Save {} views", views.len());
94+
for view in views {
95+
match view_ctrl.save_view(view, &*conn) {
96+
Ok(_) => {},
97+
Err(e) => log::error!("create view failed: {:?}", e),
98+
}
99+
}
100+
}
101+
}
102+
Ok(())
103+
})?;
104+
105+
send_dart_notification(&token, WorkspaceNotification::WorkspaceListUpdated)
106+
.payload(workspaces)
107+
.send();
108+
Result::<(), FlowyError>::Ok(())
109+
});
110+
111+
Ok(())
112+
}

frontend/rust-lib/flowy-core/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ mod macros;
1010
#[macro_use]
1111
extern crate flowy_database;
1212

13-
pub mod core;
14-
13+
pub mod context;
14+
pub mod event_handler;
1515
mod notify;
1616
pub mod protobuf;
1717
mod util;
1818

1919
pub mod prelude {
2020
pub use flowy_core_data_model::entities::{app::*, trash::*, view::*, workspace::*};
2121

22-
pub use crate::{core::*, errors::*, module::*};
22+
pub use crate::{errors::*, module::*};
2323
}
2424

2525
pub mod errors {

frontend/rust-lib/flowy-core/src/module.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ use flowy_database::DBConnection;
55
use flowy_document::context::DocumentContext;
66
use lib_dispatch::prelude::*;
77
use lib_sqlite::ConnectionPool;
8-
98
use crate::{
10-
core::{event_handler::*, CoreContext},
9+
context::CoreContext,
1110
errors::FlowyError,
1211
event::WorkspaceEvent,
12+
event_handler::*,
1313
services::{
1414
app::event_handler::*,
1515
server::construct_workspace_server,

0 commit comments

Comments
 (0)