new modules FileSystem and PieceManager

[functorrent.git] / src / main / Main.hs

diff --git a/src/main/Main.hs b/src/main/Main.hs
index 4dd4c6867a92f06e0a9fdb69086aa791cfd507de..a75f01c122df050615e645c4ba9f0fb4f55563da 100644 (file)
--- a/src/main/Main.hs
+++ b/src/main/Main.hs
@@ -1,22 +1,24 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
-import Prelude hiding (log, length, readFile, getContents, replicate, writeFile)
+import           Prelude hiding (log, length, readFile, getContents)
 
-import Control.Concurrent (forkIO)
-import Control.Concurrent.MVar (readMVar)
-import Data.ByteString.Char8 (ByteString, getContents, readFile, writeFile, replicate)
-import Network (PortID (PortNumber))
-import System.Environment (getArgs)
-import System.Exit (exitSuccess)
-import System.Directory (doesFileExist)
-import System.Random (getStdGen, randomRs)
-
-import FuncTorrent.Logger (initLogger, logMessage, logStop)
-import FuncTorrent.Metainfo (Info(..), Metainfo(..), torrentToMetainfo)
-import FuncTorrent.Peer (initPieceMap, handlePeerMsgs, pieceMapFromFile)
+import           Control.Concurrent (forkIO)
+import           Control.Concurrent.MVar (readMVar)
+import           Data.ByteString.Char8 (ByteString, getContents, readFile)
+import qualified FuncTorrent.FileSystem as FS (initFS, pieceMapFromFile, startThread)
+import           FuncTorrent.Logger (initLogger, logMessage, logStop)
+import           FuncTorrent.Metainfo (Info(..), Metainfo(..), torrentToMetainfo)
+import           FuncTorrent.Peer (handlePeerMsgs)
+import           FuncTorrent.PieceManager (initPieceMap)
 import qualified FuncTorrent.Server as Server
-import FuncTorrent.Tracker (connectedPeers, initialTrackerState, trackerLoop)
+import           FuncTorrent.Tracker (connectedPeers, initialTrackerState, trackerLoop, udpTrackerLoop)
+import           FuncTorrent.Utils (createDummyFile)
+import           Network (PortID (PortNumber))
+import           System.Directory (doesFileExist)
+import           System.Environment (getArgs)
+import           System.Exit (exitSuccess)
+import           System.Random (getStdGen, randomRs)
 
 logError :: String -> (String -> IO ()) -> IO ()
 logError e logMsg = logMsg $ "parse error: \n" ++ e
@@ -68,20 +70,24 @@ main = do
            pieceHash = pieces (info m)
            pLen = pieceLength (info m)
            defaultPieceMap = initPieceMap pieceHash fileLen pLen
+       log $ "create FS msg channel"
+       (handle, fsMsgChannel) <- FS.initFS filePath
        log $ "Downloading file : " ++ filePath
        dfe <- doesFileExist filePath
        pieceMap <- if dfe
                    then
-                     pieceMapFromFile filePath defaultPieceMap
+                     FS.pieceMapFromFile handle defaultPieceMap
                    else do
                      -- create a dummy file
-                     _ <- writeFile filePath (replicate (fromIntegral fileLen) '\0')
-                     return defaultPieceMap
+                     createDummyFile filePath (fromIntegral fileLen) >>
+                       return defaultPieceMap
+       log $ "start filesystem manager thread"
+       FS.startThread handle fsMsgChannel pieceMap
        log $ "starting server"
        (serverSock, (PortNumber portnum)) <- Server.start
        log $ "server started on " ++ show portnum
        log "Trying to fetch peers"
-       _ <- forkIO $ Server.run serverSock peerId m pieceMap
+       _ <- forkIO $ Server.run serverSock peerId m pieceMap fsMsgChannel
        log $ "Trackers: " ++ head (announceList m)
        -- (tstate, errstr) <- runTracker portnum peerId m
        tstate <- initialTrackerState $ lengthInBytes $ info m
@@ -89,5 +95,5 @@ main = do
        ps <- readMVar (connectedPeers tstate)
        log $ "Peers List : " ++ (show ps)
        let p1 = head ps
-       handlePeerMsgs p1 peerId m pieceMap True
+       handlePeerMsgs p1 peerId m pieceMap True fsMsgChannel
        logStop logR