4 files changed, 10 insertions, 0 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 154ab63a..319e66a1 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -40,6 +40,7 @@ module Network.BitTorrent
        , Handle
        , handleTopic
        , handleTrackers
+       , handleExchange
 
        , TorrentSource(openHandle)
        , closeHandle
diff --git a/src/Network/BitTorrent/Client.hs b/src/Network/BitTorrent/Client.hs
index bdaf12a5..b9099736 100644
--- a/src/Network/BitTorrent/Client.hs
+++ b/src/Network/BitTorrent/Client.hs
@@ -31,6 +31,7 @@ module Network.BitTorrent.Client
        , Handle
        , handleTopic
        , handleTrackers
+       , handleExchange
 
          -- ** Construction
        , TorrentSource (..)
diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index 8dac3c84..015bae3d 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -21,6 +21,10 @@ module Network.BitTorrent.Exchange
        , newSession
        , closeSession
 
+         -- * Query
+       , waitMetadata
+       , takeMetadata
+
          -- * Connections
        , connect
        ) where
diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/src/Network/BitTorrent/Exchange/Session.hs
index 8c3d5388..32f8eabd 100644
--- a/src/Network/BitTorrent/Exchange/Session.hs
+++ b/src/Network/BitTorrent/Exchange/Session.hs
@@ -18,6 +18,7 @@ module Network.BitTorrent.Exchange.Session
 
          -- * Events
        , waitMetadata
+       , takeMetadata
        ) where
 
 import Control.Applicative
@@ -355,6 +356,9 @@ sendBroadcast msg = do
 waitMetadata :: Session -> IO InfoDict
 waitMetadata Session {..} = cachedValue <$> readMVar infodict
 
+takeMetadata :: Session -> IO (Maybe InfoDict)
+takeMetadata Session {..} = fmap cachedValue <$> tryReadMVar infodict
+
 {-----------------------------------------------------------------------
 --  Triggers
 -----------------------------------------------------------------------}