refactor PeerID and associated functions.

[functorrent.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index b0f594a2f883b897027c9d63572b6233e60c9062..bb50a8be38f4116ea46d67c976c6711dca086e6f 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -13,8 +13,8 @@ import Data.Functor
 printError :: Parsec.ParseError -> IO ()
 printError e = putStrLn $ "parse error: " ++ show e
 
-genPeerId :: String
-genPeerId = "-HS0001-20150215"
+peerId :: String
+peerId = "-HS0001-*-*-20150215"
 
 exit :: IO BC.ByteString
 exit = exitSuccess
@@ -29,13 +29,15 @@ parse _ = exit
 
 main :: IO ()
 main = do
-  args <- getArgs
-  torrentStr <- parse args
-  case Benc.decode torrentStr of
-   Right d -> case MInfo.mkMetaInfo d of
-               Nothing -> putStrLn "parse error"
-               Just m -> do
-                 body <- BC.pack <$> T.connect (MInfo.announce m) (T.prepareRequest d genPeerId)
-                 print (P.getPeers (P.getPeerResponse body))
-   Left e -> printError e
-  putStrLn "done"
+    args <- getArgs
+    torrentStr <- parse args
+    case Benc.decode torrentStr of
+      Right d ->
+          case MInfo.mkMetaInfo d of
+            Nothing -> putStrLn "parse error"
+            Just m -> do
+              let len = MInfo.lengthInBytes (MInfo.info m)
+              body <- BC.pack <$> T.connect (MInfo.announce m) (T.prepareRequest d peerId len)
+              print (P.getPeers (P.getPeerResponse body))
+      Left e -> printError e
+    putStrLn "done"