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

rm unuse code & rename folder -> client_folder

Browse Source
This commit is contained in:
appflowy
2022-01-24 21:17:31 +08:00
parent f90e3b63cd
commit d97abcc99f
15 changed files with 20 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ use flowy_core_data_model::user_default;
use flowy_sync::RevisionWebSocket;
use lazy_static::lazy_static;
use flowy_collaboration::{entities::ws_data::ServerRevisionWSData, folder::FolderPad};
use flowy_collaboration::{client_folder::FolderPad, entities::ws_data::ServerRevisionWSData};
use flowy_document::FlowyDocumentManager;
use std::{collections::HashMap, convert::TryInto, fmt::Formatter, sync::Arc};

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

@ -1,7 +1,7 @@
use crate::services::web_socket::make_folder_ws_manager;
use flowy_collaboration::{
client_folder::{FolderChange, FolderPad},
entities::{revision::Revision, ws_data::ServerRevisionWSData},
folder::{FolderChange, FolderPad},
};
use crate::controller::FolderId;

2
frontend/rust-lib/flowy-core/src/services/persistence/migration.rs
View File

@ -2,7 +2,7 @@ use crate::{
module::WorkspaceDatabase,
services::persistence::{AppTableSql, TrashTableSql, ViewTableSql, WorkspaceTableSql},
};
use flowy_collaboration::{entities::revision::md5, folder::FolderPad};
use flowy_collaboration::{client_folder::FolderPad, entities::revision::md5};
use flowy_core_data_model::entities::{
app::{App, RepeatedApp},
view::{RepeatedView, View},

2
frontend/rust-lib/flowy-core/src/services/persistence/mod.rs
View File

@ -3,8 +3,8 @@ pub mod version_1;
mod version_2;
use flowy_collaboration::{
client_folder::FolderPad,
entities::revision::{Revision, RevisionState},
folder::FolderPad,
};
use std::sync::Arc;
use tokio::sync::RwLock;

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

@ -1,11 +1,11 @@
use crate::services::FOLDER_SYNC_INTERVAL_IN_MILLIS;
use bytes::Bytes;
use flowy_collaboration::{
client_folder::FolderPad,
entities::{
revision::RevisionRange,
ws_data::{ClientRevisionWSData, NewDocumentUser, ServerRevisionWSDataType},
},
folder::FolderPad,
};
use flowy_error::FlowyError;
use flowy_sync::*;

4
frontend/rust-lib/flowy-sync/src/ws_manager.rs
View File

@ -200,17 +200,19 @@ impl RevisionWSStream {
async fn handle_message(&self, msg: ServerRevisionWSData) -> FlowyResult<()> {
let ServerRevisionWSData { object_id, ty, data } = msg;
let bytes = Bytes::from(data);
tracing::trace!("[{}]: new message: {}:{:?}", self, object_id, ty);
match ty {
ServerRevisionWSDataType::ServerPushRev => {
tracing::trace!("[{}]: new push revision: {}:{:?}", self, object_id, ty);
let _ = self.consumer.receive_push_revision(bytes).await?;
}
ServerRevisionWSDataType::ServerPullRev => {
let range = RevisionRange::try_from(bytes)?;
tracing::trace!("[{}]: new pull: {}:{}-{:?}", self, object_id, range, ty);
let _ = self.consumer.pull_revisions_in_range(range).await?;
}
ServerRevisionWSDataType::ServerAck => {
let rev_id = RevId::try_from(bytes).unwrap().value;
tracing::trace!("[{}]: new ack: {}:{}-{:?}", self, object_id, rev_id, ty);
let _ = self.consumer.receive_ack(rev_id.to_string(), ty).await;
}
ServerRevisionWSDataType::UserConnect => {