diff options
| -rw-r--r-- | app_init_command.proto (renamed from AppInitCommand.proto) | 2 | ||||
| -rw-r--r-- | appear_actor_command.proto (renamed from AppearActorCommand.proto) | 0 | ||||
| -rw-r--r-- | buddy_list_notify_command.proto (renamed from BuddyListNotifyCommand.proto) | 0 | ||||
| -rw-r--r-- | buddy_list_update_command.proto (renamed from BuddyListUpdateCommand.proto) | 0 | ||||
| -rw-r--r-- | build/test.py | 10 | ||||
| -rw-r--r-- | channel_command.proto (renamed from ChannelCommand.proto) | 0 | ||||
| -rw-r--r-- | command.proto (renamed from Command.proto) | 0 | ||||
| -rw-r--r-- | disappear_actor_command.proto (renamed from DisappearActorCommand.proto) | 0 | ||||
| -rw-r--r-- | finger_reply_command.proto (renamed from FingerReplyCommand.proto) | 2 | ||||
| -rw-r--r-- | finger_request_command.proto (renamed from FingerRequestCommand.proto) | 0 | ||||
| -rw-r--r-- | long_location_command.proto (renamed from LongLocationCommand.proto) | 0 | ||||
| -rw-r--r-- | network_2_property.proto (renamed from Network2Property.proto) | 0 | ||||
| -rw-r--r-- | network_commands.proto (renamed from NetworkCommands.proto) | 0 | ||||
| -rw-r--r-- | network_constants.proto (renamed from NetworkConstants.proto) | 0 | ||||
| -rw-r--r-- | network_data.proto (renamed from NetworkData.proto) | 0 | ||||
| -rw-r--r-- | network_packet.proto (renamed from NetworkPacket.proto) | 52 | ||||
| -rw-r--r-- | network_property.proto (renamed from NetworkProperty.proto) | 0 | ||||
| -rw-r--r-- | obj_id.proto (renamed from ObjID.proto) | 0 | ||||
| -rw-r--r-- | old_property_list.proto (renamed from OldPropertyList.proto) | 2 | ||||
| -rw-r--r-- | prop_command.proto (renamed from PropCommand.proto) | 2 | ||||
| -rw-r--r-- | prop_request_command.proto (renamed from PropRequestCommand.proto) | 0 | ||||
| -rw-r--r-- | property_list.proto (renamed from PropertyList.proto) | 2 | ||||
| -rw-r--r-- | property_set_command.proto (renamed from PropertySetCommand.proto) | 2 | ||||
| -rw-r--r-- | property_update_command.proto (renamed from PropertyUpdateCommand.proto) | 2 | ||||
| -rw-r--r-- | redirect_command.proto (renamed from RedirectCommand.proto) | 0 | ||||
| -rw-r--r-- | redirect_id_command.proto (renamed from RedirectIDCommand.proto) | 0 | ||||
| -rw-r--r-- | room_id_command.proto (renamed from RoomIDCommand.proto) | 0 | ||||
| -rw-r--r-- | room_id_request_command.proto (renamed from RoomIDRequestCommand.proto) | 0 | ||||
| -rw-r--r-- | session_exit_command.proto (renamed from SessionExitCommand.proto) | 2 | ||||
| -rw-r--r-- | session_init_command.proto (renamed from SessionInitCommand.proto) | 2 | ||||
| -rw-r--r-- | short_location_command.proto (renamed from ShortLocationCommand.proto) | 0 | ||||
| -rw-r--r-- | subscribe_distance_command.proto (renamed from SubscribeDistanceCommand.proto) | 0 | ||||
| -rw-r--r-- | subscribe_room_command.proto (renamed from SubscribeRoomCommand.proto) | 0 | ||||
| -rw-r--r-- | teleport_command.proto (renamed from TeleportCommand.proto) | 0 | ||||
| -rw-r--r-- | text_command.proto (renamed from TextCommand.proto) | 2 | ||||
| -rw-r--r-- | unsubscribe_room_command.proto (renamed from UnsubscribeRoomCommand.proto) | 0 | ||||
| -rw-r--r-- | whisper_command.proto (renamed from WhisperCommand.proto) | 2 |
37 files changed, 42 insertions, 42 deletions
diff --git a/AppInitCommand.proto b/app_init_command.proto index a567a23..d7feed5 100644 --- a/AppInitCommand.proto +++ b/app_init_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "NetworkProperty.proto"; +import "network_property.proto"; message AppInitCommand { repeated NetworkProperty property_list = 2; diff --git a/AppearActorCommand.proto b/appear_actor_command.proto index 718af2d..718af2d 100644 --- a/AppearActorCommand.proto +++ b/appear_actor_command.proto diff --git a/BuddyListNotifyCommand.proto b/buddy_list_notify_command.proto index 34259ea..34259ea 100644 --- a/BuddyListNotifyCommand.proto +++ b/buddy_list_notify_command.proto diff --git a/BuddyListUpdateCommand.proto b/buddy_list_update_command.proto index d422f55..d422f55 100644 --- a/BuddyListUpdateCommand.proto +++ b/buddy_list_update_command.proto diff --git a/build/test.py b/build/test.py index f23bbc4..cf4b869 100644 --- a/build/test.py +++ b/build/test.py @@ -1,13 +1,13 @@ -import NetworkPacket_pb2 -import BuddyListNotifyCommand_pb2 +import network_packet_pb2 as network_packet +import buddy_list_notify_command_pb2 as buddy_list_notify_command -request = NetworkPacket_pb2.NetworkPacket() +request = network_packet.NetworkPacket() request.length = 3 request.short_object_id = 0xFF request.type = 0x0A request.buddy_list_notify_command.CopyFrom( - BuddyListNotifyCommand_pb2.BuddyListNotifyCommand() + buddy_list_notify_command.BuddyListNotifyCommand() ) request.buddy_list_notify_command.buddy_name = "Whirl" request.buddy_list_notify_command.logged_on = 1 @@ -15,7 +15,7 @@ request.buddy_list_notify_command.logged_on = 1 print(request.SerializeToString()) print(request.WhichOneof("command")) -deserialised_request = NetworkPacket_pb2.NetworkPacket() +deserialised_request = network_packet.NetworkPacket() deserialised_request.ParseFromString(request.SerializeToString()) diff --git a/ChannelCommand.proto b/channel_command.proto index b76f984..b76f984 100644 --- a/ChannelCommand.proto +++ b/channel_command.proto diff --git a/Command.proto b/command.proto index d3b69fa..d3b69fa 100644 --- a/Command.proto +++ b/command.proto diff --git a/DisappearActorCommand.proto b/disappear_actor_command.proto index fe7770a..fe7770a 100644 --- a/DisappearActorCommand.proto +++ b/disappear_actor_command.proto diff --git a/FingerReplyCommand.proto b/finger_reply_command.proto index 42d747c..0821c32 100644 --- a/FingerReplyCommand.proto +++ b/finger_reply_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "PropertyList.proto"; +import "property_list.proto"; message FingerReplyCommand { string user = 1; diff --git a/FingerRequestCommand.proto b/finger_request_command.proto index 4727e9c..4727e9c 100644 --- a/FingerRequestCommand.proto +++ b/finger_request_command.proto diff --git a/LongLocationCommand.proto b/long_location_command.proto index 913dbd2..913dbd2 100644 --- a/LongLocationCommand.proto +++ b/long_location_command.proto diff --git a/Network2Property.proto b/network_2_property.proto index 94f6309..94f6309 100644 --- a/Network2Property.proto +++ b/network_2_property.proto diff --git a/NetworkCommands.proto b/network_commands.proto index d909716..d909716 100644 --- a/NetworkCommands.proto +++ b/network_commands.proto diff --git a/NetworkConstants.proto b/network_constants.proto index e51476f..e51476f 100644 --- a/NetworkConstants.proto +++ b/network_constants.proto diff --git a/NetworkData.proto b/network_data.proto index 786370e..786370e 100644 --- a/NetworkData.proto +++ b/network_data.proto diff --git a/NetworkPacket.proto b/network_packet.proto index 86876a7..d58d303 100644 --- a/NetworkPacket.proto +++ b/network_packet.proto @@ -2,32 +2,32 @@ syntax = "proto3"; package whirl; -import "AppearActorCommand.proto"; -import "AppInitCommand.proto"; -import "PropCommand.proto"; -import "BuddyListNotifyCommand.proto"; -import "BuddyListUpdateCommand.proto"; -import "ChannelCommand.proto"; -import "DisappearActorCommand.proto"; -import "FingerReplyCommand.proto"; -import "FingerRequestCommand.proto"; -import "LongLocationCommand.proto"; -import "PropertySetCommand.proto"; -import "PropertyUpdateCommand.proto"; -import "PropRequestCommand.proto"; -import "RedirectCommand.proto"; -import "RedirectIDCommand.proto"; -import "RoomIDCommand.proto"; -import "RoomIDRequestCommand.proto"; -import "SessionExitCommand.proto"; -import "SessionInitCommand.proto"; -import "ShortLocationCommand.proto"; -import "SubscribeDistanceCommand.proto"; -import "SubscribeRoomCommand.proto"; -import "TeleportCommand.proto"; -import "TextCommand.proto"; -import "UnsubscribeRoomCommand.proto"; -import "WhisperCommand.proto"; +import "appear_actor_command.proto"; +import "app_init_command.proto"; +import "prop_command.proto"; +import "buddy_list_notify_command.proto"; +import "buddy_list_update_command.proto"; +import "channel_command.proto"; +import "disappear_actor_command.proto"; +import "finger_reply_command.proto"; +import "finger_request_command.proto"; +import "long_location_command.proto"; +import "property_set_command.proto"; +import "property_update_command.proto"; +import "prop_request_command.proto"; +import "redirect_command.proto"; +import "redirect_id_command.proto"; +import "room_id_command.proto"; +import "room_id_request_command.proto"; +import "session_exit_command.proto"; +import "session_init_command.proto"; +import "short_location_command.proto"; +import "subscribe_distance_command.proto"; +import "subscribe_room_command.proto"; +import "teleport_command.proto"; +import "text_command.proto"; +import "unsubscribe_room_command.proto"; +import "whisper_command.proto"; message NetworkPacket { uint32 length = 1; diff --git a/NetworkProperty.proto b/network_property.proto index 4f30762..4f30762 100644 --- a/NetworkProperty.proto +++ b/network_property.proto diff --git a/ObjID.proto b/obj_id.proto index bc8aa7e..bc8aa7e 100644 --- a/ObjID.proto +++ b/obj_id.proto diff --git a/OldPropertyList.proto b/old_property_list.proto index 358ad67..cacdc50 100644 --- a/OldPropertyList.proto +++ b/old_property_list.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "NetworkProperty.proto"; +import "network_property.proto"; message OldPropertyList { repeated NetworkProperty properties = 1; diff --git a/PropCommand.proto b/prop_command.proto index 6f52c0c..c847c92 100644 --- a/PropCommand.proto +++ b/prop_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "OldPropertyList.proto"; +import "old_property_list.proto"; message PropCommand { OldPropertyList property_list = 1; diff --git a/PropRequestCommand.proto b/prop_request_command.proto index 040bf4d..040bf4d 100644 --- a/PropRequestCommand.proto +++ b/prop_request_command.proto diff --git a/PropertyList.proto b/property_list.proto index 15e5ec7..c2e1fbd 100644 --- a/PropertyList.proto +++ b/property_list.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "Network2Property.proto"; +import "network_2_property.proto"; message PropertyList { repeated Network2Property properties = 1; diff --git a/PropertySetCommand.proto b/property_set_command.proto index 76edf40..df6b7bc 100644 --- a/PropertySetCommand.proto +++ b/property_set_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "PropertyList.proto"; +import "property_list.proto"; message PropertySetCommand { string from_user = 1; diff --git a/PropertyUpdateCommand.proto b/property_update_command.proto index 3ca0ada..5259978 100644 --- a/PropertyUpdateCommand.proto +++ b/property_update_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "PropertyList.proto"; +import "property_list.proto"; message PropertyUpdateCommand { PropertyList property_list = 1; diff --git a/RedirectCommand.proto b/redirect_command.proto index 7c1ce16..7c1ce16 100644 --- a/RedirectCommand.proto +++ b/redirect_command.proto diff --git a/RedirectIDCommand.proto b/redirect_id_command.proto index 023377d..023377d 100644 --- a/RedirectIDCommand.proto +++ b/redirect_id_command.proto diff --git a/RoomIDCommand.proto b/room_id_command.proto index 237a96f..237a96f 100644 --- a/RoomIDCommand.proto +++ b/room_id_command.proto diff --git a/RoomIDRequestCommand.proto b/room_id_request_command.proto index 75f5d54..75f5d54 100644 --- a/RoomIDRequestCommand.proto +++ b/room_id_request_command.proto diff --git a/SessionExitCommand.proto b/session_exit_command.proto index da48f34..9a5fc4f 100644 --- a/SessionExitCommand.proto +++ b/session_exit_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "OldPropertyList.proto"; +import "old_property_list.proto"; message SessionExitCommand { OldPropertyList property_list = 1; diff --git a/SessionInitCommand.proto b/session_init_command.proto index 477a9c2..42a3bdb 100644 --- a/SessionInitCommand.proto +++ b/session_init_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "OldPropertyList.proto"; +import "old_property_list.proto"; message SessionInitCommand { OldPropertyList property_list = 1; diff --git a/ShortLocationCommand.proto b/short_location_command.proto index 2be8ac1..2be8ac1 100644 --- a/ShortLocationCommand.proto +++ b/short_location_command.proto diff --git a/SubscribeDistanceCommand.proto b/subscribe_distance_command.proto index 5881a2e..5881a2e 100644 --- a/SubscribeDistanceCommand.proto +++ b/subscribe_distance_command.proto diff --git a/SubscribeRoomCommand.proto b/subscribe_room_command.proto index 9866e43..9866e43 100644 --- a/SubscribeRoomCommand.proto +++ b/subscribe_room_command.proto diff --git a/TeleportCommand.proto b/teleport_command.proto index d0c92b9..d0c92b9 100644 --- a/TeleportCommand.proto +++ b/teleport_command.proto diff --git a/TextCommand.proto b/text_command.proto index 8da6086..bb58baf 100644 --- a/TextCommand.proto +++ b/text_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "ObjID.proto"; +import "obj_id.proto"; message TextCommand { ObjID sender_id = 1; diff --git a/UnsubscribeRoomCommand.proto b/unsubscribe_room_command.proto index a0bab2b..a0bab2b 100644 --- a/UnsubscribeRoomCommand.proto +++ b/unsubscribe_room_command.proto diff --git a/WhisperCommand.proto b/whisper_command.proto index 746b2fe..4be883f 100644 --- a/WhisperCommand.proto +++ b/whisper_command.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package whirl; -import "ObjID.proto"; +import "obj_id.proto"; message WhisperCommand { ObjID sender_id = 1; |