bug: initial state should be meInterested = false, heChoking = true

[functorrent.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index d0812656c5498d30166c6b762c8ba6038a15f77c..3aa65874efa581464d016899bcfcaf60356ae591 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,21 +1,19 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
-import Prelude hiding (length, readFile, writeFile)
-import Data.ByteString.Char8 (ByteString, readFile, writeFile, length)
+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, BVal(..))
 import FuncTorrent.Logger (initLogger, logMessage, logStop)
-import FuncTorrent.Metainfo (announce, lengthInBytes, mkMetaInfo, info, name)
-import FuncTorrent.Peer (peers, getPeerResponse, handShakeMsg)
-import FuncTorrent.Tracker (connect, prepareRequest)
+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
@@ -39,30 +37,23 @@ main :: IO ()
 main = do
     args <- getArgs
     logR <- initLogger
-    let logMsg = logMessage logR
-    logMsg $ "Parsing input file: " ++ concat args
+    let log = logMessage logR
+    log "Starting up functorrent"
+    log $ "Parsing arguments " ++ concat args
     torrentStr <- parse args
-    case decode torrentStr of
-      Right d ->
-          case mkMetaInfo d of
-            Nothing -> logMsg "parse error"
-            Just m -> do
-              logMsg "Input File OK"
-
-              let len = lengthInBytes $ info m
-                  (Bdict d') = d
-
-              logMsg "Trying to fetch peers: "
-              body <- connect (announce m) (prepareRequest d' peerId len)
-
-              -- TODO: Write to ~/.functorrent/caches
-              writeFile (name (info m) ++ ".cache") body
-
-              let peerResponse = show $ peers $ getPeerResponse body
-              logMsg $ "Peers List : " ++ peerResponse
-
-              let hsMsgLen = show $ length $ handShakeMsg d' peerId
-              logMsg $ "Hand-shake message length : " ++ hsMsgLen
-
-      Left e -> logError e logMsg
+    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