rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-22 21:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rough pass on transforming applied patches into API responses

Browse Source
This commit is contained in:
Lucien Greathouse
2019-10-01 14:45:24 -07:00
parent 2598ea3577
commit 099aa26ef8
3 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/web/api.rs
View File

@@ -13,8 +13,9 @@ use crate::{
serve_session::ServeSession,
web::{
interface::{
ErrorResponse, Instance, ReadResponse, ServerInfoResponse, SubscribeMessage,
SubscribeResponse, PROTOCOL_VERSION, SERVER_VERSION,
ErrorResponse, Instance, InstanceMetadata as WebInstanceMetadata, InstanceUpdate,
ReadResponse, ServerInfoResponse, SubscribeMessage, SubscribeResponse,
PROTOCOL_VERSION, SERVER_VERSION,
},
util::{json, json_ok},
},
@@ -89,15 +90,46 @@ impl<F: ImfsFetcher> ApiService<F> {
message_queue.subscribe(input_cursor, sender);
}
let tree_handle = self.serve_session.tree_handle();
Box::new(receiver.then(move |result| match result {
Ok((message_cursor, messages)) => {
// TODO: Transform applied patch sets into subscribe responses
let tree = tree_handle.lock().unwrap();
let api_messages = messages
.into_iter()
.map(|message| {
let removed_instances = message.removed;
let added_instances = HashMap::new(); // TODO
let updated_instances = Vec::new(); // TODO
let mut added_instances = HashMap::new();
for id in message.added {
let instance = tree.get_instance(id).unwrap();
added_instances.insert(id, Instance::from_rojo_instance(instance));
for instance in tree.descendants(id) {
added_instances
.insert(instance.id(), Instance::from_rojo_instance(instance));
}
}
let updated_instances = message
.updated
.into_iter()
.map(|update| {
let changed_metadata = update
.changed_metadata
.as_ref()
.map(WebInstanceMetadata::from_rojo_metadata);
InstanceUpdate {
id: update.id,
changed_name: update.changed_name,
changed_class_name: update.changed_class_name,
changed_properties: update.changed_properties,
changed_metadata,
}
})
.collect();
SubscribeMessage {
removed_instances,