refactor Peer module

[functorrent.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 9cb5908c00809d328ccd72bda5e1c4b10ba6a2fa..3aa65874efa581464d016899bcfcaf60356ae591 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,21 +1,19 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
-import Prelude hiding (log, length, readFile, writeFile)
-import Data.ByteString.Char8 (ByteString, readFile, writeFile, length, 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 Text.ParserCombinators.Parsec (ParseError)
 
-import FuncTorrent.Bencode (decode)
 import FuncTorrent.Logger (initLogger, logMessage, logStop)
-import FuncTorrent.Metainfo (Info(..), Metainfo(..), mkMetaInfo)
-import FuncTorrent.Peer (handShakeMsg)
-import FuncTorrent.Tracker (tracker, peers, mkTrackerResponse)
+import FuncTorrent.Metainfo (Info(..), Metainfo(..), torrentToMetainfo)
+import FuncTorrent.Peer (handlePeerMsgs)
+import FuncTorrent.Tracker (peers, getTrackerResponse)
 
-logError :: ParseError -> (String -> IO ()) -> IO ()
-logError e logMsg = logMsg $ "parse error: \n" ++ show e
+logError :: String -> (String -> IO ()) -> IO ()
+logError e logMsg = logMsg $ "parse error: \n" ++ e
 
 peerId :: String
 peerId = "-HS0001-*-*-20150215"
@@ -27,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
@@ -41,33 +39,21 @@ main = do
     logR <- initLogger
     let log = logMessage logR
     log "Starting up functorrent"
-    log $ "Parsing input file " ++ concat args
+    log $ "Parsing arguments " ++ concat args
     torrentStr <- parse args
-    case decode torrentStr of
-      Right d ->
-          case mkMetaInfo d of
-            Nothing -> log "Unable to make meta info file"
-            Just m -> do
-              log "Input File OK"
-              log $ "Downloading file : " ++ name (info m)
-              log "Trying to fetch peers"
-
-              log $ "Trackers: " ++ head (announceList m)
-              response <- tracker m peerId
-
-              let hsMsgLen = show $ length $ handShakeMsg m peerId
-              log $ "Hand-shake message length : " ++ hsMsgLen
-
-              -- TODO: Write to ~/.functorrent/caches
-              writeFile (name (info m) ++ ".cache") response
-
-              case decode response of
-                Right trackerInfo ->
-                    case mkTrackerResponse trackerInfo of
-                      Right peerResp ->
-                          log $ "Peers List : " ++ (show . peers $ peerResp)
-                      Left e -> log $ "Error" ++ unpack e
-                Left e -> logError e log
-
-      Left e -> logError e log
+    case torrentToMetainfo torrentStr of
+     Left e -> logError e log
+     Right m -> do
+       log "Input File OK"
+       log $ "Downloading file : " ++ name (info m)
+       log "Trying to fetch peers"
+
+       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)
+          handlePeerMsgs p1 m peerId
     logStop logR