From 85add1ca0da5093430ebb231c99dec42ca151aa3 Mon Sep 17 00:00:00 2001 From: frelodev Date: Mon, 1 Jan 2024 23:29:35 +0100 Subject: [PATCH] moved some messages from workspace_service to files --- build.rs | 1 + proto/files.proto | 17 +++++++++++++++++ proto/workspace.proto | 0 proto/workspace_service.proto | 14 +++----------- src/lib.rs | 1 + 5 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 proto/workspace.proto diff --git a/build.rs b/build.rs index ae01fed..3865432 100644 --- a/build.rs +++ b/build.rs @@ -7,6 +7,7 @@ fn main() -> Result<(), Box> { &[ "proto/user.proto", "proto/cursor.proto", + "proto/files.proto", "proto/buffer_service.proto", "proto/cursor_service.proto", "proto/workspace_service.proto" diff --git a/proto/files.proto b/proto/files.proto index e69de29..152a00b 100644 --- a/proto/files.proto +++ b/proto/files.proto @@ -0,0 +1,17 @@ +syntax = "proto2"; + +package files; + + +message BufferNode{ + required string path = 1; +} + +message BufferTree{ + repeated BufferNode buffers = 1; +} + +message WorkspaceFileTree { + // list of strings may be more efficient but it's a lot more hassle + required string payload = 1; // spappolata di json +} //Alla fine non si usa questo per ora ma BufferTree \ No newline at end of file diff --git a/proto/workspace.proto b/proto/workspace.proto new file mode 100644 index 0000000..e69de29 diff --git a/proto/workspace_service.proto b/proto/workspace_service.proto index 6ed7c93..470fcd9 100644 --- a/proto/workspace_service.proto +++ b/proto/workspace_service.proto @@ -26,15 +26,13 @@ syntax = "proto2"; package workspace_service; import "user.proto"; +import "files.proto"; message Empty {} -message WorkspaceFileTree { - // list of strings may be more efficient but it's a lot more hassle - required string payload = 1; // spappolata di json -} + message WorkspaceUserList { repeated user.UserIdentity user = 1; @@ -57,7 +55,7 @@ service Workspace { rpc Attach (AttachRequest) returns (Token); - rpc ListBuffers (BufferListRequest) returns (BufferTree); + rpc ListBuffers (BufferListRequest) returns (files.BufferTree); rpc ListUsers (UserListRequest) returns (UserList); @@ -125,13 +123,7 @@ message BufferListRequest{ } -message BufferNode{ - required string path = 1; -} -message BufferTree{ - repeated BufferNode buffers = 1; -} message UserList{ repeated user.UserIdentity users = 1; diff --git a/src/lib.rs b/src/lib.rs index 5f27327..15042a7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -167,6 +167,7 @@ pub use woot; pub mod proto { pub mod user { tonic::include_proto!("user"); } pub mod cursor { tonic::include_proto!("cursor"); } + pub mod files { tonic::include_proto!("files"); } pub mod buffer_service { tonic::include_proto!("buffer_service"); } pub mod cursor_service { tonic::include_proto!("cursor_service"); } pub mod workspace_service { tonic::include_proto!("workspace_service"); }