Metainfo: rename mkInfo -> bvalToInfo

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

diff --git a/src/FuncTorrent/Metainfo.hs b/src/FuncTorrent/Metainfo.hs
index 13e7979644c085b3b3778cad9478f81e5bbd9036..4cc6ed126c2685528427f0145db03f9dbc5ae6a6 100644 (file)
--- a/src/FuncTorrent/Metainfo.hs
+++ b/src/FuncTorrent/Metainfo.hs
@@ -41,7 +41,7 @@ data Info = Info { pieceLength :: !Integer
                  , md5sum :: !(Maybe String)
                  } deriving (Eq, Show)
 
-data Metainfo = Metainfo { info :: !Info
+data Metainfo = Metainfo { info :: !(Maybe Info)
                          , announceList :: ![String]
                          , creationDate :: !(Maybe Integer)
                          , comment :: !(Maybe String)
@@ -50,24 +50,24 @@ data Metainfo = Metainfo { info :: !Info
                          , infoHash :: !ByteString
                          } deriving (Eq, Show)
 
-mkInfo :: BVal -> Maybe Info
-mkInfo (Bdict m) = let (Bint pieceLength') = m ! "piece length"
-                       (Bstr pieces') = m ! "pieces"
-                       private' = Nothing
-                       (Bstr name') = m ! "name"
-                       (Bint length') = m ! "length"
-                       md5sum' = Nothing
-                   in Just Info { pieceLength = pieceLength'
-                                , pieces = pieces'
-                                , private = private'
-                                , name = unpack name'
-                                , lengthInBytes = length'
-                                , md5sum = md5sum'}
-mkInfo _ = Nothing
+bvalToInfo :: BVal -> Maybe Info
+bvalToInfo (Bdict m) = let (Bint pieceLength') = m ! "piece length"
+                           (Bstr pieces') = m ! "pieces"
+                           private' = Nothing
+                           (Bstr name') = m ! "name"
+                           (Bint length') = m ! "length"
+                           md5sum' = Nothing
+                       in Just Info { pieceLength = pieceLength'
+                                    , pieces = pieces'
+                                    , private = private'
+                                    , name = unpack name'
+                                    , lengthInBytes = length'
+                                    , md5sum = md5sum'}
+bvalToInfo _ = Nothing
 
 mkMetaInfo :: BVal   -> Either String Metainfo
 mkMetaInfo (Bdict m)  =
-    let (Just info')  = mkInfo $ m ! "info"
+    let info'         = bvalToInfo $ m ! "info"
         announce'     = lookup "announce" m
         announceList' = lookup "announce-list" m
         creationDate' = lookup "creation date" m