3 files changed, 21 insertions, 12 deletions

diff --git a/src/Network/BitTorrent/Peer/Addr.hs b/src/Network/BitTorrent/Peer/Addr.hs
index 1c2ac2eb..5c05180a 100644
--- a/src/Network/BitTorrent/Peer/Addr.hs
+++ b/src/Network/BitTorrent/Peer/Addr.hs
@@ -6,6 +6,7 @@
 --   Portability :  non-portable
 --
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
 {-# OPTIONS  -fno-warn-orphans #-}
 module Network.BitTorrent.Peer.Addr
        ( PeerAddr(..)
@@ -17,6 +18,7 @@ import Control.Applicative
 import Data.BEncode
 import Data.Bits
 import Data.Word
+import Text.PrettyPrint
 import Network
 import Network.Socket
 
@@ -73,6 +75,9 @@ connectToPeer p = do
   connect sock (peerSockAddr p)
   return sock
 
-ppPeer :: PeerAddr -> String
-ppPeer p = maybe ""  (++ " at ") ((ppClientInfo . clientInfo) <$> peerID p)
-        ++ show (peerSockAddr p)
+ppPeer :: PeerAddr -> Doc
+ppPeer p @ PeerAddr {..} = case peerID of
+    Just pid -> ppClientInfo (clientInfo pid) <+> "at" <+> paddr
+    Nothing  -> paddr
+  where
+    paddr = text (show (peerSockAddr p))
diff --git a/src/Network/BitTorrent/Peer/ClientInfo.hs b/src/Network/BitTorrent/Peer/ClientInfo.hs
index ebbecbd7..bf7fcaab 100644
--- a/src/Network/BitTorrent/Peer/ClientInfo.hs
+++ b/src/Network/BitTorrent/Peer/ClientInfo.hs
@@ -12,6 +12,7 @@
 --  > See http://bittorrent.org/beps/bep_0020.html for more information.
 --
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
 module Network.BitTorrent.Peer.ClientInfo
        ( -- * Info
          ClientInfo(..), clientInfo, ppClientInfo, unknownClient
@@ -30,6 +31,7 @@ import Control.Applicative
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BC
 import Data.Serialize.Get
+import Text.PrettyPrint
 
 import Network.BitTorrent.Peer.ID
 
@@ -163,8 +165,8 @@ parseImpl = f . BC.unpack
   f _    = IUnknown
 
 -- | Format client implementation info in human readable form.
-ppClientImpl :: ClientImpl -> String
-ppClientImpl = tail . show
+ppClientImpl :: ClientImpl -> Doc
+ppClientImpl = text . tail . show
 
 unknownImpl :: ClientImpl
 unknownImpl = IUnknown
@@ -174,8 +176,8 @@ unknownImpl = IUnknown
 type ClientVersion = ByteString
 
 -- | Format client implementation version in human readable form.
-ppClientVersion :: ClientVersion -> String
-ppClientVersion = BC.unpack
+ppClientVersion :: ClientVersion -> Doc
+ppClientVersion = text . BC.unpack
 
 unknownVersion :: ClientVersion
 unknownVersion = "0000"
@@ -189,9 +191,10 @@ data ClientInfo = ClientInfo {
   } deriving (Show, Eq, Ord)
 
 -- | Format client implementation in human readable form.
-ppClientInfo :: ClientInfo -> String
-ppClientInfo ci = ppClientImpl    (ciImpl ci) ++ " version "
-               ++ ppClientVersion (ciVersion ci)
+ppClientInfo :: ClientInfo -> Doc
+ppClientInfo ClientInfo {..} =
+  ppClientImpl ciImpl <+> "version" <+> ppClientVersion ciVersion
+
 
 -- | Unrecognized client implementation.
 unknownClient :: ClientInfo
diff --git a/src/Network/BitTorrent/Peer/ID.hs b/src/Network/BitTorrent/Peer/ID.hs
index f93409ed..9bf0ae31 100644
--- a/src/Network/BitTorrent/Peer/ID.hs
+++ b/src/Network/BitTorrent/Peer/ID.hs
@@ -44,6 +44,7 @@ import Data.URLEncoded
 import Data.Version     (Version(Version), versionBranch)
 import Data.Time.Clock  (getCurrentTime)
 import Data.Time.Format (formatTime)
+import Text.PrettyPrint (text, Doc)
 import System.Locale    (defaultTimeLocale)
 
 
@@ -64,8 +65,8 @@ instance Serialize PeerID where
 instance URLShow PeerID where
   urlShow = BC.unpack . getPeerID
 
-ppPeerID :: PeerID -> String
-ppPeerID = BC.unpack . getPeerID
+ppPeerID :: PeerID -> Doc
+ppPeerID = text . BC.unpack . getPeerID
 
 
 -- | Azureus-style encoding have the following layout: