Skip to content

Commit

Permalink
rename folder event
Browse files Browse the repository at this point in the history
  • Loading branch information
appflowy committed Jan 30, 2022
1 parent a48031d commit fcc6f51
Show file tree
Hide file tree
Showing 30 changed files with 172 additions and 183 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
import 'package:flowy_sdk/protobuf/flowy-net/event.pb.dart';
import 'package:flowy_sdk/protobuf/flowy-net/network_state.pb.dart';
import 'package:flowy_sdk/protobuf/flowy-user/event_map.pb.dart';
import 'package:flowy_sdk/protobuf/flowy-folder/event.pb.dart';
import 'package:flowy_sdk/protobuf/flowy-folder/event_map.pb.dart';
import 'package:isolates/isolates.dart';
import 'package:isolates/ports.dart';
import 'package:ffi/ffi.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
///
// Generated code. Do not modify.
// source: event.proto
// source: event_map.proto
//
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields

import 'dart:core' as $core;

export 'event.pbenum.dart';
export 'event_map.pbenum.dart';

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///
// Generated code. Do not modify.
// source: event.proto
// source: event_map.proto
//
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///
// Generated code. Do not modify.
// source: event.proto
// source: event_map.proto
//
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
///
// Generated code. Do not modify.
// source: event.proto
// source: event_map.proto
//
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package

export 'event.pb.dart';
export 'event_map.pb.dart';

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Auto-generated, do not edit
export './dart_notification.pb.dart';
export './event.pb.dart';
export './event_map.pb.dart';
6 changes: 3 additions & 3 deletions frontend/rust-lib/dart-ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ lazy_static! {
static ref FLOWY_SDK: RwLock<Option<Arc<FlowySDK>>> = RwLock::new(None);
}

