refactor: remove peerid from Peer datatype

[functorrent.git] / src / FuncTorrent / Tracker / Types.hs

diff --git a/src/FuncTorrent/Tracker/Types.hs b/src/FuncTorrent/Tracker/Types.hs
index 6ca5ddb849e21d4691e1f836d5c83b93ca3347a4..3adcacc8bc6ac35c24b017dc83675f37635a11a6 100644 (file)
--- a/src/FuncTorrent/Tracker/Types.hs
+++ b/src/FuncTorrent/Tracker/Types.hs
@@ -1,19 +1,35 @@
+{-
+ - Copyright (C) 2015-2016 Ramakrishnan Muthukrishnan <ram@rkrishnan.org>
+ -
+ - This file is part of FuncTorrent.
+ -
+ - FuncTorrent is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 3 of the License, or
+ - (at your option) any later version.
+ -
+ - FuncTorrent is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ -
+ - You should have received a copy of the GNU General Public License
+ - along with FuncTorrent; if not,  see <http://www.gnu.org/licenses/>
+ -}
+
 {-# LANGUAGE OverloadedStrings #-}
 module FuncTorrent.Tracker.Types
        ( TrackerProtocol(..)
        , TrackerResponse(..)
        , TrackerEventState(..)
        , TState(..)
-       , IP
-       , Port
+       , TrackerMsg(..)
        ) where
 
+import Data.ByteString (ByteString)
 import Control.Concurrent.MVar (MVar)
 
-import FuncTorrent.Peer (Peer(..))
-
-type IP = String
-type Port = Integer
+import FuncTorrent.PeerMsgs (Peer)
 
 data TrackerProtocol = Http
                      | Udp
@@ -22,17 +38,17 @@ data TrackerProtocol = Http
 
 data TrackerEventState = None
                        | Started
-                       | Stopped
                        | Completed
+                       | Stopped
                        deriving (Show, Eq)
 
-data TState = TState {
-    uploaded :: MVar Integer
-  , downloaded :: MVar Integer
-  , left :: Integer
-  , currentState :: TrackerEventState
-  , connectedPeers :: MVar [Peer]
-  }
+data TrackerMsg = GetStatusMsg TrackerEventState
+                | GetConnectedPeersMsg (MVar [Peer])
+
+data TState = TState { left :: Integer
+                     , currentState :: TrackerEventState
+                     , connectedPeers :: MVar [Peer]
+                     }
 
 -- | Tracker response
 data TrackerResponse = TrackerResponse {