2 files changed, 13 insertions, 1 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 8e837b56..a1df0034 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -33,7 +33,7 @@ module Data.Torrent
 
          -- * Files layout
        , Layout, contentLayout
-       , contentLength, fileOffset
+       , contentLength, fileCount, fileOffset
        , pieceCount, blockCount
        , isSingleFile, isMultiFile
 
@@ -415,6 +415,11 @@ contentLength :: ContentInfo -> Integer
 contentLength SingleFile { ciLength = len } = len
 contentLength MultiFile  { ciFiles  = tfs } = sum (map fiLength tfs)
 
+-- | Get count of all files in torrent.
+fileCount :: ContentInfo -> Int
+fileCount SingleFile {..} = 1
+fileCount MultiFile  {..} = length ciFiles
+
 -- | Find count of pieces in the torrent. If torrent size is not a
 -- multiple of piece size then the count is rounded up.
 pieceCount :: ContentInfo -> Int
diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 8bbd774e..7ae43cec 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -24,6 +24,7 @@ module Network.BitTorrent
        , getSwarm
        , getStorage
        , getTorrentInfo
+       , getTorrentInfoStr
 
          -- * Extensions
        , Extension
@@ -37,6 +38,7 @@ import Network.BitTorrent.Sessions.Types
 import Network.BitTorrent.Sessions
 import Network.BitTorrent.Extension
 import Network.BitTorrent.Tracker
+import Text.Read
 
 -- TODO remove fork from Network.BitTorrent.Exchange
 -- TODO make all forks in Internal.
@@ -61,6 +63,11 @@ addTorrent cs loc @ TorrentLoc {..} = do
 removeTorrent :: ClientSession -> InfoHash ->  IO ()
 removeTorrent ses loc = undefined -- atomically $ unregisterTorrent ses loc
 
+getTorrentInfoStr :: ClientSession -> String -> IO (Maybe Torrent)
+getTorrentInfoStr cs str
+  | Just infohash <- readMaybe str = getTorrentInfo cs infohash
+  |            otherwise           = return Nothing
+
 {-
 -- | The same as 'removeTorrrent' torrent, but delete all torrent
 --   content files.