Move some common methods into Connection trait

src/connection/base.rs

@@ -1,19 +1,50 @@
 use std::{
+    io::{Write, Read},
     marker::Sized,
-    fmt::Debug
+    fmt::Debug,
+    path::PathBuf,
 };
 
-use models::{Payload, OpCode};
+use models::{Payload, Message, OpCode};
 use error::Result;
 
 
 pub trait Connection
     where Self: Sized
 {
+    type Socket: Write + Read;
+
+
+    fn socket(&mut self) -> &mut Self::Socket;
+
+    fn ipc_path() -> PathBuf;
+
     fn connect() -> Result<Self>;
 
-    fn send<T>(&mut self, opcode: OpCode, payload: T) -> Result<()>
-        where T: Payload + Debug;
+    fn socket_path(n: u8) -> PathBuf {
+        Self::ipc_path().join(format!("discord-ipc-{}", n))
+    }
 
-    fn recv(&mut self) -> Result<Vec<u8>>;
+    fn send<T>(&mut self, opcode: OpCode, payload: T) -> Result<()>
+        where T: Payload + Debug
+    {
+        debug!("payload: {:#?}", payload);
+        match Message::new(opcode, payload).encode() {
+            Err(why) => error!("{:?}", why),
+            Ok(bytes) => {
+                self.socket().write_all(bytes.as_ref())?;
+                debug!("sent opcode: {:?}", opcode);
+                self.recv()?;
+            }
+        };
+        Ok(())
+    }
+
+    fn recv(&mut self) -> Result<Vec<u8>> {
+        let mut buf: Vec<u8> = vec![0; 1024];
+        let n = self.socket().read(buf.as_mut_slice())?;
+        buf.resize(n, 0);
+        debug!("{:?}", Message::decode(&buf));
+        Ok(buf)
+    }
 }

src/connection/unix.rs

@@ -1,14 +1,11 @@
 use std::{
-    os::unix::net::UnixStream,
-    io::{Write, Read},
     time,
     path::PathBuf,
     env,
-    fmt::Debug
+    os::unix::net::UnixStream,
 };
 
 use super::base::Connection;
-use models::{Payload, Message, OpCode};
 use error::Result;
 
 
@@ -16,7 +13,17 @@ pub struct UnixConnection {
     socket: UnixStream,
 }
 
-impl UnixConnection {
+impl Connection for UnixConnection {
+    type Socket = UnixStream;
+
+    fn connect() -> Result<Self> {
+        let connection_name = Self::socket_path(0);
+        let socket = UnixStream::connect(connection_name)?;
+        socket.set_write_timeout(Some(time::Duration::from_secs(30)))?;
+        socket.set_read_timeout(Some(time::Duration::from_secs(30)))?;
+        Ok(Self { socket })
+    }
+
     fn ipc_path() -> PathBuf {
         let tmp = env::var("XDG_RUNTIME_DIR")
             .or_else(|_| env::var("TMPDIR"))
@@ -30,40 +37,7 @@ impl UnixConnection {
         PathBuf::from(tmp)
     }
 
-    fn socket_path(n: u8) -> PathBuf {
-        Self::ipc_path().join(format!("discord-ipc-{}", n))
-    }
-}
-
-impl Connection for UnixConnection {
-    fn connect() -> Result<Self> {
-        let connection_name = Self::socket_path(0);
-        let socket = UnixStream::connect(connection_name)?;
-        socket.set_write_timeout(Some(time::Duration::from_secs(30)))?;
-        socket.set_read_timeout(Some(time::Duration::from_secs(30)))?;
-        Ok(Self { socket })
-    }
-
-    fn send<T>(&mut self, opcode: OpCode, payload: T) -> Result<()>
-        where T: Payload + Debug
-    {
-        debug!("payload: {:#?}", payload);
-        match Message::new(opcode, payload).encode() {
-            Err(why) => error!("{:?}", why),
-            Ok(bytes) => {
-                self.socket.write_all(bytes.as_ref())?;
-                debug!("sent opcode: {:?}", opcode);
-                self.recv()?;
-            }
-        };
-        Ok(())
-    }
-
-    fn recv(&mut self) -> Result<Vec<u8>> {
-        let mut buf: Vec<u8> = vec![0; 1024];
-        let n = self.socket.read(buf.as_mut_slice())?;
-        buf.resize(n, 0);
-        debug!("{:?}", Message::decode(&buf));
-        Ok(buf)
+    fn socket(&mut self) -> &mut Self::Socket {
+        &mut self.socket
     }
 }

src/connection/windows.rs

@@ -1,10 +1,6 @@
-extern crate named_pipe;
-
 use std::{
-    io::{Write, Read},
     time,
     path::PathBuf,
-    fmt::Debug
 };
 
 use super::base::Connection;
@@ -17,17 +13,9 @@ pub struct WindowsConnection {
     socket: PipeClient,
 }
 
-impl WindowsConnection {
-    fn ipc_path() -> PathBuf {
-        PathBuf::from(r"\\.\pipe\")
-    }
-
-    fn socket_path(n: u8) -> PathBuf {
-        Self::ipc_path().join(format!("discord-ipc-{}", n))
-    }
-}
-
 impl Connection for WindowsConnection {
+    type Socket = PipeClient;
+
     fn connect() -> Result<Self> {
         let connection_name = Self::socket_path(0);
         let mut socket = PipeClient::connect(connection_name)?;
@@ -36,26 +24,11 @@ impl Connection for WindowsConnection {
         Ok(Self { socket })
     }
 
-    fn send<T>(&mut self, opcode: OpCode, payload: T) -> Result<()>
-        where T: Payload + Debug
-    {
-        debug!("payload: {:#?}", payload);
-        match Message::new(opcode, payload).encode() {
-            Err(why) => error!("{:?}", why),
-            Ok(bytes) => {
-                self.socket.write_all(bytes.as_ref())?;
-                debug!("sent opcode: {:?}", opcode);
-                self.recv()?;
-            }
-        };
-        Ok(())
+    fn ipc_path() -> PathBuf {
+        PathBuf::from(r"\\.\pipe\")
     }
 
-    fn recv(&mut self) -> Result<Vec<u8>> {
-        let mut buf: Vec<u8> = vec![0; 1024];
-        let n = self.socket.read(buf.as_mut_slice())?;
-        buf.resize(n, 0);
-        debug!("{:?}", Message::decode(&buf));
-        Ok(buf)
+    fn socket(&mut self) -> &mut Self::Socket {
+        &mut self.socket
     }
 }

src/lib.rs

@@ -7,6 +7,8 @@ extern crate serde_json;
 extern crate byteorder;
 extern crate uuid;
 extern crate libc;
+#[cfg(windows)]
+extern crate named_pipe;
 
 #[macro_use]
 mod macros;