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

rename flowy-core to flowy-folder that manages the workspace,app,view

Browse Source
This commit is contained in:
appflowy
2022-01-27 20:39:54 +08:00
parent 17955bcf43
commit 2fa99a563c
213 changed files with 1008 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/rust-lib/Cargo.toml
View File

@ -9,7 +9,7 @@ members = [
"flowy-user",
"flowy-test",
"flowy-database",
"flowy-core",
"flowy-folder",
"dart-notify",
"flowy-document",
"flowy-error",

159
frontend/rust-lib/flowy-core/src/protobuf/model/dart_notification.rs
View File

@ -1,159 +0,0 @@
// This file is generated by rust-protobuf 2.22.1. Do not edit
// @generated
// https://github.com/rust-lang/rust-clippy/issues/702
#![allow(unknown_lints)]
#![allow(clippy::all)]
#![allow(unused_attributes)]
#![cfg_attr(rustfmt, rustfmt::skip)]
#![allow(box_pointers)]
#![allow(dead_code)]
#![allow(missing_docs)]
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]
#![allow(non_upper_case_globals)]
#![allow(trivial_casts)]
#![allow(unused_imports)]
#![allow(unused_results)]
//! Generated file from `dart_notification.proto`
/// Generated files are compatible only with the same version
/// of protobuf runtime.
// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1;
#[derive(Clone,PartialEq,Eq,Debug,Hash)]
pub enum WorkspaceNotification {
Unknown = 0,
UserCreateWorkspace = 10,
UserDeleteWorkspace = 11,
WorkspaceUpdated = 12,
WorkspaceListUpdated = 13,
WorkspaceAppsChanged = 14,
AppUpdated = 21,
AppViewsChanged = 24,
ViewUpdated = 31,
ViewDeleted = 32,
ViewRestored = 33,
UserUnauthorized = 100,
TrashUpdated = 1000,
}
impl ::protobuf::ProtobufEnum for WorkspaceNotification {
fn value(&self) -> i32 {
*self as i32
}
fn from_i32(value: i32) -> ::std::option::Option<WorkspaceNotification> {
match value {
0 => ::std::option::Option::Some(WorkspaceNotification::Unknown),
10 => ::std::option::Option::Some(WorkspaceNotification::UserCreateWorkspace),
11 => ::std::option::Option::Some(WorkspaceNotification::UserDeleteWorkspace),
12 => ::std::option::Option::Some(WorkspaceNotification::WorkspaceUpdated),
13 => ::std::option::Option::Some(WorkspaceNotification::WorkspaceListUpdated),
14 => ::std::option::Option::Some(WorkspaceNotification::WorkspaceAppsChanged),
21 => ::std::option::Option::Some(WorkspaceNotification::AppUpdated),
24 => ::std::option::Option::Some(WorkspaceNotification::AppViewsChanged),
31 => ::std::option::Option::Some(WorkspaceNotification::ViewUpdated),
32 => ::std::option::Option::Some(WorkspaceNotification::ViewDeleted),
33 => ::std::option::Option::Some(WorkspaceNotification::ViewRestored),
100 => ::std::option::Option::Some(WorkspaceNotification::UserUnauthorized),
1000 => ::std::option::Option::Some(WorkspaceNotification::TrashUpdated),
_ => ::std::option::Option::None
}
}
fn values() -> &'static [Self] {
static values: &'static [WorkspaceNotification] = &[
WorkspaceNotification::Unknown,
WorkspaceNotification::UserCreateWorkspace,
WorkspaceNotification::UserDeleteWorkspace,
WorkspaceNotification::WorkspaceUpdated,
WorkspaceNotification::WorkspaceListUpdated,
WorkspaceNotification::WorkspaceAppsChanged,
WorkspaceNotification::AppUpdated,
WorkspaceNotification::AppViewsChanged,
WorkspaceNotification::ViewUpdated,
WorkspaceNotification::ViewDeleted,
WorkspaceNotification::ViewRestored,
WorkspaceNotification::UserUnauthorized,
WorkspaceNotification::TrashUpdated,
];
values
}
fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::LazyV2::INIT;
descriptor.get(|| {
::protobuf::reflect::EnumDescriptor::new_pb_name::<WorkspaceNotification>("WorkspaceNotification", file_descriptor_proto())
})
}
}
impl ::std::marker::Copy for WorkspaceNotification {
}
impl ::std::default::Default for WorkspaceNotification {
fn default() -> Self {
WorkspaceNotification::Unknown
}
}
impl ::protobuf::reflect::ProtobufValue for WorkspaceNotification {
fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
::protobuf::reflect::ReflectValueRef::Enum(::protobuf::ProtobufEnum::descriptor(self))
}
}
static file_descriptor_proto_data: &'static [u8] = b"\
\n\x17dart_notification.proto*\xa2\x02\n\x15WorkspaceNotification\x12\
\x0b\n\x07Unknown\x10\0\x12\x17\n\x13UserCreateWorkspace\x10\n\x12\x17\n\
\x13UserDeleteWorkspace\x10\x0b\x12\x14\n\x10WorkspaceUpdated\x10\x0c\
\x12\x18\n\x14WorkspaceListUpdated\x10\r\x12\x18\n\x14WorkspaceAppsChang\
ed\x10\x0e\x12\x0e\n\nAppUpdated\x10\x15\x12\x13\n\x0fAppViewsChanged\
\x10\x18\x12\x0f\n\x0bViewUpdated\x10\x1f\x12\x0f\n\x0bViewDeleted\x10\
\x20\x12\x10\n\x0cViewRestored\x10!\x12\x14\n\x10UserUnauthorized\x10d\
\x12\x11\n\x0cTrashUpdated\x10\xe8\x07J\xbf\x04\n\x06\x12\x04\0\0\x10\
\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\n\n\x02\x05\0\x12\x04\x02\0\x10\
\x01\n\n\n\x03\x05\0\x01\x12\x03\x02\x05\x1a\n\x0b\n\x04\x05\0\x02\0\x12\
\x03\x03\x04\x10\n\x0c\n\x05\x05\0\x02\0\x01\x12\x03\x03\x04\x0b\n\x0c\n\
\x05\x05\0\x02\0\x02\x12\x03\x03\x0e\x0f\n\x0b\n\x04\x05\0\x02\x01\x12\
\x03\x04\x04\x1d\n\x0c\n\x05\x05\0\x02\x01\x01\x12\x03\x04\x04\x17\n\x0c\
\n\x05\x05\0\x02\x01\x02\x12\x03\x04\x1a\x1c\n\x0b\n\x04\x05\0\x02\x02\
\x12\x03\x05\x04\x1d\n\x0c\n\x05\x05\0\x02\x02\x01\x12\x03\x05\x04\x17\n\
\x0c\n\x05\x05\0\x02\x02\x02\x12\x03\x05\x1a\x1c\n\x0b\n\x04\x05\0\x02\
\x03\x12\x03\x06\x04\x1a\n\x0c\n\x05\x05\0\x02\x03\x01\x12\x03\x06\x04\
\x14\n\x0c\n\x05\x05\0\x02\x03\x02\x12\x03\x06\x17\x19\n\x0b\n\x04\x05\0\
\x02\x04\x12\x03\x07\x04\x1e\n\x0c\n\x05\x05\0\x02\x04\x01\x12\x03\x07\
\x04\x18\n\x0c\n\x05\x05\0\x02\x04\x02\x12\x03\x07\x1b\x1d\n\x0b\n\x04\
\x05\0\x02\x05\x12\x03\x08\x04\x1e\n\x0c\n\x05\x05\0\x02\x05\x01\x12\x03\
\x08\x04\x18\n\x0c\n\x05\x05\0\x02\x05\x02\x12\x03\x08\x1b\x1d\n\x0b\n\
\x04\x05\0\x02\x06\x12\x03\t\x04\x14\n\x0c\n\x05\x05\0\x02\x06\x01\x12\
\x03\t\x04\x0e\n\x0c\n\x05\x05\0\x02\x06\x02\x12\x03\t\x11\x13\n\x0b\n\
\x04\x05\0\x02\x07\x12\x03\n\x04\x19\n\x0c\n\x05\x05\0\x02\x07\x01\x12\
\x03\n\x04\x13\n\x0c\n\x05\x05\0\x02\x07\x02\x12\x03\n\x16\x18\n\x0b\n\
\x04\x05\0\x02\x08\x12\x03\x0b\x04\x15\n\x0c\n\x05\x05\0\x02\x08\x01\x12\
\x03\x0b\x04\x0f\n\x0c\n\x05\x05\0\x02\x08\x02\x12\x03\x0b\x12\x14\n\x0b\
\n\x04\x05\0\x02\t\x12\x03\x0c\x04\x15\n\x0c\n\x05\x05\0\x02\t\x01\x12\
\x03\x0c\x04\x0f\n\x0c\n\x05\x05\0\x02\t\x02\x12\x03\x0c\x12\x14\n\x0b\n\
\x04\x05\0\x02\n\x12\x03\r\x04\x16\n\x0c\n\x05\x05\0\x02\n\x01\x12\x03\r\
\x04\x10\n\x0c\n\x05\x05\0\x02\n\x02\x12\x03\r\x13\x15\n\x0b\n\x04\x05\0\
\x02\x0b\x12\x03\x0e\x04\x1b\n\x0c\n\x05\x05\0\x02\x0b\x01\x12\x03\x0e\
\x04\x14\n\x0c\n\x05\x05\0\x02\x0b\x02\x12\x03\x0e\x17\x1a\n\x0b\n\x04\
\x05\0\x02\x0c\x12\x03\x0f\x04\x18\n\x0c\n\x05\x05\0\x02\x0c\x01\x12\x03\
\x0f\x04\x10\n\x0c\n\x05\x05\0\x02\x0c\x02\x12\x03\x0f\x13\x17b\x06proto\
3\
";
static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT;
fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
::protobuf::Message::parse_from_bytes(file_descriptor_proto_data).unwrap()
}
pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto {
file_descriptor_proto_lazy.get(|| {
parse_descriptor_proto()
})
}

