refactor handshake msg

[functorrent.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 7ba6d96c3bbe5884df4aab5b4de3e3a44278d700..3aa65874efa581464d016899bcfcaf60356ae591 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,16 +1,15 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
-import Prelude hiding (log, length, readFile)
-import Data.ByteString.Char8 (ByteString, readFile, unpack)
+import Prelude hiding (log, length, readFile, getContents)
+import Data.ByteString.Char8 (ByteString, getContents, readFile, unpack)
 import System.Environment (getArgs)
 import System.Exit (exitSuccess)
 import System.Directory (doesFileExist)
 
-import FuncTorrent.Bencode (decode)
 import FuncTorrent.Logger (initLogger, logMessage, logStop)
-import FuncTorrent.Metainfo (Info(..), Metainfo(..), mkMetaInfo)
-import FuncTorrent.Peer (handShake, msgLoop)
+import FuncTorrent.Metainfo (Info(..), Metainfo(..), torrentToMetainfo)
+import FuncTorrent.Peer (handlePeerMsgs)
 import FuncTorrent.Tracker (peers, getTrackerResponse)
 
 logError :: String -> (String -> IO ()) -> IO ()
@@ -26,7 +25,7 @@ usage :: IO ()
 usage = putStrLn "usage: functorrent torrent-file"
 
 parse :: [String] -> IO ByteString
-parse [] = usage >> exit
+parse [] = getContents
 parse [a] = do
   fileExist <- doesFileExist a
   if fileExist
@@ -34,14 +33,6 @@ parse [a] = do
     else error "file does not exist"
 parse _ = exit
 
-torrentToMetaInfo :: ByteString -> Either String Metainfo
-torrentToMetaInfo s =
-  case (decode s) of
-   Right d ->
-     mkMetaInfo d
-   Left e ->
-     Left $ show e
-
 main :: IO ()
 main = do
     args <- getArgs
@@ -50,7 +41,8 @@ main = do
     log "Starting up functorrent"
     log $ "Parsing arguments " ++ concat args
     torrentStr <- parse args
-    case (torrentToMetaInfo torrentStr) of
+    case torrentToMetainfo torrentStr of
+     Left e -> logError e log
      Right m -> do
        log "Input File OK"
        log $ "Downloading file : " ++ name (info m)
@@ -59,12 +51,9 @@ main = do
        log $ "Trackers: " ++ head (announceList m)
        trackerResp <- getTrackerResponse m peerId
        case  trackerResp of
+        Left e -> log $ "Error" ++ unpack e
         Right peerList -> do
           log $ "Peers List : " ++ (show . peers $ peerList)
           let p1 = head (peers peerList)
-          h <- handShake p1 (infoHash m) peerId
-          log $ "handshake"
-          msgLoop h (pieces (info m))
-        Left e -> log $ "Error" ++ unpack e
-     Left e -> logError e log
+          handlePeerMsgs p1 m peerId
     logStop logR