From 5bb3dc258a725eaf4f8f4ef9e4c83a0fb2e12498 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Mon, 14 Dec 2020 10:17:52 -0800 Subject: [PATCH] Add projectName to serve output --- .../end_to_end__tests__serve__add_folder_info.snap | 1 + .../end_to_end__tests__serve__edit_init_info.snap | 1 + .../end_to_end__tests__serve__empty_info.snap | 1 + .../end_to_end__tests__serve__move_folder_of_stuff_info.snap | 1 + .../end_to_end__tests__serve__remove_file_info.snap | 1 + .../end_to_end__tests__serve__scripts_info.snap | 1 + src/web/api.rs | 1 + src/web/interface.rs | 1 + 8 files changed, 8 insertions(+) diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap index 62f5dc4b..738c0fd0 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap @@ -3,6 +3,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ +projectName: add_folder protocolVersion: 3 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap index 62f5dc4b..b9c43c7a 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap @@ -3,6 +3,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ +projectName: edit_init protocolVersion: 3 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap index 62f5dc4b..7b4e3904 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap @@ -3,6 +3,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ +projectName: empty protocolVersion: 3 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap index 62f5dc4b..e3a59e17 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap @@ -3,6 +3,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ +projectName: move_folder_of_stuff protocolVersion: 3 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap index 62f5dc4b..bbc8301f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap @@ -3,6 +3,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ +projectName: remove_file protocolVersion: 3 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap index 62f5dc4b..0b801363 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap @@ -3,6 +3,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ +projectName: scripts protocolVersion: 3 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/src/web/api.rs b/src/web/api.rs index 580bd055..d041b9c1 100644 --- a/src/web/api.rs +++ b/src/web/api.rs @@ -67,6 +67,7 @@ impl ApiService { server_version: SERVER_VERSION.to_owned(), protocol_version: PROTOCOL_VERSION, session_id: self.serve_session.session_id(), + project_name: self.serve_session.project_name().to_owned(), expected_place_ids: self.serve_session.serve_place_ids().cloned(), root_instance_id, }) diff --git a/src/web/interface.rs b/src/web/interface.rs index f66a3909..be37f1e0 100644 --- a/src/web/interface.rs +++ b/src/web/interface.rs @@ -89,6 +89,7 @@ pub struct ServerInfoResponse { pub session_id: SessionId, pub server_version: String, pub protocol_version: u64, + pub project_name: String, pub expected_place_ids: Option>, pub root_instance_id: RbxId, }