summaryrefslogtreecommitdiff
path: root/src/Network/BitTorrent/Tracker
diff options
context:
space:
mode:
Diffstat (limited to 'src/Network/BitTorrent/Tracker')
-rw-r--r--src/Network/BitTorrent/Tracker/Message.hs8
-rw-r--r--src/Network/BitTorrent/Tracker/Session.hs12
2 files changed, 0 insertions, 20 deletions
diff --git a/src/Network/BitTorrent/Tracker/Message.hs b/src/Network/BitTorrent/Tracker/Message.hs
index ffe36c82..cdc07af8 100644
--- a/src/Network/BitTorrent/Tracker/Message.hs
+++ b/src/Network/BitTorrent/Tracker/Message.hs
@@ -97,7 +97,6 @@ module Network.BitTorrent.Tracker.Message
97 97
98import Control.Applicative 98import Control.Applicative
99import Control.Monad 99import Control.Monad
100import Data.Aeson.TH
101import Data.BEncode as BE hiding (Result) 100import Data.BEncode as BE hiding (Result)
102import Data.BEncode.BDict as BE 101import Data.BEncode.BDict as BE
103import Data.ByteString as BS 102import Data.ByteString as BS
@@ -126,7 +125,6 @@ import System.Entropy
126import Text.Read (readMaybe) 125import Text.Read (readMaybe)
127 126
128import Data.Torrent.InfoHash 127import Data.Torrent.InfoHash
129import Data.Torrent.JSON
130import Data.Torrent.Progress 128import Data.Torrent.Progress
131import Network.BitTorrent.Core 129import Network.BitTorrent.Core
132 130
@@ -150,8 +148,6 @@ data AnnounceEvent
150 | Completed 148 | Completed
151 deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable) 149 deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
152 150
153$(deriveJSON omitRecordPrefix ''AnnounceEvent)
154
155-- | HTTP tracker protocol compatible encoding. 151-- | HTTP tracker protocol compatible encoding.
156instance QueryValueLike AnnounceEvent where 152instance QueryValueLike AnnounceEvent where
157 toQueryValue e = toQueryValue (Char.toLower x : xs) 153 toQueryValue e = toQueryValue (Char.toLower x : xs)
@@ -224,8 +220,6 @@ data AnnounceQuery = AnnounceQuery
224 , reqEvent :: Maybe AnnounceEvent 220 , reqEvent :: Maybe AnnounceEvent
225 } deriving (Show, Eq, Typeable) 221 } deriving (Show, Eq, Typeable)
226 222
227$(deriveJSON omitRecordPrefix ''AnnounceQuery)
228
229-- | UDP tracker protocol compatible encoding. 223-- | UDP tracker protocol compatible encoding.
230instance Serialize AnnounceQuery where 224instance Serialize AnnounceQuery where
231 put AnnounceQuery {..} = do 225 put AnnounceQuery {..} = do
@@ -636,8 +630,6 @@ data ScrapeEntry = ScrapeEntry {
636 , siName :: !(Maybe Text) 630 , siName :: !(Maybe Text)
637 } deriving (Show, Eq, Typeable) 631 } deriving (Show, Eq, Typeable)
638 632
639$(deriveJSON omitRecordPrefix ''ScrapeEntry)
640
641-- | HTTP tracker protocol compatible encoding. 633-- | HTTP tracker protocol compatible encoding.
642instance BEncode ScrapeEntry where 634instance BEncode ScrapeEntry where
643 toBEncode ScrapeEntry {..} = toDict $ 635 toBEncode ScrapeEntry {..} = toDict $
diff --git a/src/Network/BitTorrent/Tracker/Session.hs b/src/Network/BitTorrent/Tracker/Session.hs
index 5aa9c0eb..560acf84 100644
--- a/src/Network/BitTorrent/Tracker/Session.hs
+++ b/src/Network/BitTorrent/Tracker/Session.hs
@@ -47,8 +47,6 @@ import Control.Exception
47import Control.Concurrent 47import Control.Concurrent
48import Control.Concurrent.Chan.Split as CS 48import Control.Concurrent.Chan.Split as CS
49import Control.Monad 49import Control.Monad
50import Data.Aeson
51import Data.Aeson.TH
52import Data.Default 50import Data.Default
53import Data.Fixed 51import Data.Fixed
54import Data.Foldable as F 52import Data.Foldable as F
@@ -60,7 +58,6 @@ import Data.Traversable
60import Network.URI 58import Network.URI
61 59
62import Data.Torrent.InfoHash 60import Data.Torrent.InfoHash
63import Data.Torrent.JSON
64import Network.BitTorrent.Core 61import Network.BitTorrent.Core
65import Network.BitTorrent.Internal.Cache 62import Network.BitTorrent.Internal.Cache
66import Network.BitTorrent.Internal.Types 63import Network.BitTorrent.Internal.Types
@@ -95,8 +92,6 @@ data LastScrape = LastScrape
95 , scrapeSeeders :: Maybe Int 92 , scrapeSeeders :: Maybe Int
96 } deriving (Show, Eq) 93 } deriving (Show, Eq)
97 94
98$(deriveJSON omitRecordPrefix ''LastScrape)
99
100-- | Single tracker session. 95-- | Single tracker session.
101data TrackerSession = TrackerSession 96data TrackerSession = TrackerSession
102 { -- | Used to notify 'Stopped' and 'Completed' events. 97 { -- | Used to notify 'Stopped' and 'Completed' events.
@@ -109,13 +104,6 @@ data TrackerSession = TrackerSession
109 , trackerScrape :: Cached LastScrape 104 , trackerScrape :: Cached LastScrape
110 } 105 }
111 106
112instance ToJSON (TierEntry TrackerSession) where
113 toJSON (uri, TrackerSession {..}) = object
114 [ "uri" .= uri
115 , "peers" .= trackerPeers
116 , "scrape" .= trackerScrape
117 ]
118
119-- | Not contacted. 107-- | Not contacted.
120instance Default TrackerSession where 108instance Default TrackerSession where
121 def = TrackerSession Nothing def def 109 def = TrackerSession Nothing def def