2 files changed, 67 insertions, 9 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 7ae43cec..e68d1597 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -26,19 +26,35 @@ module Network.BitTorrent
        , getTorrentInfo
        , getTorrentInfoStr
 
+         -- * Torrent Groups
+       , ClientLoc (..), ppClientLoc
+       , concreteLoc, concretePath
+       , addTorrents
+       , removeTorrents
+
          -- * Extensions
        , Extension
        , defaultExtensions
        , ppExtension
        ) where
 
+import Control.Applicative
+import Control.Exception
+import Control.Monad
+import Data.List as L
+import Data.HashMap.Strict as HM
 import Network
+import Text.Read
+import Text.PrettyPrint
+import System.Directory
+import System.FilePath
+
 import Data.Torrent
 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.
@@ -48,6 +64,11 @@ withDefaultClient :: PortNumber -> PortNumber -> (ClientSession -> IO ()) -> IO
 withDefaultClient listPort dhtPort action = do
   withClientSession defaultThreadCount [] listPort dhtPort action
 
+getTorrentInfoStr :: ClientSession -> String -> IO (Maybe Torrent)
+getTorrentInfoStr cs str
+  | Just infohash <- readMaybe str = getTorrentInfo cs infohash
+  |            otherwise           = return Nothing
+
 {-----------------------------------------------------------------------
     Torrent management
 -----------------------------------------------------------------------}
@@ -61,12 +82,7 @@ addTorrent cs loc @ TorrentLoc {..} = do
 
 -- | Unregister torrent and stop all running sessions.
 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
+removeTorrent = unregisterTorrent
 
 {-
 -- | The same as 'removeTorrrent' torrent, but delete all torrent
@@ -74,3 +90,43 @@ getTorrentInfoStr cs str
 deleteTorrent :: ClientSession -> TorrentLoc -> IO ()
 deleteTorrent ClientSession {..} TorrentLoc {..} = undefined
 -}
+
+{-----------------------------------------------------------------------
+    Torrent group management
+-----------------------------------------------------------------------}
+-- TODO better name
+
+data ClientLoc = ClientLoc
+  { tdir :: FilePath -- ^ Path to directory with .torrent files.
+  , ddir :: FilePath -- ^ Path to directory to place content.
+  } deriving (Show, Eq)
+
+ppClientLoc :: ClientLoc -> Doc
+ppClientLoc ClientLoc {..} =
+  text "torrent directory" <+> text tdir $$
+  text "data directory"    <+> text ddir
+
+concretePath :: ClientLoc -> FilePath -> FilePath
+concretePath ClientLoc {..} relPath = tdir </> relPath
+
+concreteLoc :: ClientLoc -> FilePath -> TorrentLoc
+concreteLoc loc @ ClientLoc {..} relPath
+  = TorrentLoc (concretePath loc relPath) ddir
+
+addTorrents :: ClientSession -> ClientLoc -> IO ()
+addTorrents ses loc @ ClientLoc {..} = do
+    paths <- L.filter isTorrentPath <$> getDirectoryContents tdir
+    forM_ paths $ handle handler . addTorrent ses . concreteLoc loc
+  where
+    handler :: SomeException -> IO ()
+    handler = print
+
+removeTorrents :: ClientSession -> IO ()
+removeTorrents cs = do
+  tm <- getRegistered cs
+  forM_ (keys tm) (removeTorrent cs)
+
+{-
+deleteTorrents :: ClientSession -> IO ()
+deleteTorrents = undefined
+-}
\ No newline at end of file
diff --git a/src/Network/BitTorrent/Sessions.hs b/src/Network/BitTorrent/Sessions.hs
index 4e58be5c..6b73dd6c 100644
--- a/src/Network/BitTorrent/Sessions.hs
+++ b/src/Network/BitTorrent/Sessions.hs
@@ -306,8 +306,10 @@ registerTorrent ClientSession {..} loc @ TorrentLoc {..} = do
   torrent <- fromFile metafilePath
   atomically $ modifyTVar' torrentMap $ HM.insert (tInfoHash torrent) loc
 
-unregisterTorrent :: TVar TorrentMap -> InfoHash -> IO ()
-unregisterTorrent = error "unregisterTorrent"
+-- TODO kill sessions
+unregisterTorrent :: ClientSession -> InfoHash -> IO ()
+unregisterTorrent ClientSession {..} ih = do
+  atomically $ modifyTVar' torrentMap $ HM.delete ih
 
 getRegistered :: ClientSession -> IO TorrentMap
 getRegistered ClientSession {..} = readTVarIO torrentMap