fn dispatch() -> Arc<EventDispatcher> {
fn get_dispatcher() -> Arc<EventDispatcher> {
FLOWY_SDK.read().as_ref().unwrap().dispatcher()
}

Expand All @@ -44,7 +44,7 @@ pub extern "C" fn async_event(port: i64, input: *const u8, len: usize) {
port
);

let _ = EventDispatcher::async_send_with_callback(dispatch(), request, move |resp: EventResponse| {
let _ = EventDispatcher::async_send_with_callback(get_dispatcher(), request, move |resp: EventResponse| {
log::trace!("[FFI]: Post data to dart through {} port", port);
Box::pin(post_to_flutter(resp, port))
});
Expand All @@ -54,7 +54,7 @@ pub extern "C" fn async_event(port: i64, input: *const u8, len: usize) {
pub extern "C" fn sync_event(input: *const u8, len: usize) -> *const u8 {
let request: ModuleRequest = FFIRequest::from_u8_pointer(input, len).into();
log::trace!("[FFI]: {} Sync Event: {:?}", &request.id, &request.event,);
let _response = EventDispatcher::sync_send(dispatch(), request);
let _response = EventDispatcher::sync_send(get_dispatcher(), request);

// FFIResponse { }
let response_bytes = vec![];
Expand Down
4 changes: 2 additions & 2 deletions frontend/rust-lib/flowy-folder/Flowy.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

proto_crates = ["src/entities", "src/event.rs", "src/dart_notification.rs"]
event_files = ["src/event.rs"]
proto_crates = ["src/entities", "src/event_map.rs", "src/dart_notification.rs"]
event_files = ["src/event_map.rs"]
2 changes: 1 addition & 1 deletion frontend/rust-lib/flowy-folder/src/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::{
dart_notification::{send_dart_notification, FolderNotification},
entities::workspace::RepeatedWorkspace,
errors::FlowyResult,
module::{FolderCouldServiceV1, WorkspaceDatabase, WorkspaceUser},
event_map::{FolderCouldServiceV1, WorkspaceDatabase, WorkspaceUser},
services::{
folder_editor::FolderEditor, persistence::FolderPersistence, set_current_workspace, AppController,
TrashController, ViewController, WorkspaceController,
Expand Down
81 changes: 0 additions & 81 deletions frontend/rust-lib/flowy-folder/src/event.rs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ use crate::{
workspace::{CreateWorkspaceParams, RepeatedWorkspace, UpdateWorkspaceParams, Workspace, WorkspaceId},
},
errors::FlowyError,
event::FolderEvent,
services::{app::event_handler::*, trash::event_handler::*, view::event_handler::*, workspace::event_handler::*},
};
use flowy_database::DBConnection;
use flowy_derive::{Flowy_Event, ProtoBuf_Enum};
use strum_macros::Display;

use lib_dispatch::prelude::*;
use lib_infra::future::FutureResult;
Expand Down Expand Up @@ -78,6 +79,85 @@ pub fn create(folder: Arc<FolderManager>) -> Module {
module
}

#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)]
#[event_err = "FlowyError"]
pub enum FolderEvent {
#[event(input = "CreateWorkspaceRequest", output = "Workspace")]
CreateWorkspace = 0,

#[event(output = "CurrentWorkspaceSetting")]
ReadCurWorkspace = 1,

#[event(input = "QueryWorkspaceRequest", output = "RepeatedWorkspace")]
ReadWorkspaces = 2,

#[event(input = "QueryWorkspaceRequest")]
DeleteWorkspace = 3,

#[event(input = "QueryWorkspaceRequest", output = "Workspace")]
OpenWorkspace = 4,

#[event(input = "QueryWorkspaceRequest", output = "RepeatedApp")]
ReadWorkspaceApps = 5,

#[event(input = "CreateAppRequest", output = "App")]
CreateApp = 101,

#[event(input = "QueryAppRequest")]
DeleteApp = 102,

#[event(input = "QueryAppRequest", output = "App")]
ReadApp = 103,

#[event(input = "UpdateAppRequest")]
UpdateApp = 104,

#[event(input = "CreateViewRequest", output = "View")]
CreateView = 201,

#[event(input = "QueryViewRequest", output = "View")]
ReadView = 202,

#[event(input = "UpdateViewRequest", output = "View")]
UpdateView = 203,

#[event(input = "QueryViewRequest")]
DeleteView = 204,

#[event(input = "QueryViewRequest")]
DuplicateView = 205,

#[event()]
CopyLink = 206,

#[event(input = "QueryViewRequest", output = "DocumentDelta")]
OpenDocument = 207,

#[event(input = "QueryViewRequest")]
CloseView = 208,

#[event(output = "RepeatedTrash")]
ReadTrash = 300,

#[event(input = "TrashId")]
PutbackTrash = 301,

#[event(input = "RepeatedTrashId")]
DeleteTrash = 302,

#[event()]
RestoreAllTrash = 303,

#[event()]
DeleteAllTrash = 304,

#[event(input = "DocumentDelta", output = "DocumentDelta")]
ApplyDocDelta = 400,

#[event(input = "ExportRequest", output = "ExportData")]
ExportDocument = 500,
}

pub trait FolderCouldServiceV1: Send + Sync {
fn init(&self);

Expand Down Expand Up @@ -115,5 +195,3 @@ pub trait FolderCouldServiceV1: Send + Sync {

fn read_trash(&self, token: &str) -> FutureResult<RepeatedTrash, FlowyError>;
}

pub trait FolderCouldServiceV2: Send + Sync {}
6 changes: 2 additions & 4 deletions frontend/rust-lib/flowy-folder/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
pub use flowy_folder_data_model::entities;

pub mod event;
pub mod module;
pub mod event_map;
pub mod services;

#[macro_use]
Expand All @@ -18,7 +16,7 @@ mod util;
pub mod prelude {
pub use flowy_folder_data_model::entities::{app::*, trash::*, view::*, workspace::*};

pub use crate::{errors::*, module::*};
pub use crate::{errors::*, event_map::*};
}

pub mod errors {
Expand Down
Loading

0 comments on commit fcc6f51

Please sign in to comment.