feat(conference): add Conference enum entry

Author: NamsooCho

src/toxcore/messenger/file_transfer/mod.rs

@@ -0,0 +1,4 @@
+/*! The implementation of file transfer
+*/
+
+pub mod packet;

…toxcore/messenger/packet/file_control.rs …ger/file_transfer/packet/file_control.rssrc/toxcore/messenger/packet/file_control.rs renamed to src/toxcore/messenger/file_transfer/packet/file_control.rs src/toxcore/messenger/packet/file_control.rs renamed to src/toxcore/messenger/file_transfer/packet/file_control.rs

@@ -0,0 +1,62 @@
+/*! The implementation of file transfer packets.
+*/
+
+use crate::toxcore::binary_io::*;
+
+mod file_control;
+mod file_data;
+mod file_send_request;
+
+pub use self::file_control::*;
+pub use self::file_data::*;
+pub use self::file_send_request::*;
+
+/** File transfer packet enum that encapsulates all types of file transfer packets.
+*/
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum Packet {
+    /// [`FileControl`](./struct.FileControl.html) structure.
+    FileControl(FileControl),
+    /// [`FileData`](./struct.FileData.html) structure.
+    FileData(FileData),
+    /// [`FileSendRequest`](./struct.FileSendRequest.html) structure.
+    FileSendRequest(FileSendRequest),
+}
+
+impl ToBytes for Packet {
+    fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
+        match *self {
+            Packet::FileControl(ref p) => p.to_bytes(buf),
+            Packet::FileData(ref p) => p.to_bytes(buf),
+            Packet::FileSendRequest(ref p) => p.to_bytes(buf),
+        }
+    }
+}
+
+impl FromBytes for Packet {
+    named!(from_bytes<Packet>, alt!(
+        map!(FileControl::from_bytes, Packet::FileControl) |
+        map!(FileData::from_bytes, Packet::FileData) |
+        map!(FileSendRequest::from_bytes, Packet::FileSendRequest)
+    ));
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    encode_decode_test!(
+        packet_file_control_encode_decode,
+        Packet::FileControl(FileControl::new(TransferDirection::Send, 1, ControlType::Seek(100)))
+    );
+
+    encode_decode_test!(
+        packet_file_data_encode_decode,
+        Packet::FileData(FileData::new(1, vec![1,2,3,4]))
+    );
+
+    encode_decode_test!(
+        packet_file_send_request_encode_decode,
+        Packet::FileSendRequest(FileSendRequest::new(1, FileType::Avatar, 4, FileUID::new(), "data".to_string()))
+    );
+}

src/toxcore/messenger/packet/file_data.rs …senger/file_transfer/packet/file_data.rssrc/toxcore/messenger/packet/file_data.rs renamed to src/toxcore/messenger/file_transfer/packet/file_data.rs src/toxcore/messenger/packet/file_data.rs renamed to src/toxcore/messenger/file_transfer/packet/file_data.rs

@@ -3,3 +3,4 @@
 
 pub mod packet;
 pub mod conference;
+pub mod file_transfer;

…re/messenger/packet/file_send_request.rs …ile_transfer/packet/file_send_request.rssrc/toxcore/messenger/packet/file_send_request.rs renamed to src/toxcore/messenger/file_transfer/packet/file_send_request.rs src/toxcore/messenger/packet/file_send_request.rs renamed to src/toxcore/messenger/file_transfer/packet/file_send_request.rs

@@ -9,25 +9,19 @@ mod offline;
 mod message;
 mod nickname;
 mod msi;
-mod file_control;
 mod typing;
 mod user_status;
-mod file_data;
 mod status_message;
-mod file_send_request;
 
 pub use self::online::*;
 pub use self::action::*;
 pub use self::offline::*;
 pub use self::message::*;
 pub use self::nickname::*;
 pub use self::msi::*;
-pub use self::file_control::*;
 pub use self::typing::*;
 pub use self::user_status::*;
-pub use self::file_data::*;
 pub use self::status_message::*;
