From 54208d027aa7017f503c58af65e54aaca38d973e Mon Sep 17 00:00:00 2001 From: appflowy Date: Tue, 5 Oct 2021 11:52:50 +0800 Subject: [PATCH] rename flowy-observable to flowy-dart-notify --- app_flowy/lib/workspace/infrastructure/i_user_impl.dart | 2 +- app_flowy/lib/workspace/infrastructure/repos/app_repo.dart | 2 +- app_flowy/lib/workspace/infrastructure/repos/helper.dart | 2 +- app_flowy/lib/workspace/infrastructure/repos/view_repo.dart | 2 +- .../lib/workspace/infrastructure/repos/workspace_repo.dart | 2 +- .../{flowy-observable => flowy-dart-notify}/protobuf.dart | 0 .../{flowy-observable => flowy-dart-notify}/subject.pb.dart | 0 .../subject.pbenum.dart | 0 .../subject.pbjson.dart | 0 .../subject.pbserver.dart | 0 app_flowy/packages/flowy_sdk/lib/rust_stream.dart | 2 +- rust-lib/Cargo.toml | 2 +- rust-lib/dart-ffi/Cargo.toml | 4 ++-- rust-lib/dart-ffi/src/lib.rs | 2 +- rust-lib/{flowy-observable => flowy-dart-notify}/Cargo.toml | 2 +- rust-lib/{flowy-observable => flowy-dart-notify}/Flowy.toml | 0 .../{flowy-observable => flowy-dart-notify}/src/dart/mod.rs | 0 .../src/dart/stream_sender.rs | 0 .../src/entities/mod.rs | 0 .../src/entities/subject.rs | 0 rust-lib/{flowy-observable => flowy-dart-notify}/src/lib.rs | 0 .../src/protobuf/mod.rs | 0 .../src/protobuf/model/mod.rs | 0 .../src/protobuf/model/subject.rs | 0 .../src/protobuf/proto/subject.proto | 0 rust-lib/flowy-derive/src/derive_cache/derive_cache.rs | 4 ++-- rust-lib/flowy-document/Cargo.toml | 2 +- rust-lib/flowy-document/src/notify/observable.rs | 2 +- rust-lib/flowy-sdk/src/lib.rs | 2 +- rust-lib/flowy-user/Cargo.toml | 2 +- rust-lib/flowy-user/src/notify/observable.rs | 2 +- rust-lib/flowy-workspace/Cargo.toml | 2 +- rust-lib/flowy-workspace/src/notify/observable.rs | 2 +- 33 files changed, 20 insertions(+), 20 deletions(-) rename app_flowy/packages/flowy_sdk/lib/protobuf/{flowy-observable => flowy-dart-notify}/protobuf.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{flowy-observable => flowy-dart-notify}/subject.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{flowy-observable => flowy-dart-notify}/subject.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{flowy-observable => flowy-dart-notify}/subject.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{flowy-observable => flowy-dart-notify}/subject.pbserver.dart (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/Cargo.toml (94%) rename rust-lib/{flowy-observable => flowy-dart-notify}/Flowy.toml (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/dart/mod.rs (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/dart/stream_sender.rs (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/entities/mod.rs (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/entities/subject.rs (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/lib.rs (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/protobuf/mod.rs (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/protobuf/model/mod.rs (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/protobuf/model/subject.rs (100%) rename rust-lib/{flowy-observable => flowy-dart-notify}/src/protobuf/proto/subject.proto (100%) diff --git a/app_flowy/lib/workspace/infrastructure/i_user_impl.dart b/app_flowy/lib/workspace/infrastructure/i_user_impl.dart index 4a84b4b405..fcbc7adf24 100644 --- a/app_flowy/lib/workspace/infrastructure/i_user_impl.dart +++ b/app_flowy/lib/workspace/infrastructure/i_user_impl.dart @@ -4,7 +4,7 @@ import 'package:app_flowy/workspace/infrastructure/repos/helper.dart'; import 'package:dartz/dartz.dart'; import 'package:app_flowy/workspace/domain/i_user.dart'; import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart'; -import 'package:flowy_sdk/protobuf/flowy-observable/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-dart-notify/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart' as user_error; import 'package:flowy_sdk/protobuf/flowy-user/observable.pb.dart' as user; import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart'; diff --git a/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart b/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart index ce542f887d..c52d8855d1 100644 --- a/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart +++ b/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart @@ -4,7 +4,7 @@ import 'package:app_flowy/workspace/domain/i_app.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_log/flowy_log.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-observable/subject.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/app_query.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart'; diff --git a/app_flowy/lib/workspace/infrastructure/repos/helper.dart b/app_flowy/lib/workspace/infrastructure/repos/helper.dart index 42598f5bd6..b0dc3484ed 100644 --- a/app_flowy/lib/workspace/infrastructure/repos/helper.dart +++ b/app_flowy/lib/workspace/infrastructure/repos/helper.dart @@ -1,5 +1,5 @@ import 'dart:typed_data'; -import 'package:flowy_sdk/protobuf/flowy-observable/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-dart-notify/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart'; diff --git a/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart b/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart index bb20143409..88ebaa8da9 100644 --- a/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart +++ b/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:typed_data'; import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-observable/subject.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart'; diff --git a/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart b/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart index 17df219674..16b826171f 100644 --- a/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart +++ b/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart @@ -4,7 +4,7 @@ import 'dart:typed_data'; import 'package:dartz/dartz.dart'; import 'package:flowy_log/flowy_log.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-observable/subject.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart'; diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/protobuf.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/protobuf.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/protobuf.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/protobuf.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/subject.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/subject.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/subject.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/subject.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/subject.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/subject.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/subject.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/subject.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/subject.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/subject.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/subject.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/subject.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/subject.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/subject.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/flowy-observable/subject.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-dart-notify/subject.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/rust_stream.dart b/app_flowy/packages/flowy_sdk/lib/rust_stream.dart index 19277a1302..459b1b106a 100644 --- a/app_flowy/packages/flowy_sdk/lib/rust_stream.dart +++ b/app_flowy/packages/flowy_sdk/lib/rust_stream.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'dart:typed_data'; import 'dart:ffi'; import 'package:flowy_log/flowy_log.dart'; -import 'protobuf/flowy-observable/subject.pb.dart'; +import 'protobuf/flowy-dart-notify/subject.pb.dart'; typedef ObserverCallback = void Function(ObservableSubject observable); diff --git a/rust-lib/Cargo.toml b/rust-lib/Cargo.toml index 1318e86dd9..1f01f9e380 100644 --- a/rust-lib/Cargo.toml +++ b/rust-lib/Cargo.toml @@ -12,7 +12,7 @@ members = [ "flowy-database", "flowy-infra", "flowy-workspace", - "flowy-observable", + "flowy-dart-notify", "flowy-document", "flowy-ot", "flowy-net", diff --git a/rust-lib/dart-ffi/Cargo.toml b/rust-lib/dart-ffi/Cargo.toml index 0d02ce1b9f..1721d2672a 100644 --- a/rust-lib/dart-ffi/Cargo.toml +++ b/rust-lib/dart-ffi/Cargo.toml @@ -30,12 +30,12 @@ parking_lot = "0.11" flowy-dispatch = {path = "../flowy-dispatch"} flowy-sdk = {path = "../flowy-sdk"} flowy-derive = {path = "../flowy-derive"} -flowy-observable = {path = "../flowy-observable"} +flowy-dart-notify = {path = "../flowy-dart-notify" } flowy-net = {path = "../flowy-net"} [features] -observable = ["flowy-observable/dart"] +observable = ["flowy-dart-notify/dart"] http_server = ["flowy-sdk/http_server", "flowy-sdk/use_bunyan"] #use_serde = ["bincode"] #use_protobuf= ["protobuf"] \ No newline at end of file diff --git a/rust-lib/dart-ffi/src/lib.rs b/rust-lib/dart-ffi/src/lib.rs index 5880935fc9..d32a01f2c7 100644 --- a/rust-lib/dart-ffi/src/lib.rs +++ b/rust-lib/dart-ffi/src/lib.rs @@ -61,7 +61,7 @@ pub extern "C" fn sync_command(input: *const u8, len: usize) -> *const u8 { #[no_mangle] pub extern "C" fn set_stream_port(port: i64) -> i32 { - flowy_observable::dart::DartStreamSender::set_port(port); + flowy_dart_notify::dart::DartStreamSender::set_port(port); return 0; } diff --git a/rust-lib/flowy-observable/Cargo.toml b/rust-lib/flowy-dart-notify/Cargo.toml similarity index 94% rename from rust-lib/flowy-observable/Cargo.toml rename to rust-lib/flowy-dart-notify/Cargo.toml index f126b12ae5..fe3c4c7aed 100644 --- a/rust-lib/flowy-observable/Cargo.toml +++ b/rust-lib/flowy-dart-notify/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "flowy-observable" +name = "flowy-dart-notify" version = "0.1.0" edition = "2018" diff --git a/rust-lib/flowy-observable/Flowy.toml b/rust-lib/flowy-dart-notify/Flowy.toml similarity index 100% rename from rust-lib/flowy-observable/Flowy.toml rename to rust-lib/flowy-dart-notify/Flowy.toml diff --git a/rust-lib/flowy-observable/src/dart/mod.rs b/rust-lib/flowy-dart-notify/src/dart/mod.rs similarity index 100% rename from rust-lib/flowy-observable/src/dart/mod.rs rename to rust-lib/flowy-dart-notify/src/dart/mod.rs diff --git a/rust-lib/flowy-observable/src/dart/stream_sender.rs b/rust-lib/flowy-dart-notify/src/dart/stream_sender.rs similarity index 100% rename from rust-lib/flowy-observable/src/dart/stream_sender.rs rename to rust-lib/flowy-dart-notify/src/dart/stream_sender.rs diff --git a/rust-lib/flowy-observable/src/entities/mod.rs b/rust-lib/flowy-dart-notify/src/entities/mod.rs similarity index 100% rename from rust-lib/flowy-observable/src/entities/mod.rs rename to rust-lib/flowy-dart-notify/src/entities/mod.rs diff --git a/rust-lib/flowy-observable/src/entities/subject.rs b/rust-lib/flowy-dart-notify/src/entities/subject.rs similarity index 100% rename from rust-lib/flowy-observable/src/entities/subject.rs rename to rust-lib/flowy-dart-notify/src/entities/subject.rs diff --git a/rust-lib/flowy-observable/src/lib.rs b/rust-lib/flowy-dart-notify/src/lib.rs similarity index 100% rename from rust-lib/flowy-observable/src/lib.rs rename to rust-lib/flowy-dart-notify/src/lib.rs diff --git a/rust-lib/flowy-observable/src/protobuf/mod.rs b/rust-lib/flowy-dart-notify/src/protobuf/mod.rs similarity index 100% rename from rust-lib/flowy-observable/src/protobuf/mod.rs rename to rust-lib/flowy-dart-notify/src/protobuf/mod.rs diff --git a/rust-lib/flowy-observable/src/protobuf/model/mod.rs b/rust-lib/flowy-dart-notify/src/protobuf/model/mod.rs similarity index 100% rename from rust-lib/flowy-observable/src/protobuf/model/mod.rs rename to rust-lib/flowy-dart-notify/src/protobuf/model/mod.rs diff --git a/rust-lib/flowy-observable/src/protobuf/model/subject.rs b/rust-lib/flowy-dart-notify/src/protobuf/model/subject.rs similarity index 100% rename from rust-lib/flowy-observable/src/protobuf/model/subject.rs rename to rust-lib/flowy-dart-notify/src/protobuf/model/subject.rs diff --git a/rust-lib/flowy-observable/src/protobuf/proto/subject.proto b/rust-lib/flowy-dart-notify/src/protobuf/proto/subject.proto similarity index 100% rename from rust-lib/flowy-observable/src/protobuf/proto/subject.proto rename to rust-lib/flowy-dart-notify/src/protobuf/proto/subject.proto diff --git a/rust-lib/flowy-derive/src/derive_cache/derive_cache.rs b/rust-lib/flowy-derive/src/derive_cache/derive_cache.rs index f25215b1ca..2c64b328e9 100644 --- a/rust-lib/flowy-derive/src/derive_cache/derive_cache.rs +++ b/rust-lib/flowy-derive/src/derive_cache/derive_cache.rs @@ -15,8 +15,7 @@ pub fn category_from_str(type_str: &str) -> TypeCategory { "HashMap" => TypeCategory::Map, "u8" => TypeCategory::Bytes, "String" => TypeCategory::Str, - "ObservableSubject" - | "KeyValue" + "KeyValue" | "QueryAppRequest" | "QueryAppParams" | "CreateAppRequest" @@ -66,6 +65,7 @@ pub fn category_from_str(type_str: &str) -> TypeCategory { | "DocError" | "FFIRequest" | "FFIResponse" + | "ObservableSubject" | "SignInRequest" | "SignInParams" | "SignInResponse" diff --git a/rust-lib/flowy-document/Cargo.toml b/rust-lib/flowy-document/Cargo.toml index bb237fc4de..27103efb37 100644 --- a/rust-lib/flowy-document/Cargo.toml +++ b/rust-lib/flowy-document/Cargo.toml @@ -12,7 +12,7 @@ flowy-dispatch = { path = "../flowy-dispatch" } flowy-derive = { path = "../flowy-derive" } flowy-database = { path = "../flowy-database" } flowy-infra = { path = "../flowy-infra" } -flowy-observable = { path = "../flowy-observable" } +flowy-dart-notify = { path = "../flowy-dart-notify" } flowy-ot = { path = "../flowy-ot" } flowy-ws = { path = "../flowy-ws" } flowy-net = { path = "../flowy-net", features = ["flowy_request"] } diff --git a/rust-lib/flowy-document/src/notify/observable.rs b/rust-lib/flowy-document/src/notify/observable.rs index f0fb6f92dc..e867ec5d3b 100644 --- a/rust-lib/flowy-document/src/notify/observable.rs +++ b/rust-lib/flowy-document/src/notify/observable.rs @@ -1,5 +1,5 @@ +use flowy_dart_notify::DartNotifyBuilder; use flowy_derive::ProtoBuf_Enum; -use flowy_observable::DartNotifyBuilder; const OBSERVABLE_CATEGORY: &'static str = "Doc"; #[derive(ProtoBuf_Enum, Debug)] pub(crate) enum DocObservable { diff --git a/rust-lib/flowy-sdk/src/lib.rs b/rust-lib/flowy-sdk/src/lib.rs index c6a02cee28..95a28545f4 100644 --- a/rust-lib/flowy-sdk/src/lib.rs +++ b/rust-lib/flowy-sdk/src/lib.rs @@ -44,7 +44,7 @@ fn crate_log_filter(level: Option) -> String { filters.push(format!("flowy_workspace={}", level)); filters.push(format!("flowy_user={}", level)); filters.push(format!("flowy_document={}", level)); - filters.push(format!("flowy_observable={}", level)); + filters.push(format!("flowy_dart_notify={}", level)); filters.push(format!("flowy_ot={}", level)); filters.push(format!("flowy_ws={}", level)); filters.push(format!("info")); diff --git a/rust-lib/flowy-user/Cargo.toml b/rust-lib/flowy-user/Cargo.toml index 1c4e0f54e9..839df3f32e 100644 --- a/rust-lib/flowy-user/Cargo.toml +++ b/rust-lib/flowy-user/Cargo.toml @@ -14,7 +14,7 @@ flowy-sqlite = { path = "../flowy-sqlite" } flowy-infra = { path = "../flowy-infra" } flowy-net = { path = "../flowy-net", features = ["flowy_request"] } flowy-ws = { path = "../flowy-ws"} -flowy-observable = { path = "../flowy-observable" } +flowy-dart-notify = { path = "../flowy-dart-notify" } tracing = { version = "0.1", features = ["log"] } bytes = "1.0" diff --git a/rust-lib/flowy-user/src/notify/observable.rs b/rust-lib/flowy-user/src/notify/observable.rs index 65c9a42f6e..ea98cefc16 100644 --- a/rust-lib/flowy-user/src/notify/observable.rs +++ b/rust-lib/flowy-user/src/notify/observable.rs @@ -1,6 +1,6 @@ use flowy_derive::ProtoBuf_Enum; -use flowy_observable::DartNotifyBuilder; +use flowy_dart_notify::DartNotifyBuilder; const OBSERVABLE_CATEGORY: &'static str = "User"; diff --git a/rust-lib/flowy-workspace/Cargo.toml b/rust-lib/flowy-workspace/Cargo.toml index f251409945..b79cfbab18 100644 --- a/rust-lib/flowy-workspace/Cargo.toml +++ b/rust-lib/flowy-workspace/Cargo.toml @@ -11,7 +11,7 @@ flowy-derive = { path = "../flowy-derive" } flowy-database = { path = "../flowy-database" } flowy-sqlite = { path = "../flowy-sqlite" } flowy-infra = { path = "../flowy-infra" } -flowy-observable = { path = "../flowy-observable" } +flowy-dart-notify = { path = "../flowy-dart-notify" } flowy-document = { path = "../flowy-document" } flowy-ot = { path = "../flowy-ot" } flowy-net = { path = "../flowy-net", features = ["flowy_request"] } diff --git a/rust-lib/flowy-workspace/src/notify/observable.rs b/rust-lib/flowy-workspace/src/notify/observable.rs index 8d77c416cd..bd21b471c9 100644 --- a/rust-lib/flowy-workspace/src/notify/observable.rs +++ b/rust-lib/flowy-workspace/src/notify/observable.rs @@ -1,5 +1,5 @@ +use flowy_dart_notify::DartNotifyBuilder; use flowy_derive::ProtoBuf_Enum; -use flowy_observable::DartNotifyBuilder; const OBSERVABLE_CATEGORY: &'static str = "Workspace"; #[derive(ProtoBuf_Enum, Debug)]