3 files changed, 24 insertions, 15 deletions

diff --git a/src/Network/BitTorrent/PeerWire/Block.hs b/src/Network/BitTorrent/PeerWire/Block.hs
index fbc65338..dea37321 100644
--- a/src/Network/BitTorrent/PeerWire/Block.hs
+++ b/src/Network/BitTorrent/PeerWire/Block.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE OverloadedStrings #-}
 module Network.BitTorrent.PeerWire.Block
        ( BlockIx(..)
        , Block(..), blockSize
@@ -16,6 +18,7 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import Data.Int
 import Data.Serialize
+import Text.PrettyPrint
 
 
 type BlockLIx = Int
@@ -51,10 +54,11 @@ instance Serialize BlockIx where
               putInt (ixLength ix)
   {-# INLINE put #-}
 
-ppBlockIx :: BlockIx -> String
-ppBlockIx ix = "piece = "  ++ show (ixPiece ix)  ++ ", "
-            ++ "offset = " ++ show (ixOffset ix) ++ ", "
-            ++ "length = " ++ show (ixLength ix)
+ppBlockIx :: BlockIx -> Doc
+ppBlockIx BlockIx {..} =
+  "piece  = " <> int ixPiece  <> "," <+>
+  "offset = " <> int ixOffset <> "," <+>
+  "length = " <> int ixLength
 
 data Block = Block {
     -- | Zero-based piece index.
@@ -67,7 +71,7 @@ data Block = Block {
   , blkData   :: ByteString
   } deriving (Show, Eq)
 
-ppBlock :: Block -> String
+ppBlock :: Block -> Doc
 ppBlock = ppBlockIx . blockIx
 
 blockSize :: Block -> Int
diff --git a/src/Network/BitTorrent/PeerWire/Handshake.hs b/src/Network/BitTorrent/PeerWire/Handshake.hs
index 6f4598ae..ff768cae 100644
--- a/src/Network/BitTorrent/PeerWire/Handshake.hs
+++ b/src/Network/BitTorrent/PeerWire/Handshake.hs
@@ -11,6 +11,7 @@
 --   peer.
 --
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
 module Network.BitTorrent.PeerWire.Handshake
        ( Handshake(..), handshakeCaps
        , handshake
@@ -27,6 +28,8 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BC
 import Data.Serialize as S
+import Text.PrettyPrint
+
 import Network
 import Network.Socket.ByteString
 
@@ -77,9 +80,9 @@ handshakeCaps :: Handshake -> Capabilities
 handshakeCaps = hsReserved
 
 -- | Format handshake in human readable form.
-ppHandshake :: Handshake -> String
-ppHandshake hs = BC.unpack (hsProtocol hs) ++ " "
-              ++ ppClientInfo (clientInfo (hsPeerID hs))
+ppHandshake :: Handshake -> Doc
+ppHandshake Handshake {..} =
+  text (BC.unpack hsProtocol) <+> ppClientInfo (clientInfo hsPeerID)
 
 -- | Get handshake message size in bytes from the length of protocol string.
 handshakeSize :: Word8 -> Int
diff --git a/src/Network/BitTorrent/PeerWire/Message.hs b/src/Network/BitTorrent/PeerWire/Message.hs
index f5ad2693..6515fdf2 100644
--- a/src/Network/BitTorrent/PeerWire/Message.hs
+++ b/src/Network/BitTorrent/PeerWire/Message.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 module Network.BitTorrent.PeerWire.Message
        ( Message(..)
        , Bitfield
@@ -7,6 +8,7 @@ module Network.BitTorrent.PeerWire.Message
 import Control.Applicative
 import qualified Data.ByteString as B
 import Data.Serialize
+import Text.PrettyPrint
 import Network
 
 import Network.BitTorrent.PeerWire.Block
@@ -141,10 +143,10 @@ instance Serialize Message where
 --   compact and suitable for logging: only useful information but not
 --   payload bytes.
 --
-ppMessage :: Message -> String
-ppMessage (Bitfield _)       = "Bitfield "
-ppMessage (Piece blk)        = "Piece "    ++ ppBlock blk
-ppMessage (Cancel ix)        = "Cancel "   ++ ppBlockIx ix
-ppMessage (SuggestPiece pix) = "Suggest"   ++ show pix
-ppMessage (RejectRequest ix) = "Reject"    ++ ppBlockIx ix
-ppMessage msg = show msg
\ No newline at end of file
+ppMessage :: Message -> Doc
+ppMessage (Bitfield _)       = "Bitfield"
+ppMessage (Piece blk)        = "Piece"    <+> ppBlock blk
+ppMessage (Cancel ix)        = "Cancel"   <+> ppBlockIx ix
+ppMessage (SuggestPiece pix) = "Suggest"  <+> int pix
+ppMessage (RejectRequest ix) = "Reject"   <+> ppBlockIx ix
+ppMessage msg = text (show msg)
\ No newline at end of file