-pub use self::file_send_request::*;
 
 pub use crate::toxcore::messenger::conference::packet::Packet as ConferencePacket;
 
@@ -47,20 +41,16 @@ pub enum Packet {
     Nickname(Nickname),
     /// [`UserStatus`](./struct.UserStatus.html) structure.
     UserStatus(UserStatus),
-    /// [`FileControl`](./struct.FileControl.html) structure.
-    FileControl(FileControl),
     /// [`Typing`](./struct.Typing.html) structure.
     Typing(Typing),
-    /// [`FileData`](./struct.FileData.html) structure.
-    FileData(FileData),
-    /// [`FileSendRequest`](./struct.FileSendRequest.html) structure.
-    FileSendRequest(FileSendRequest),
     /// [`StatusMessage`](./struct.StatusMessage.html) structure.
     StatusMessage(StatusMessage),
     /// [`Msi`](./struct.Msi.html) structure.
     Msi(Msi),
     /// Packets of conference.
     Conference(ConferencePacket),
+    /// Packets of file transfer.
+    FileTransfer(FileTransferPacket),
 }
 
 impl ToBytes for Packet {
@@ -72,11 +62,8 @@ impl ToBytes for Packet {
             Packet::Message(ref p) => p.to_bytes(buf),
             Packet::Nickname(ref p) => p.to_bytes(buf),
             Packet::UserStatus(ref p) => p.to_bytes(buf),
-            Packet::FileControl(ref p) => p.to_bytes(buf),
             Packet::Typing(ref p) => p.to_bytes(buf),
-            Packet::FileData(ref p) => p.to_bytes(buf),
             Packet::Msi(ref p) => p.to_bytes(buf),
-            Packet::FileSendRequest(ref p) => p.to_bytes(buf),
             Packet::StatusMessage(ref p) => p.to_bytes(buf),
             Packet::Conference(ref p) => p.to_bytes(buf),
         }
@@ -91,9 +78,6 @@ impl FromBytes for Packet {
         map!(Nickname::from_bytes, Packet::Nickname) |
         map!(Message::from_bytes, Packet::Message) |
         map!(UserStatus::from_bytes, Packet::UserStatus) |
-        map!(FileControl::from_bytes, Packet::FileControl) |
-        map!(FileData::from_bytes, Packet::FileData) |
-        map!(FileSendRequest::from_bytes, Packet::FileSendRequest) |
         map!(Msi::from_bytes, Packet::Msi) |
         map!(StatusMessage::from_bytes, Packet::StatusMessage) |
         map!(Typing::from_bytes, Packet::Typing) |
@@ -136,21 +120,11 @@ mod tests {
         Packet::UserStatus(UserStatus::new(PeerStatus::Busy))
     );
 
-    encode_decode_test!(
-        packet_file_control_encode_decode,
-        Packet::FileControl(FileControl::new(TransferDirection::Send, 1, ControlType::Seek(100)))
-    );
-
     encode_decode_test!(
         packet_typing_encode_decode,
         Packet::Typing(Typing::new(TypingStatus::NotTyping))
     );
 
-    encode_decode_test!(
-        packet_file_data_encode_decode,
-        Packet::FileData(FileData::new(1, vec![1,2,3,4]))
-    );
-
     encode_decode_test!(
         packet_msi_encode_decode,
         Packet::Msi(Msi::new(RequestKind::Init, None, CapabilitiesKind::SEND_AUDIO))
@@ -161,11 +135,6 @@ mod tests {
         Packet::StatusMessage(StatusMessage::new("1234".to_string()))
     );
 
-    encode_decode_test!(
-        packet_file_send_request_encode_decode,
-        Packet::FileSendRequest(FileSendRequest::new(1, FileType::Avatar, 4, FileUID::new(), "data".to_string()))
-    );
-
     encode_decode_test!(
         packet_conference_request_encode_decode,
         Packet::Conference(ConferencePacket::Invite(Invite::new(1, ConferenceType::Text, ConferenceUID::random())))