6
frontend/rust-lib/flowy-core/Cargo.toml → frontend/rust-lib/flowy-folder/Cargo.toml
View File

@ -1,12 +1,12 @@
[package]
name = "flowy-core"
name = "flowy-folder"
version = "0.1.0"
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
flowy-core-data-model = { path = "../../../shared-lib/flowy-core-data-model" }
flowy-folder-data-model = { path = "../../../shared-lib/flowy-folder-data-model" }
flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration" }
flowy-derive = { path = "../../../shared-lib/flowy-derive" }
lib-ot = { path = "../../../shared-lib/lib-ot" }
@ -46,7 +46,7 @@ chrono = "0.4"
[dev-dependencies]
serial_test = "0.5.1"
serde_json = "1.0"
flowy-core = { path = "../flowy-core", features = ["flowy_unit_test"]}
flowy-folder = { path = "../flowy-folder", features = ["flowy_unit_test"]}
flowy-test = { path = "../flowy-test" }
[features]

0
frontend/rust-lib/flowy-core/Flowy.toml → frontend/rust-lib/flowy-folder/Flowy.toml
View File

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

@ -1,7 +1,7 @@
use bytes::Bytes;
use chrono::Utc;
use flowy_collaboration::client_document::default::{initial_delta, initial_read_me};
use flowy_core_data_model::user_default;
use flowy_folder_data_model::user_default;
use flowy_sync::RevisionWebSocket;
use lazy_static::lazy_static;
@ -12,7 +12,7 @@ use std::{collections::HashMap, convert::TryInto, fmt::Formatter, sync::Arc};
use tokio::sync::RwLock as TokioRwLock;
use crate::{
dart_notification::{send_dart_notification, WorkspaceNotification},
dart_notification::{send_dart_notification, FolderNotification},
entities::workspace::RepeatedWorkspace,
errors::FlowyResult,
module::{FolderCouldServiceV1, WorkspaceDatabase, WorkspaceUser},
@ -210,7 +210,7 @@ impl DefaultFolderBuilder {
let folder_id = FolderId::new(user_id);
let _ = persistence.save_folder(user_id, &folder_id, folder).await?;
let repeated_workspace = RepeatedWorkspace { items: vec![workspace] };
send_dart_notification(token, WorkspaceNotification::UserCreateWorkspace)
send_dart_notification(token, FolderNotification::UserCreateWorkspace)
.payload(repeated_workspace)
.send();
Ok(())

14
frontend/rust-lib/flowy-core/src/dart_notification.rs → frontend/rust-lib/flowy-folder/src/dart_notification.rs
View File

@ -3,7 +3,7 @@ use flowy_derive::ProtoBuf_Enum;
const OBSERVABLE_CATEGORY: &str = "Workspace";
#[derive(ProtoBuf_Enum, Debug)]
pub(crate) enum WorkspaceNotification {
pub(crate) enum FolderNotification {
Unknown = 0,
UserCreateWorkspace = 10,
UserDeleteWorkspace = 11,
@ -19,24 +19,24 @@ pub(crate) enum WorkspaceNotification {
TrashUpdated = 1000,
}
impl std::default::Default for WorkspaceNotification {
impl std::default::Default for FolderNotification {
fn default() -> Self {
WorkspaceNotification::Unknown
FolderNotification::Unknown
}
}
impl std::convert::From<WorkspaceNotification> for i32 {
fn from(notification: WorkspaceNotification) -> Self {
impl std::convert::From<FolderNotification> for i32 {
fn from(notification: FolderNotification) -> Self {
notification as i32
}
}
#[tracing::instrument(level = "trace")]
pub(crate) fn send_dart_notification(id: &str, ty: WorkspaceNotification) -> DartNotifyBuilder {
pub(crate) fn send_dart_notification(id: &str, ty: FolderNotification) -> DartNotifyBuilder {
DartNotifyBuilder::new(id, ty, OBSERVABLE_CATEGORY)
}
#[tracing::instrument(level = "trace")]
pub(crate) fn send_anonymous_dart_notification(ty: WorkspaceNotification) -> DartNotifyBuilder {
pub(crate) fn send_anonymous_dart_notification(ty: FolderNotification) -> DartNotifyBuilder {
DartNotifyBuilder::new("", ty, OBSERVABLE_CATEGORY)
}

2
frontend/rust-lib/flowy-core/src/event.rs → frontend/rust-lib/flowy-folder/src/event.rs
View File

@ -3,7 +3,7 @@ use strum_macros::Display;
#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)]
#[event_err = "FlowyError"]
pub enum WorkspaceEvent {
pub enum FolderEvent {
#[event(input = "CreateWorkspaceRequest", output = "Workspace")]
CreateWorkspace = 0,

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

@ -1,4 +1,4 @@
pub use flowy_core_data_model::entities;
pub use flowy_folder_data_model::entities;
pub mod event;
pub mod module;
@ -16,7 +16,7 @@ pub mod protobuf;
mod util;
pub mod prelude {
pub use flowy_core_data_model::entities::{app::*, trash::*, view::*, workspace::*};
pub use flowy_folder_data_model::entities::{app::*, trash::*, view::*, workspace::*};
pub use crate::{errors::*, module::*};
}

0
frontend/rust-lib/flowy-core/src/macros.rs → frontend/rust-lib/flowy-folder/src/macros.rs
View File

48
frontend/rust-lib/flowy-core/src/module.rs → frontend/rust-lib/flowy-folder/src/module.rs
View File

@ -7,7 +7,7 @@ use crate::{
workspace::{CreateWorkspaceParams, RepeatedWorkspace, UpdateWorkspaceParams, Workspace, WorkspaceId},
},
errors::FlowyError,
event::WorkspaceEvent,
event::FolderEvent,
services::{app::event_handler::*, trash::event_handler::*, view::event_handler::*, workspace::event_handler::*},
};
use flowy_database::DBConnection;
@ -44,36 +44,36 @@ pub fn create(folder: Arc<FolderManager>) -> Module {
.data(folder.clone());
module = module
.event(WorkspaceEvent::CreateWorkspace, create_workspace_handler)
.event(WorkspaceEvent::ReadCurWorkspace, read_cur_workspace_handler)
.event(WorkspaceEvent::ReadWorkspaces, read_workspaces_handler)
.event(WorkspaceEvent::OpenWorkspace, open_workspace_handler)
.event(WorkspaceEvent::ReadWorkspaceApps, read_workspace_apps_handler);
.event(FolderEvent::CreateWorkspace, create_workspace_handler)
.event(FolderEvent::ReadCurWorkspace, read_cur_workspace_handler)
.event(FolderEvent::ReadWorkspaces, read_workspaces_handler)
.event(FolderEvent::OpenWorkspace, open_workspace_handler)
.event(FolderEvent::ReadWorkspaceApps, read_workspace_apps_handler);
module = module
.event(WorkspaceEvent::CreateApp, create_app_handler)
.event(WorkspaceEvent::ReadApp, read_app_handler)
.event(WorkspaceEvent::UpdateApp, update_app_handler)
.event(WorkspaceEvent::DeleteApp, delete_app_handler);
.event(FolderEvent::CreateApp, create_app_handler)
.event(FolderEvent::ReadApp, read_app_handler)
.event(FolderEvent::UpdateApp, update_app_handler)
.event(FolderEvent::DeleteApp, delete_app_handler);
module = module
.event(WorkspaceEvent::CreateView, create_view_handler)
.event(WorkspaceEvent::ReadView, read_view_handler)
.event(WorkspaceEvent::UpdateView, update_view_handler)
.event(WorkspaceEvent::DeleteView, delete_view_handler)
.event(WorkspaceEvent::DuplicateView, duplicate_view_handler)
.event(WorkspaceEvent::OpenDocument, open_document_handler)
.event(WorkspaceEvent::CloseView, close_view_handler)
.event(WorkspaceEvent::ApplyDocDelta, document_delta_handler);
.event(FolderEvent::CreateView, create_view_handler)
.event(FolderEvent::ReadView, read_view_handler)
.event(FolderEvent::UpdateView, update_view_handler)
.event(FolderEvent::DeleteView, delete_view_handler)
.event(FolderEvent::DuplicateView, duplicate_view_handler)
.event(FolderEvent::OpenDocument, open_document_handler)
.event(FolderEvent::CloseView, close_view_handler)
.event(FolderEvent::ApplyDocDelta, document_delta_handler);
module = module
.event(WorkspaceEvent::ReadTrash, read_trash_handler)
.event(WorkspaceEvent::PutbackTrash, putback_trash_handler)
.event(WorkspaceEvent::DeleteTrash, delete_trash_handler)
.event(WorkspaceEvent::RestoreAllTrash, restore_all_trash_handler)
.event(WorkspaceEvent::DeleteAllTrash, delete_all_trash_handler);
.event(FolderEvent::ReadTrash, read_trash_handler)
.event(FolderEvent::PutbackTrash, putback_trash_handler)
.event(FolderEvent::DeleteTrash, delete_trash_handler)
.event(FolderEvent::RestoreAllTrash, restore_all_trash_handler)
.event(FolderEvent::DeleteAllTrash, delete_all_trash_handler);
module = module.event(WorkspaceEvent::ExportDocument, export_handler);
module = module.event(FolderEvent::ExportDocument, export_handler);
module
}

0
frontend/rust-lib/flowy-core/src/protobuf/mod.rs → frontend/rust-lib/flowy-folder/src/protobuf/mod.rs
View File

158
frontend/rust-lib/flowy-folder/src/protobuf/model/dart_notification.rs Executable file
View File

@ -0,0 +1,158 @@
// This file is generated by rust-protobuf 2.22.1. Do not edit
// @generated
// https://github.com/rust-lang/rust-clippy/issues/702
#![allow(unknown_lints)]
#![allow(clippy::all)]
#![allow(unused_attributes)]
#![cfg_attr(rustfmt, rustfmt::skip)]
#![allow(box_pointers)]
#![allow(dead_code)]
#![allow(missing_docs)]
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]
#![allow(non_upper_case_globals)]
#![allow(trivial_casts)]
#![allow(unused_imports)]
#![allow(unused_results)]
//! Generated file from `dart_notification.proto`
/// Generated files are compatible only with the same version
/// of protobuf runtime.
// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1;
#[derive(Clone,PartialEq,Eq,Debug,Hash)]
pub enum FolderNotification {
Unknown = 0,
UserCreateWorkspace = 10,
UserDeleteWorkspace = 11,
WorkspaceUpdated = 12,
WorkspaceListUpdated = 13,
WorkspaceAppsChanged = 14,
AppUpdated = 21,
AppViewsChanged = 24,
ViewUpdated = 31,
ViewDeleted = 32,
ViewRestored = 33,
UserUnauthorized = 100,
TrashUpdated = 1000,
}
impl ::protobuf::ProtobufEnum for FolderNotification {
fn value(&self) -> i32 {
*self as i32
}
fn from_i32(value: i32) -> ::std::option::Option<FolderNotification> {
match value {
0 => ::std::option::Option::Some(FolderNotification::Unknown),
10 => ::std::option::Option::Some(FolderNotification::UserCreateWorkspace),
11 => ::std::option::Option::Some(FolderNotification::UserDeleteWorkspace),
12 => ::std::option::Option::Some(FolderNotification::WorkspaceUpdated),
13 => ::std::option::Option::Some(FolderNotification::WorkspaceListUpdated),
14 => ::std::option::Option::Some(FolderNotification::WorkspaceAppsChanged),
21 => ::std::option::Option::Some(FolderNotification::AppUpdated),
24 => ::std::option::Option::Some(FolderNotification::AppViewsChanged),
31 => ::std::option::Option::Some(FolderNotification::ViewUpdated),
32 => ::std::option::Option::Some(FolderNotification::ViewDeleted),
33 => ::std::option::Option::Some(FolderNotification::ViewRestored),
100 => ::std::option::Option::Some(FolderNotification::UserUnauthorized),
1000 => ::std::option::Option::Some(FolderNotification::TrashUpdated),
_ => ::std::option::Option::None
}
}
fn values() -> &'static [Self] {
static values: &'static [FolderNotification] = &[
FolderNotification::Unknown,
FolderNotification::UserCreateWorkspace,
FolderNotification::UserDeleteWorkspace,
FolderNotification::WorkspaceUpdated,
FolderNotification::WorkspaceListUpdated,
FolderNotification::WorkspaceAppsChanged,
FolderNotification::AppUpdated,
FolderNotification::AppViewsChanged,
FolderNotification::ViewUpdated,
FolderNotification::ViewDeleted,
FolderNotification::ViewRestored,
FolderNotification::UserUnauthorized,
FolderNotification::TrashUpdated,
];
values
}
fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::LazyV2::INIT;
descriptor.get(|| {
::protobuf::reflect::EnumDescriptor::new_pb_name::<FolderNotification>("FolderNotification", file_descriptor_proto())
})
}
}
impl ::std::marker::Copy for FolderNotification {
}
impl ::std::default::Default for FolderNotification {
fn default() -> Self {
FolderNotification::Unknown
}
}
impl ::protobuf::reflect::ProtobufValue for FolderNotification {
fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
::protobuf::reflect::ReflectValueRef::Enum(::protobuf::ProtobufEnum::descriptor(self))
}
}
static file_descriptor_proto_data: &'static [u8] = b"\
\n\x17dart_notification.proto*\x9f\x02\n\x12FolderNotification\x12\x0b\n\
\x07Unknown\x10\0\x12\x17\n\x13UserCreateWorkspace\x10\n\x12\x17\n\x13Us\
erDeleteWorkspace\x10\x0b\x12\x14\n\x10WorkspaceUpdated\x10\x0c\x12\x18\
\n\x14WorkspaceListUpdated\x10\r\x12\x18\n\x14WorkspaceAppsChanged\x10\
\x0e\x12\x0e\n\nAppUpdated\x10\x15\x12\x13\n\x0fAppViewsChanged\x10\x18\
\x12\x0f\n\x0bViewUpdated\x10\x1f\x12\x0f\n\x0bViewDeleted\x10\x20\x12\
\x10\n\x0cViewRestored\x10!\x12\x14\n\x10UserUnauthorized\x10d\x12\x11\n\
\x0cTrashUpdated\x10\xe8\x07J\xbf\x04\n\x06\x12\x04\0\0\x10\x01\n\x08\n\
\x01\x0c\x12\x03\0\0\x12\n\n\n\x02\x05\0\x12\x04\x02\0\x10\x01\n\n\n\x03\
\x05\0\x01\x12\x03\x02\x05\x17\n\x0b\n\x04\x05\0\x02\0\x12\x03\x03\x04\
\x10\n\x0c\n\x05\x05\0\x02\0\x01\x12\x03\x03\x04\x0b\n\x0c\n\x05\x05\0\
\x02\0\x02\x12\x03\x03\x0e\x0f\n\x0b\n\x04\x05\0\x02\x01\x12\x03\x04\x04\
\x1d\n\x0c\n\x05\x05\0\x02\x01\x01\x12\x03\x04\x04\x17\n\x0c\n\x05\x05\0\
\x02\x01\x02\x12\x03\x04\x1a\x1c\n\x0b\n\x04\x05\0\x02\x02\x12\x03\x05\
\x04\x1d\n\x0c\n\x05\x05\0\x02\x02\x01\x12\x03\x05\x04\x17\n\x0c\n\x05\
\x05\0\x02\x02\x02\x12\x03\x05\x1a\x1c\n\x0b\n\x04\x05\0\x02\x03\x12\x03\
\x06\x04\x1a\n\x0c\n\x05\x05\0\x02\x03\x01\x12\x03\x06\x04\x14\n\x0c\n\
\x05\x05\0\x02\x03\x02\x12\x03\x06\x17\x19\n\x0b\n\x04\x05\0\x02\x04\x12\
\x03\x07\x04\x1e\n\x0c\n\x05\x05\0\x02\x04\x01\x12\x03\x07\x04\x18\n\x0c\
\n\x05\x05\0\x02\x04\x02\x12\x03\x07\x1b\x1d\n\x0b\n\x04\x05\0\x02\x05\
\x12\x03\x08\x04\x1e\n\x0c\n\x05\x05\0\x02\x05\x01\x12\x03\x08\x04\x18\n\
\x0c\n\x05\x05\0\x02\x05\x02\x12\x03\x08\x1b\x1d\n\x0b\n\x04\x05\0\x02\
\x06\x12\x03\t\x04\x14\n\x0c\n\x05\x05\0\x02\x06\x01\x12\x03\t\x04\x0e\n\
\x0c\n\x05\x05\0\x02\x06\x02\x12\x03\t\x11\x13\n\x0b\n\x04\x05\0\x02\x07\
\x12\x03\n\x04\x19\n\x0c\n\x05\x05\0\x02\x07\x01\x12\x03\n\x04\x13\n\x0c\
\n\x05\x05\0\x02\x07\x02\x12\x03\n\x16\x18\n\x0b\n\x04\x05\0\x02\x08\x12\
\x03\x0b\x04\x15\n\x0c\n\x05\x05\0\x02\x08\x01\x12\x03\x0b\x04\x0f\n\x0c\
\n\x05\x05\0\x02\x08\x02\x12\x03\x0b\x12\x14\n\x0b\n\x04\x05\0\x02\t\x12\
\x03\x0c\x04\x15\n\x0c\n\x05\x05\0\x02\t\x01\x12\x03\x0c\x04\x0f\n\x0c\n\
\x05\x05\0\x02\t\x02\x12\x03\x0c\x12\x14\n\x0b\n\x04\x05\0\x02\n\x12\x03\
\r\x04\x16\n\x0c\n\x05\x05\0\x02\n\x01\x12\x03\r\x04\x10\n\x0c\n\x05\x05\
\0\x02\n\x02\x12\x03\r\x13\x15\n\x0b\n\x04\x05\0\x02\x0b\x12\x03\x0e\x04\
\x1b\n\x0c\n\x05\x05\0\x02\x0b\x01\x12\x03\x0e\x04\x14\n\x0c\n\x05\x05\0\
\x02\x0b\x02\x12\x03\x0e\x17\x1a\n\x0b\n\x04\x05\0\x02\x0c\x12\x03\x0f\
\x04\x18\n\x0c\n\x05\x05\0\x02\x0c\x01\x12\x03\x0f\x04\x10\n\x0c\n\x05\
\x05\0\x02\x0c\x02\x12\x03\x0f\x13\x17b\x06proto3\
";
static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT;
fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
::protobuf::Message::parse_from_bytes(file_descriptor_proto_data).unwrap()
}
pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto {
file_descriptor_proto_lazy.get(|| {
parse_descriptor_proto()
})
}

128
frontend/rust-lib/flowy-core/src/protobuf/model/event.rs → frontend/rust-lib/flowy-folder/src/protobuf/model/event.rs
View File

@ -24,7 +24,7 @@
// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1;
#[derive(Clone,PartialEq,Eq,Debug,Hash)]
pub enum WorkspaceEvent {
pub enum FolderEvent {
CreateWorkspace = 0,
ReadCurWorkspace = 1,
ReadWorkspaces = 2,
@ -52,69 +52,69 @@ pub enum WorkspaceEvent {
ExportDocument = 500,
}
impl ::protobuf::ProtobufEnum for WorkspaceEvent {
impl ::protobuf::ProtobufEnum for FolderEvent {
fn value(&self) -> i32 {
*self as i32
}
fn from_i32(value: i32) -> ::std::option::Option<WorkspaceEvent> {
fn from_i32(value: i32) -> ::std::option::Option<FolderEvent> {
match value {
0 => ::std::option::Option::Some(WorkspaceEvent::CreateWorkspace),
1 => ::std::option::Option::Some(WorkspaceEvent::ReadCurWorkspace),
2 => ::std::option::Option::Some(WorkspaceEvent::ReadWorkspaces),
3 => ::std::option::Option::Some(WorkspaceEvent::DeleteWorkspace),
4 => ::std::option::Option::Some(WorkspaceEvent::OpenWorkspace),
5 => ::std::option::Option::Some(WorkspaceEvent::ReadWorkspaceApps),
101 => ::std::option::Option::Some(WorkspaceEvent::CreateApp),
102 => ::std::option::Option::Some(WorkspaceEvent::DeleteApp),
103 => ::std::option::Option::Some(WorkspaceEvent::ReadApp),
104 => ::std::option::Option::Some(WorkspaceEvent::UpdateApp),
201 => ::std::option::Option::Some(WorkspaceEvent::CreateView),
202 => ::std::option::Option::Some(WorkspaceEvent::ReadView),
203 => ::std::option::Option::Some(WorkspaceEvent::UpdateView),
204 => ::std::option::Option::Some(WorkspaceEvent::DeleteView),
205 => ::std::option::Option::Some(WorkspaceEvent::DuplicateView),
206 => ::std::option::Option::Some(WorkspaceEvent::CopyLink),
207 => ::std::option::Option::Some(WorkspaceEvent::OpenDocument),
208 => ::std::option::Option::Some(WorkspaceEvent::CloseView),
300 => ::std::option::Option::Some(WorkspaceEvent::ReadTrash),
301 => ::std::option::Option::Some(WorkspaceEvent::PutbackTrash),
302 => ::std::option::Option::Some(WorkspaceEvent::DeleteTrash),
303 => ::std::option::Option::Some(WorkspaceEvent::RestoreAllTrash),
304 => ::std::option::Option::Some(WorkspaceEvent::DeleteAllTrash),
400 => ::std::option::Option::Some(WorkspaceEvent::ApplyDocDelta),
500 => ::std::option::Option::Some(WorkspaceEvent::ExportDocument),
0 => ::std::option::Option::Some(FolderEvent::CreateWorkspace),
1 => ::std::option::Option::Some(FolderEvent::ReadCurWorkspace),
2 => ::std::option::Option::Some(FolderEvent::ReadWorkspaces),
3 => ::std::option::Option::Some(FolderEvent::DeleteWorkspace),
4 => ::std::option::Option::Some(FolderEvent::OpenWorkspace),
5 => ::std::option::Option::Some(FolderEvent::ReadWorkspaceApps),
101 => ::std::option::Option::Some(FolderEvent::CreateApp),
102 => ::std::option::Option::Some(FolderEvent::DeleteApp),
103 => ::std::option::Option::Some(FolderEvent::ReadApp),
104 => ::std::option::Option::Some(FolderEvent::UpdateApp),
201 => ::std::option::Option::Some(FolderEvent::CreateView),
202 => ::std::option::Option::Some(FolderEvent::ReadView),
203 => ::std::option::Option::Some(FolderEvent::UpdateView),
204 => ::std::option::Option::Some(FolderEvent::DeleteView),
205 => ::std::option::Option::Some(FolderEvent::DuplicateView),
206 => ::std::option::Option::Some(FolderEvent::CopyLink),
207 => ::std::option::Option::Some(FolderEvent::OpenDocument),
208 => ::std::option::Option::Some(FolderEvent::CloseView),
300 => ::std::option::Option::Some(FolderEvent::ReadTrash),
301 => ::std::option::Option::Some(FolderEvent::PutbackTrash),
302 => ::std::option::Option::Some(FolderEvent::DeleteTrash),
303 => ::std::option::Option::Some(FolderEvent::RestoreAllTrash),
304 => ::std::option::Option::Some(FolderEvent::DeleteAllTrash),
400 => ::std::option::Option::Some(FolderEvent::ApplyDocDelta),
500 => ::std::option::Option::Some(FolderEvent::ExportDocument),
_ => ::std::option::Option::None
}
}
fn values() -> &'static [Self] {
static values: &'static [WorkspaceEvent] = &[
WorkspaceEvent::CreateWorkspace,
WorkspaceEvent::ReadCurWorkspace,
WorkspaceEvent::ReadWorkspaces,
WorkspaceEvent::DeleteWorkspace,
WorkspaceEvent::OpenWorkspace,
WorkspaceEvent::ReadWorkspaceApps,
WorkspaceEvent::CreateApp,
WorkspaceEvent::DeleteApp,
WorkspaceEvent::ReadApp,
WorkspaceEvent::UpdateApp,
WorkspaceEvent::CreateView,
WorkspaceEvent::ReadView,
WorkspaceEvent::UpdateView,
WorkspaceEvent::DeleteView,
WorkspaceEvent::DuplicateView,
WorkspaceEvent::CopyLink,
WorkspaceEvent::OpenDocument,
WorkspaceEvent::CloseView,
WorkspaceEvent::ReadTrash,
WorkspaceEvent::PutbackTrash,
WorkspaceEvent::DeleteTrash,
WorkspaceEvent::RestoreAllTrash,
WorkspaceEvent::DeleteAllTrash,
WorkspaceEvent::ApplyDocDelta,
WorkspaceEvent::ExportDocument,
static values: &'static [FolderEvent] = &[
FolderEvent::CreateWorkspace,
FolderEvent::ReadCurWorkspace,
FolderEvent::ReadWorkspaces,
FolderEvent::DeleteWorkspace,
FolderEvent::OpenWorkspace,
FolderEvent::ReadWorkspaceApps,
FolderEvent::CreateApp,
FolderEvent::DeleteApp,
FolderEvent::ReadApp,
FolderEvent::UpdateApp,
FolderEvent::CreateView,
FolderEvent::ReadView,
FolderEvent::UpdateView,
FolderEvent::DeleteView,
FolderEvent::DuplicateView,
FolderEvent::CopyLink,
FolderEvent::OpenDocument,
FolderEvent::CloseView,
FolderEvent::ReadTrash,
FolderEvent::PutbackTrash,
FolderEvent::DeleteTrash,
FolderEvent::RestoreAllTrash,
FolderEvent::DeleteAllTrash,
FolderEvent::ApplyDocDelta,
FolderEvent::ExportDocument,
];
values
}
@ -122,31 +122,31 @@ impl ::protobuf::ProtobufEnum for WorkspaceEvent {
fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::LazyV2::INIT;
descriptor.get(|| {
::protobuf::reflect::EnumDescriptor::new_pb_name::<WorkspaceEvent>("WorkspaceEvent", file_descriptor_proto())
::protobuf::reflect::EnumDescriptor::new_pb_name::<FolderEvent>("FolderEvent", file_descriptor_proto())
})
}
}
impl ::std::marker::Copy for WorkspaceEvent {
impl ::std::marker::Copy for FolderEvent {
}
impl ::std::default::Default for WorkspaceEvent {
impl ::std::default::Default for FolderEvent {
fn default() -> Self {
WorkspaceEvent::CreateWorkspace
FolderEvent::CreateWorkspace
}
}
impl ::protobuf::reflect::ProtobufValue for WorkspaceEvent {
impl ::protobuf::reflect::ProtobufValue for FolderEvent {
fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
::protobuf::reflect::ReflectValueRef::Enum(::protobuf::ProtobufEnum::descriptor(self))
}
}
static file_descriptor_proto_data: &'static [u8] = b"\
\n\x0bevent.proto*\xd9\x03\n\x0eWorkspaceEvent\x12\x13\n\x0fCreateWorksp\
ace\x10\0\x12\x14\n\x10ReadCurWorkspace\x10\x01\x12\x12\n\x0eReadWorkspa\
ces\x10\x02\x12\x13\n\x0fDeleteWorkspace\x10\x03\x12\x11\n\rOpenWorkspac\
e\x10\x04\x12\x15\n\x11ReadWorkspaceApps\x10\x05\x12\r\n\tCreateApp\x10e\
\n\x0bevent.proto*\xd6\x03\n\x0bFolderEvent\x12\x13\n\x0fCreateWorkspace\
\x10\0\x12\x14\n\x10ReadCurWorkspace\x10\x01\x12\x12\n\x0eReadWorkspaces\
\x10\x02\x12\x13\n\x0fDeleteWorkspace\x10\x03\x12\x11\n\rOpenWorkspace\
\x10\x04\x12\x15\n\x11ReadWorkspaceApps\x10\x05\x12\r\n\tCreateApp\x10e\
\x12\r\n\tDeleteApp\x10f\x12\x0b\n\x07ReadApp\x10g\x12\r\n\tUpdateApp\
\x10h\x12\x0f\n\nCreateView\x10\xc9\x01\x12\r\n\x08ReadView\x10\xca\x01\
\x12\x0f\n\nUpdateView\x10\xcb\x01\x12\x0f\n\nDeleteView\x10\xcc\x01\x12\
@ -157,7 +157,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
\x02\x12\x13\n\x0eDeleteAllTrash\x10\xb0\x02\x12\x12\n\rApplyDocDelta\
\x10\x90\x03\x12\x13\n\x0eExportDocument\x10\xf4\x03J\xab\x08\n\x06\x12\
\x04\0\0\x1c\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\n\n\x02\x05\0\x12\x04\
\x02\0\x1c\x01\n\n\n\x03\x05\0\x01\x12\x03\x02\x05\x13\n\x0b\n\x04\x05\0\
\x02\0\x1c\x01\n\n\n\x03\x05\0\x01\x12\x03\x02\x05\x10\n\x0b\n\x04\x05\0\
\x02\0\x12\x03\x03\x04\x18\n\x0c\n\x05\x05\0\x02\0\x01\x12\x03\x03\x04\
\x13\n\x0c\n\x05\x05\0\x02\0\x02\x12\x03\x03\x16\x17\n\x0b\n\x04\x05\0\
\x02\x01\x12\x03\x04\x04\x19\n\x0c\n\x05\x05\0\x02\x01\x01\x12\x03\x04\

0
frontend/rust-lib/flowy-core/src/protobuf/model/mod.rs → frontend/rust-lib/flowy-folder/src/protobuf/model/mod.rs
View File

2
frontend/rust-lib/flowy-core/src/protobuf/proto/dart_notification.proto → frontend/rust-lib/flowy-folder/src/protobuf/proto/dart_notification.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3";
enum WorkspaceNotification {
enum FolderNotification {
Unknown = 0;
UserCreateWorkspace = 10;
UserDeleteWorkspace = 11;

2
frontend/rust-lib/flowy-core/src/protobuf/proto/event.proto → frontend/rust-lib/flowy-folder/src/protobuf/proto/event.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3";
enum WorkspaceEvent {
enum FolderEvent {
CreateWorkspace = 0;
ReadCurWorkspace = 1;
ReadWorkspaces = 2;

6
frontend/rust-lib/flowy-core/src/services/app/controller.rs → frontend/rust-lib/flowy-folder/src/services/app/controller.rs
View File

@ -88,7 +88,7 @@ impl AppController {
Ok(app)
})
.await?;
send_dart_notification(&app_id, WorkspaceNotification::AppUpdated)
send_dart_notification(&app_id, FolderNotification::AppUpdated)
.payload(app)
.send();
let _ = self.update_app_on_server(params)?;
@ -147,7 +147,7 @@ impl AppController {
.await
{
Ok(_) => {
send_dart_notification(&app.id, WorkspaceNotification::AppUpdated)
send_dart_notification(&app.id, FolderNotification::AppUpdated)
.payload(app)
.send();
}
@ -228,7 +228,7 @@ fn notify_apps_changed<'a>(
transaction: &'a (dyn FolderPersistenceTransaction + 'a),
) -> FlowyResult<()> {
let repeated_app = read_local_workspace_apps(workspace_id, trash_controller, transaction)?;
send_dart_notification(workspace_id, WorkspaceNotification::WorkspaceAppsChanged)
send_dart_notification(workspace_id, FolderNotification::WorkspaceAppsChanged)
.payload(repeated_app)
.send();
Ok(())

0
frontend/rust-lib/flowy-core/src/services/app/event_handler.rs → frontend/rust-lib/flowy-folder/src/services/app/event_handler.rs
View File

0
frontend/rust-lib/flowy-core/src/services/app/mod.rs → frontend/rust-lib/flowy-folder/src/services/app/mod.rs
View File

0
frontend/rust-lib/flowy-core/src/services/folder_editor.rs → frontend/rust-lib/flowy-folder/src/services/folder_editor.rs
View File

0
frontend/rust-lib/flowy-core/src/services/mod.rs → frontend/rust-lib/flowy-folder/src/services/mod.rs
View File

6
frontend/rust-lib/flowy-core/src/services/persistence/migration.rs → frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs
View File

@ -3,13 +3,13 @@ use crate::{
services::persistence::{AppTableSql, TrashTableSql, ViewTableSql, WorkspaceTableSql},
};
use flowy_collaboration::{client_folder::FolderPad, entities::revision::md5};
use flowy_core_data_model::entities::{
use flowy_database::kv::KV;
use flowy_error::{FlowyError, FlowyResult};
use flowy_folder_data_model::entities::{
app::{App, RepeatedApp},
view::{RepeatedView, View},
workspace::Workspace,
};
use flowy_database::kv::KV;
use flowy_error::{FlowyError, FlowyResult};
use std::sync::Arc;
pub(crate) const V1_MIGRATION: &str = "FOLDER_V1_MIGRATION";

4
frontend/rust-lib/flowy-core/src/services/persistence/mod.rs → frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs
View File

@ -15,13 +15,13 @@ use crate::{
module::WorkspaceDatabase,
services::{folder_editor::FolderEditor, persistence::migration::FolderMigration},
};
use flowy_core_data_model::entities::{
use flowy_error::{FlowyError, FlowyResult};
use flowy_folder_data_model::entities::{
app::App,
trash::{RepeatedTrash, Trash},
view::View,
workspace::Workspace,
};
use flowy_error::{FlowyError, FlowyResult};
use flowy_sync::{mk_revision_disk_cache, RevisionRecord};
use lib_sqlite::ConnectionPool;

0
frontend/rust-lib/flowy-core/src/services/persistence/version_1/app_sql.rs → frontend/rust-lib/flowy-folder/src/services/persistence/version_1/app_sql.rs
View File

0
frontend/rust-lib/flowy-core/src/services/persistence/version_1/mod.rs → frontend/rust-lib/flowy-folder/src/services/persistence/version_1/mod.rs
View File

0
frontend/rust-lib/flowy-core/src/services/persistence/version_1/trash_sql.rs → frontend/rust-lib/flowy-folder/src/services/persistence/version_1/trash_sql.rs
View File

4
frontend/rust-lib/flowy-core/src/services/persistence/version_1/v1_impl.rs → frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs
View File

@ -6,13 +6,13 @@ use crate::services::persistence::{
},
FolderPersistenceTransaction, TrashTableSql,
};
use flowy_core_data_model::entities::{
use flowy_error::FlowyResult;
use flowy_folder_data_model::entities::{
app::App,
trash::{RepeatedTrash, Trash},
view::View,
workspace::Workspace,
};
use flowy_error::FlowyResult;
use lib_sqlite::DBConnection;
pub struct V1Transaction<'a>(pub &'a DBConnection);

0
frontend/rust-lib/flowy-core/src/services/persistence/version_1/view_sql.rs → frontend/rust-lib/flowy-folder/src/services/persistence/version_1/view_sql.rs
View File

0
frontend/rust-lib/flowy-core/src/services/persistence/version_1/workspace_sql.rs → frontend/rust-lib/flowy-folder/src/services/persistence/version_1/workspace_sql.rs
View File

0
frontend/rust-lib/flowy-core/src/services/persistence/version_2/mod.rs → frontend/rust-lib/flowy-folder/src/services/persistence/version_2/mod.rs
View File

4
frontend/rust-lib/flowy-core/src/services/persistence/version_2/v2_impl.rs → frontend/rust-lib/flowy-folder/src/services/persistence/version_2/v2_impl.rs
View File

@ -2,13 +2,13 @@ use crate::services::{
folder_editor::FolderEditor,
persistence::{AppChangeset, FolderPersistenceTransaction, ViewChangeset, WorkspaceChangeset},
};
use flowy_core_data_model::entities::{
use flowy_error::{FlowyError, FlowyResult};
use flowy_folder_data_model::entities::{
app::App,
trash::{RepeatedTrash, Trash},
view::View,
workspace::Workspace,
};
use flowy_error::{FlowyError, FlowyResult};
use std::sync::Arc;
impl FolderPersistenceTransaction for FolderEditor {

4
frontend/rust-lib/flowy-core/src/services/trash/controller.rs → frontend/rust-lib/flowy-folder/src/services/trash/controller.rs
View File

@ -1,5 +1,5 @@
use crate::{
dart_notification::{send_anonymous_dart_notification, WorkspaceNotification},
dart_notification::{send_anonymous_dart_notification, FolderNotification},
entities::trash::{RepeatedTrash, RepeatedTrashId, Trash, TrashId, TrashType},
errors::{FlowyError, FlowyResult},
module::{FolderCouldServiceV1, WorkspaceUser},
@ -277,7 +277,7 @@ impl TrashController {
#[tracing::instrument(skip(repeated_trash), fields(n_trash))]
fn notify_trash_changed(repeated_trash: RepeatedTrash) {
tracing::Span::current().record("n_trash", &repeated_trash.len());
send_anonymous_dart_notification(WorkspaceNotification::TrashUpdated)
send_anonymous_dart_notification(FolderNotification::TrashUpdated)
.payload(repeated_trash)
.send();
}

0
frontend/rust-lib/flowy-core/src/services/trash/event_handler.rs → frontend/rust-lib/flowy-folder/src/services/trash/event_handler.rs
View File

0
frontend/rust-lib/flowy-core/src/services/trash/mod.rs → frontend/rust-lib/flowy-folder/src/services/trash/mod.rs
View File

16
frontend/rust-lib/flowy-core/src/services/view/controller.rs → frontend/rust-lib/flowy-folder/src/services/view/controller.rs
View File

@ -9,7 +9,7 @@ use futures::{FutureExt, StreamExt};
use std::{collections::HashSet, sync::Arc};
use crate::{
dart_notification::{send_dart_notification, WorkspaceNotification},
dart_notification::{send_dart_notification, FolderNotification},
entities::{
trash::{RepeatedTrashId, TrashType},
view::{CreateViewParams, RepeatedView, UpdateViewParams, View, ViewId},
@ -21,9 +21,9 @@ use crate::{
TrashController, TrashEvent,
},
};
use flowy_core_data_model::entities::share::{ExportData, ExportParams};
use flowy_database::kv::KV;
use flowy_document::FlowyDocumentManager;
use flowy_folder_data_model::entities::share::{ExportData, ExportParams};
use lib_infra::uuid_string;
const LATEST_VIEW_ID: &str = "latest_view_id";
@ -219,7 +219,7 @@ impl ViewController {
.begin_transaction(|transaction| {
let _ = transaction.update_view(changeset)?;
let view = transaction.read_view(&view_id)?;
send_dart_notification(&view_id, WorkspaceNotification::ViewUpdated)
send_dart_notification(&view_id, FolderNotification::ViewUpdated)
.payload(view.clone())
.send();
let _ = notify_views_changed(&view.belong_to_id, self.trash_controller.clone(), &transaction)?;
@ -292,7 +292,7 @@ impl ViewController {
.await
{
Ok(_) => {
send_dart_notification(&view.id, WorkspaceNotification::ViewUpdated)
send_dart_notification(&view.id, FolderNotification::ViewUpdated)
.payload(view.clone())
.send();
}
@ -348,7 +348,7 @@ async fn handle_trash_event(
let views = read_local_views_with_transaction(identifiers, &transaction)?;
for view in views {
let _ = notify_views_changed(&view.belong_to_id, trash_can.clone(), &transaction)?;
notify_dart(view, WorkspaceNotification::ViewDeleted);
notify_dart(view, FolderNotification::ViewDeleted);
}
Ok(())
})
@ -361,7 +361,7 @@ async fn handle_trash_event(
let views = read_local_views_with_transaction(identifiers, &transaction)?;
for view in views {
let _ = notify_views_changed(&view.belong_to_id, trash_can.clone(), &transaction)?;
notify_dart(view, WorkspaceNotification::ViewRestored);
notify_dart(view, FolderNotification::ViewRestored);
}
Ok(())
})
@ -403,7 +403,7 @@ fn read_local_views_with_transaction<'a>(
Ok(views)
}
fn notify_dart(view: View, notification: WorkspaceNotification) {
fn notify_dart(view: View, notification: FolderNotification) {
send_dart_notification(&view.id, notification).payload(view).send();
}
@ -415,7 +415,7 @@ fn notify_views_changed<'a>(
) -> FlowyResult<()> {
let repeated_view = read_belonging_views_on_local(belong_to_id, trash_controller.clone(), transaction)?;
tracing::Span::current().record("view_count", &format!("{}", repeated_view.len()).as_str());
send_dart_notification(belong_to_id, WorkspaceNotification::AppViewsChanged)
send_dart_notification(belong_to_id, FolderNotification::AppViewsChanged)
.payload(repeated_view)
.send();
Ok(())

2
frontend/rust-lib/flowy-core/src/services/view/event_handler.rs → frontend/rust-lib/flowy-folder/src/services/view/event_handler.rs
View File

@ -10,7 +10,7 @@ use crate::{
services::{TrashController, ViewController},
};
use flowy_collaboration::entities::document_info::DocumentDelta;
use flowy_core_data_model::entities::share::{ExportData, ExportParams, ExportRequest};
use flowy_folder_data_model::entities::share::{ExportData, ExportParams, ExportRequest};
use lib_dispatch::prelude::{data_result, Data, DataResult, Unit};
use std::{convert::TryInto, sync::Arc};

0
frontend/rust-lib/flowy-core/src/services/view/mod.rs → frontend/rust-lib/flowy-folder/src/services/view/mod.rs
View File

0
frontend/rust-lib/flowy-core/src/services/web_socket.rs → frontend/rust-lib/flowy-folder/src/services/web_socket.rs
View File

8
frontend/rust-lib/flowy-core/src/services/workspace/controller.rs → frontend/rust-lib/flowy-folder/src/services/workspace/controller.rs
View File

@ -7,8 +7,8 @@ use crate::{
read_local_workspace_apps, TrashController,
},
};
use flowy_core_data_model::entities::{app::RepeatedApp, workspace::*};
use flowy_database::kv::KV;
use flowy_folder_data_model::entities::{app::RepeatedApp, workspace::*};
use std::sync::Arc;
pub struct WorkspaceController {
@ -48,7 +48,7 @@ impl WorkspaceController {
})
.await?;
let repeated_workspace = RepeatedWorkspace { items: workspaces };
send_dart_notification(&token, WorkspaceNotification::UserCreateWorkspace)
send_dart_notification(&token, FolderNotification::UserCreateWorkspace)
.payload(repeated_workspace)
.send();
set_current_workspace(&workspace.id);
@ -68,7 +68,7 @@ impl WorkspaceController {
})
.await?;
send_dart_notification(&workspace_id, WorkspaceNotification::WorkspaceUpdated)
send_dart_notification(&workspace_id, FolderNotification::WorkspaceUpdated)
.payload(workspace)
.send();
let _ = self.update_workspace_on_server(params)?;
@ -87,7 +87,7 @@ impl WorkspaceController {
self.read_local_workspaces(None, &user_id, &transaction)
})
.await?;
send_dart_notification(&token, WorkspaceNotification::UserDeleteWorkspace)
send_dart_notification(&token, FolderNotification::UserDeleteWorkspace)
.payload(repeated_workspace)
.send();
let _ = self.delete_workspace_on_server(workspace_id)?;

6
frontend/rust-lib/flowy-core/src/services/workspace/event_handler.rs → frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs
View File

@ -1,10 +1,10 @@
use crate::{
controller::FolderManager,
dart_notification::{send_dart_notification, WorkspaceNotification},
dart_notification::{send_dart_notification, FolderNotification},
errors::FlowyError,
services::{get_current_workspace, read_local_workspace_apps, WorkspaceController},
};
use flowy_core_data_model::entities::{
use flowy_folder_data_model::entities::{
app::RepeatedApp,
view::View,
workspace::{CurrentWorkspaceSetting, QueryWorkspaceRequest, RepeatedWorkspace, WorkspaceId, *},
@ -133,7 +133,7 @@ fn read_workspaces_on_server(
})
.await?;
send_dart_notification(&token, WorkspaceNotification::WorkspaceListUpdated)
send_dart_notification(&token, FolderNotification::WorkspaceListUpdated)
.payload(workspaces)
.send();
Result::<(), FlowyError>::Ok(())

0
frontend/rust-lib/flowy-core/src/services/workspace/mod.rs → frontend/rust-lib/flowy-folder/src/services/workspace/mod.rs
View File

0
frontend/rust-lib/flowy-core/src/util.rs → frontend/rust-lib/flowy-folder/src/util.rs
View File

4
frontend/rust-lib/flowy-core/tests/workspace/folder_test.rs → frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs
View File

@ -1,6 +1,6 @@
use crate::script::{invalid_workspace_name_test_case, FolderScript::*, FolderTest};
use flowy_collaboration::{client_document::default::initial_delta_string, entities::revision::RevisionState};
use flowy_core::entities::workspace::CreateWorkspaceRequest;
use flowy_folder::entities::workspace::CreateWorkspaceRequest;
use flowy_test::{event_builder::*, FlowySDKTest};
#[tokio::test]
@ -84,7 +84,7 @@ async fn workspace_create_with_invalid_name() {
};
assert_eq!(
FolderEventBuilder::new(sdk)
.event(flowy_core::event::WorkspaceEvent::CreateWorkspace)
.event(flowy_folder::event::FolderEvent::CreateWorkspace)
.request(request)
.async_send()
.await

4
frontend/rust-lib/flowy-core/tests/workspace/helper.rs → frontend/rust-lib/flowy-folder/tests/workspace/helper.rs
View File

@ -1,6 +1,6 @@
use flowy_collaboration::entities::document_info::DocumentInfo;
use flowy_core::event::WorkspaceEvent::*;
use flowy_core_data_model::entities::{
use flowy_folder::event::FolderEvent::*;
use flowy_folder_data_model::entities::{
app::{App, AppId, CreateAppRequest, QueryAppRequest, UpdateAppRequest},
trash::{RepeatedTrash, TrashId, TrashType},
view::{CreateViewRequest, QueryViewRequest, UpdateViewRequest, View, ViewType},

0
frontend/rust-lib/flowy-core/tests/workspace/main.rs → frontend/rust-lib/flowy-folder/tests/workspace/main.rs
View File

4
frontend/rust-lib/flowy-core/tests/workspace/script.rs → frontend/rust-lib/flowy-folder/tests/workspace/script.rs
View File

@ -1,7 +1,7 @@
use crate::helper::*;
use flowy_collaboration::entities::{document_info::DocumentInfo, revision::RevisionState};
use flowy_core::{errors::ErrorCode, services::folder_editor::FolderEditor};
use flowy_core_data_model::entities::{
use flowy_folder::{errors::ErrorCode, services::folder_editor::FolderEditor};
use flowy_folder_data_model::entities::{
app::{App, RepeatedApp},
trash::Trash,
view::{RepeatedView, View, ViewType},

4
frontend/rust-lib/flowy-net/Cargo.toml
View File

@ -11,9 +11,9 @@ flowy-error = { path = "../flowy-error", features = ["collaboration"] }
flowy-derive = { path = "../../../shared-lib/flowy-derive" }
flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration"}
backend-service = { path = "../../../shared-lib/backend-service" }
flowy-core-data-model = { path = "../../../shared-lib/flowy-core-data-model" }
flowy-folder-data-model = { path = "../../../shared-lib/flowy-folder-data-model" }
flowy-user-data-model = { path = "../../../shared-lib/flowy-user-data-model"}
flowy-core = { path = "../flowy-core" }
flowy-folder = { path = "../flowy-folder" }
flowy-user = { path = "../flowy-user" }
flowy-document = { path = "../flowy-document" }
lazy_static = "1.4.0"

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

@ -4,15 +4,15 @@ use backend_service::{
request::{HttpRequestBuilder, ResponseMiddleware},
response::FlowyResponse,
};
use flowy_core_data_model::entities::{
use flowy_error::FlowyError;
use flowy_folder_data_model::entities::{
app::{App, AppId, CreateAppParams, UpdateAppParams},
trash::{RepeatedTrash, RepeatedTrashId},
view::{CreateViewParams, RepeatedViewId, UpdateViewParams, View, ViewId},
workspace::{CreateWorkspaceParams, RepeatedWorkspace, UpdateWorkspaceParams, Workspace, WorkspaceId},
};
use flowy_error::FlowyError;
use flowy_core::module::{FolderCouldServiceV1, FolderCouldServiceV2};
use flowy_folder::module::{FolderCouldServiceV1, FolderCouldServiceV2};
use lazy_static::lazy_static;
use lib_infra::future::FutureResult;
use std::sync::Arc;

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

@ -13,8 +13,8 @@ use flowy_collaboration::{
server_folder::ServerFolderManager,
synchronizer::{RevisionSyncResponse, RevisionUser},
};
use flowy_core::module::{FolderCouldServiceV1, FolderCouldServiceV2};
use flowy_error::{internal_error, FlowyError};
use flowy_folder::module::{FolderCouldServiceV1, FolderCouldServiceV2};
use futures_util::stream::StreamExt;
use lib_ws::{WSChannel, WebSocketRawMessage};
use parking_lot::RwLock;
@ -248,13 +248,13 @@ impl RevisionUser for LocalRevisionUser {
}
}
use flowy_core_data_model::entities::{
use flowy_document::DocumentCloudService;
use flowy_folder_data_model::entities::{
app::{App, AppId, CreateAppParams, RepeatedApp, UpdateAppParams},
trash::{RepeatedTrash, RepeatedTrashId},
view::{CreateViewParams, RepeatedView, RepeatedViewId, UpdateViewParams, View, ViewId},
workspace::{CreateWorkspaceParams, RepeatedWorkspace, UpdateWorkspaceParams, Workspace, WorkspaceId},
};
use flowy_document::DocumentCloudService;
use flowy_user::module::UserCloudService;
use flowy_user_data_model::entities::{
SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserParams, UserProfile,

4
frontend/rust-lib/flowy-sdk/Cargo.toml
View File

@ -10,7 +10,7 @@ lib-dispatch = { path = "../lib-dispatch" }
lib-log = { path = "../lib-log" }
flowy-user = { path = "../flowy-user" }
flowy-net = { path = "../flowy-net" }
flowy-core = { path = "../flowy-core", default-features = false }
flowy-folder = { path = "../flowy-folder", default-features = false }
flowy-database = { path = "../flowy-database" }
flowy-document = { path = "../flowy-document" }
flowy-sync = { path = "../flowy-sync" }
@ -38,5 +38,5 @@ tokio = { version = "1", features = ["full"]}
futures-util = "0.3.15"
[features]
http_server = ["flowy-user/http_server", "flowy-core/http_server", "flowy-document/http_server"]
http_server = ["flowy-user/http_server", "flowy-folder/http_server", "flowy-document/http_server"]
use_bunyan = ["lib-log/use_bunyan"]

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

@ -1,13 +1,13 @@
use backend_service::configuration::ClientServerConfiguration;
use bytes::Bytes;
use flowy_collaboration::entities::ws_data::ClientRevisionWSData;
use flowy_core::{
use flowy_database::ConnectionPool;
use flowy_document::FlowyDocumentManager;
use flowy_folder::{
controller::FolderManager,
errors::{internal_error, FlowyError},
module::{FolderCouldServiceV1, WorkspaceDatabase, WorkspaceUser},
};
use flowy_database::ConnectionPool;
use flowy_document::FlowyDocumentManager;
use flowy_net::{
http_server::core::CoreHttpCloudService, local_server::LocalServer, ws::connection::FlowyWebSocketConnect,
};

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

@ -2,7 +2,7 @@ mod deps_resolve;
pub mod module;
use crate::deps_resolve::*;
use backend_service::configuration::ClientServerConfiguration;
use flowy_core::{controller::FolderManager, errors::FlowyError};
use flowy_folder::{controller::FolderManager, errors::FlowyError};
use flowy_net::{
entities::NetworkType,
local_server::LocalServer,
@ -64,7 +64,7 @@ fn crate_log_filter(level: String) -> String {
let level = std::env::var("RUST_LOG").unwrap_or(level);
let mut filters = vec![];
filters.push(format!("flowy_sdk={}", level));
filters.push(format!("flowy_core={}", level));
filters.push(format!("flowy_folder={}", level));
filters.push(format!("flowy_user={}", level));
filters.push(format!("flowy_document={}", level));
filters.push(format!("flowy_collaboration={}", level));

4
frontend/rust-lib/flowy-sdk/src/module.rs
View File

@ -1,4 +1,4 @@
use flowy_core::controller::FolderManager;
use flowy_folder::controller::FolderManager;
use flowy_net::ws::connection::FlowyWebSocketConnect;
use flowy_user::services::UserSession;
use lib_dispatch::prelude::Module;
@ -20,7 +20,7 @@ fn mk_user_module(user_session: Arc<UserSession>) -> Module {
}
fn mk_folder_module(core: Arc<FolderManager>) -> Module {
flowy_core::module::create(core)
flowy_folder::module::create(core)
}
fn mk_network_module(ws_conn: Arc<FlowyWebSocketConnect>) -> Module {

2
frontend/rust-lib/flowy-test/Cargo.toml
View File

@ -9,7 +9,7 @@ edition = "2018"
flowy-sdk = { path = "../flowy-sdk"}
flowy-user = { path = "../flowy-user"}
flowy-net = { path = "../flowy-net"}
flowy-core = { path = "../flowy-core", default-features = false}
flowy-folder = { path = "../flowy-folder", default-features = false}
lib-dispatch = { path = "../lib-dispatch" }
flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration" }

4
frontend/rust-lib/flowy-test/src/helper.rs
View File

@ -1,12 +1,12 @@
use crate::prelude::*;
use flowy_core::{
use flowy_folder::{
entities::{
app::*,
view::*,
workspace::{CreateWorkspaceRequest, QueryWorkspaceRequest, Workspace},
},
event::WorkspaceEvent::{CreateWorkspace, OpenWorkspace, *},
event::FolderEvent::{CreateWorkspace, OpenWorkspace, *},
};
use flowy_user::{
entities::{SignInRequest, SignUpRequest, UserProfile},

6
frontend/rust-lib/lib-log/src/layer.rs
View File

@ -29,7 +29,7 @@ impl<W: MakeWriter + 'static> FlowyFormattingLayer<W> {
}
}
fn serialize_flowy_core_fields(
fn serialize_flowy_folder_fields(
&self,
map_serializer: &mut impl SerializeMap<Error = serde_json::Error>,
message: &str,
@ -50,7 +50,7 @@ impl<W: MakeWriter + 'static> FlowyFormattingLayer<W> {
let mut serializer = serde_json::Serializer::new(&mut buffer);
let mut map_serializer = serializer.serialize_map(None)?;
let message = format_span_context(span, ty);
self.serialize_flowy_core_fields(&mut map_serializer, &message, span.metadata().level())?;
self.serialize_flowy_folder_fields(&mut map_serializer, &message, span.metadata().level())?;
if self.with_target {
map_serializer.serialize_entry("target", &span.metadata().target())?;
}
@ -153,7 +153,7 @@ where
let mut map_serializer = serializer.serialize_map(None)?;
let message = format_event_message(&current_span, event, &event_visitor);
self.serialize_flowy_core_fields(&mut map_serializer, &message, event.metadata().level())?;
self.serialize_flowy_folder_fields(&mut map_serializer, &message, event.metadata().level())?;
// Additional metadata useful for debugging
// They should be nested under `src` (see https://github.com/trentm/node-bunyan#src )
// but `tracing` does not support nested values yet