combine announce and announceList slots in the Metainfo record.

[functorrent.git] / src / FuncTorrent / Metainfo.hs

diff --git a/src/FuncTorrent/Metainfo.hs b/src/FuncTorrent/Metainfo.hs
index 1fd9475d7baf9b9701639826318d5bc380dae836..9ff3ce3cb65f49d5bad8e2f43b6b75e0e45df913 100644 (file)
--- a/src/FuncTorrent/Metainfo.hs
+++ b/src/FuncTorrent/Metainfo.hs
@@ -1,20 +1,19 @@
 module FuncTorrent.Metainfo
     (Info,
      Metainfo,
+     announceList,
      mkMetaInfo,
      mkInfo,
-     announce,
      lengthInBytes,
      info,
      name,
-     getTrackers
     ) where
 
 import Prelude hiding (lookup)
 import Data.ByteString.Char8 (ByteString, unpack)
 import Data.Map as M ((!), lookup)
 
-import FuncTorrent.Bencode (BVal(..))
+import FuncTorrent.Bencode (BVal(..), bstrToString)
 
 -- only single file mode supported for the time being.
 data Info = Info { pieceLength :: !Integer
@@ -26,7 +25,6 @@ data Info = Info { pieceLength :: !Integer
                  } deriving (Eq, Show)
 
 data Metainfo = Metainfo { info :: !Info
-                         , announce :: !(Maybe String)
                          , announceList :: ![String]
                          , creationDate :: !(Maybe String)
                          , comment :: !(Maybe String)
@@ -64,10 +62,8 @@ mkMetaInfo (Bdict m) = let (Just info') = mkInfo $ m ! "info"
                            createdBy' = lookup "created by" m
                            encoding' = lookup "encoding" m
                        in Just Metainfo { info = info'
-                                        , announce = announce'
-                                                     >>= (\(Bstr a) ->
-                                                           Just (unpack a))
-                                        , announceList = getAnnounceList announceList'
+                                        , announceList = maybeToList (announce' >>= bstrToString)
+                                                         ++ getAnnounceList announceList'
                                         , creationDate = creationDate'
                                         , comment = maybeBstrToString comment'
                                         , createdBy = maybeBstrToString createdBy'
@@ -75,6 +71,10 @@ mkMetaInfo (Bdict m) = let (Just info') = mkInfo $ m ! "info"
                                         }
 mkMetaInfo _ = Nothing
 
+maybeToList :: Maybe a -> [a]
+maybeToList  Nothing   = []
+maybeToList  (Just x)  = [x]
+
 getAnnounceList :: Maybe BVal -> [String]
 getAnnounceList Nothing = []
 getAnnounceList (Just (Bint _)) = []
@@ -87,8 +87,3 @@ getAnnounceList (Just (Blist l)) = map (\s -> case s of
                                                _ -> "") l
 
 getAnnounceList (Just (Bdict _)) = []
-
-getTrackers :: Metainfo -> [String]
-getTrackers m = case announce m of
-                 Nothing -> announceList m
-                 Just a -> a : announceList m