Remove aeson dependency

6 files changed, 0 insertions, 116 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index ccd5e666..b233937b 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -71,8 +71,6 @@ import qualified Crypto.Hash.SHA1 as C
 import Control.DeepSeq
 import Control.Exception
 import Control.Lens
-import Data.Aeson.Types (ToJSON(..), FromJSON(..), Value(..), withText)
-import Data.Aeson.TH
 import Data.BEncode as BE
 import Data.BEncode.Types as BE
 import           Data.ByteString as BS
@@ -93,7 +91,6 @@ import Text.PrettyPrint.Class
 import System.FilePath
 
 import Data.Torrent.InfoHash as IH
-import Data.Torrent.JSON
 import Data.Torrent.Layout
 import Data.Torrent.Piece
 import Network.BitTorrent.Core.NodeInfo
@@ -125,8 +122,6 @@ data InfoDict = InfoDict
     --   BEP 27: <http://www.bittorrent.org/beps/bep_0027.html>
   } deriving (Show, Read, Eq, Typeable)
 
-$(deriveJSON omitRecordPrefix ''InfoDict)
-
 makeLensesFor
   [ ("idInfoHash"  , "infohash"  )
   , ("idLayoutInfo", "layoutInfo")
@@ -242,21 +237,6 @@ data Torrent = Torrent
     --   encrypted SHA-1 hash of the info dictionary).
     } deriving (Show, Eq, Typeable)
 
-instance FromJSON URI where
-  parseJSON = withText "URI" $
-    maybe (fail "could not parse URI") pure . parseURI . T.unpack
-
-instance ToJSON URI where
-  toJSON = String . T.pack . show
-
-instance ToJSON NominalDiffTime where
-  toJSON = toJSON . posixSecondsToUTCTime
-
-instance FromJSON NominalDiffTime where
-  parseJSON v = utcTimeToPOSIXSeconds <$> parseJSON v
-
-$(deriveJSON omitRecordPrefix ''Torrent)
-
 makeLensesFor
   [ ("tAnnounce"    , "announce"    )
   , ("tAnnounceList", "announceList")
diff --git a/src/Data/Torrent/InfoHash.hs b/src/Data/Torrent/InfoHash.hs
index 9eec631c..f322ac6f 100644
--- a/src/Data/Torrent/InfoHash.hs
+++ b/src/Data/Torrent/InfoHash.hs
@@ -24,7 +24,6 @@ module Data.Torrent.InfoHash
 
 import Control.Applicative
 import Control.Monad
-import Data.Aeson
 import Data.BEncode
 import Data.ByteString as BS
 import Data.ByteString.Char8 as BC
@@ -146,15 +145,6 @@ instance Convertible Text InfoHash where
 instance IsString InfoHash where
   fromString = either (error . prettyConvertError) id . safeConvert . T.pack
 
--- | Convert to base16 encoded JSON string.
-instance ToJSON InfoHash where
-  toJSON (InfoHash ih) = String $ T.decodeUtf8 $ Base16.encode ih
-
--- | Convert from base16\/base32\/base64 encoded JSON string.
-instance FromJSON InfoHash where
-  parseJSON = withText "InfoHash" $
-    either (fail . prettyConvertError) pure . safeConvert
-
 ignoreErrorMsg :: Either a b -> Maybe b
 ignoreErrorMsg = either (const Nothing) Just
 
diff --git a/src/Data/Torrent/JSON.hs b/src/Data/Torrent/JSON.hs
deleted file mode 100644
index 845b288a..00000000
--- a/src/Data/Torrent/JSON.hs
+++ /dev/null
@@ -1,56 +0,0 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-module Data.Torrent.JSON
-       ( omitLensPrefix
-       , omitRecordPrefix
-       ) where
-
-import Control.Applicative
-import Data.Aeson.TH
-import Data.Aeson.Types
-import Data.ByteString as BS
-import Data.ByteString.Base16 as Base16
-import Data.Char
-import Data.IP
-import Data.List as L
-import Data.Text.Encoding as T
-
-
--- | Ignore '_' prefix.
-omitLensPrefix :: Options
-omitLensPrefix = defaultOptions
-  { fieldLabelModifier     = L.dropWhile (== '_')
-  , constructorTagModifier = id
-  , allNullaryToStringTag  = True
-  , omitNothingFields      = True
-  }
-
-mapWhile :: (a -> Bool) -> (a -> a) -> [a] -> [a]
-mapWhile p f = go
-  where
-    go []       = []
-    go (x : xs)
-      |    p x    = f x : go xs
-      | otherwise = x : xs
-
-omitRecordPrefix :: Options
-omitRecordPrefix = omitLensPrefix
-  { fieldLabelModifier = mapWhile isUpper toLower . L.dropWhile isLower
-  }
-
-instance ToJSON ByteString where
-  toJSON = String . T.decodeUtf8 . Base16.encode
-
-instance FromJSON ByteString where
-  parseJSON v = do
-    (ok, bad) <- (Base16.decode . T.encodeUtf8) <$> parseJSON v
-    if BS.null bad
-      then return ok
-      else fail   "parseJSON: unable to decode ByteString"
-
-instance ToJSON IP where
-  toJSON = toJSON . show
-
-instance FromJSON IP where
-  parseJSON v = do
-    str <- parseJSON v
-    return $ read str
diff --git a/src/Data/Torrent/Layout.hs b/src/Data/Torrent/Layout.hs
index ef8d45eb..cc529840 100644
--- a/src/Data/Torrent/Layout.hs
+++ b/src/Data/Torrent/Layout.hs
@@ -64,8 +64,6 @@ module Data.Torrent.Layout
 import Control.Applicative
 import Control.DeepSeq
 import Control.Lens
-import Data.Aeson.TH
-import Data.Aeson.Types (FromJSON, ToJSON)
 import Data.BEncode
 import Data.BEncode.Types
 import Data.ByteString as BS
@@ -82,8 +80,6 @@ import Text.PrettyPrint.Class
 import System.FilePath
 import System.Posix.Types
 
-import Data.Torrent.JSON
-
 {-----------------------------------------------------------------------
 --  File attribytes
 -----------------------------------------------------------------------}
@@ -91,8 +87,6 @@ import Data.Torrent.JSON
 -- | Size of a file in bytes.
 type FileSize = FileOffset
 
-deriving instance FromJSON FileOffset
-deriving instance ToJSON   FileOffset
 deriving instance BEncode  FileOffset
 
 {-----------------------------------------------------------------------
@@ -125,8 +119,6 @@ data FileInfo a = FileInfo {
                , Functor, Foldable
                )
 
-$(deriveJSON omitRecordPrefix ''FileInfo)
-
 makeLensesFor
   [ ("fiLength", "fileLength")
   , ("fiMD5Sum", "fileMD5Sum")
@@ -210,8 +202,6 @@ data LayoutInfo
     , liDirName  :: !ByteString
     } deriving (Show, Read, Eq, Typeable)
 
-$(deriveJSON omitRecordPrefix ''LayoutInfo)
-
 makeLensesFor
   [ ("liFile"   , "singleFile" )
   , ("liFiles"  , "multiFile"  )
diff --git a/src/Data/Torrent/Piece.hs b/src/Data/Torrent/Piece.hs
index 03335819..d4b2c399 100644
--- a/src/Data/Torrent/Piece.hs
+++ b/src/Data/Torrent/Piece.hs
@@ -47,8 +47,6 @@ module Data.Torrent.Piece
 import Control.DeepSeq
 import Control.Lens
 import qualified Crypto.Hash.SHA1 as SHA1
-import Data.Aeson (ToJSON(..), FromJSON(..), Value(..), withText)
-import Data.Aeson.TH
 import Data.BEncode
 import Data.BEncode.Types
 import Data.Bits
@@ -63,8 +61,6 @@ import Data.Typeable
 import Text.PrettyPrint
 import Text.PrettyPrint.Class
 
-import Data.Torrent.JSON
-
 
 -- TODO add torrent file validation
 class Lint a where
@@ -139,8 +135,6 @@ data Piece a = Piece
   , pieceData  :: !a
   } deriving (Show, Read, Eq, Functor, Typeable)
 
-$(deriveJSON omitRecordPrefix ''Piece)
-
 instance NFData (Piece a)
 
 -- | Payload bytes are omitted.
@@ -163,14 +157,6 @@ hashPiece Piece {..} = SHA1.hashlazy pieceData
 newtype HashList = HashList { unHashList :: ByteString }
   deriving (Show, Read, Eq, BEncode, Typeable)
 
--- | Represented as base64 encoded JSON string.
-instance ToJSON HashList where
-  toJSON (HashList bs) = String $ T.decodeUtf8 $ Base64.encode bs
-
-instance FromJSON HashList where
-  parseJSON = withText "HashArray" $
-    either fail (return . HashList) . Base64.decode . T.encodeUtf8
-
 -- | Empty hash list.
 instance Default HashList where
   def = HashList ""
@@ -184,8 +170,6 @@ data PieceInfo = PieceInfo
     -- ^ Concatenation of all 20-byte SHA1 hash values.
   } deriving (Show, Read, Eq, Typeable)
 
-$(deriveJSON omitRecordPrefix ''PieceInfo)
-
 -- | Number of bytes in each piece.
 makeLensesFor [("piPieceLength", "pieceLength")] ''PieceInfo
 
diff --git a/src/Data/Torrent/Progress.hs b/src/Data/Torrent/Progress.hs
index ffcbf2aa..4719020a 100644
--- a/src/Data/Torrent/Progress.hs
+++ b/src/Data/Torrent/Progress.hs
@@ -36,7 +36,6 @@ module Data.Torrent.Progress
 
 import Control.Applicative
 import Control.Lens hiding ((%=))
-import Data.Aeson.TH
 import Data.ByteString.Lazy.Builder  as BS
 import Data.ByteString.Lazy.Builder.ASCII as BS
 import Data.Default
@@ -49,8 +48,6 @@ import Network.HTTP.Types.QueryLike
 import Text.PrettyPrint as PP
 import Text.PrettyPrint.Class
 
-import Data.Torrent.JSON
-
 
 -- | Progress data is considered as dynamic within one client
 -- session. This data also should be shared across client application
@@ -64,7 +61,6 @@ data Progress = Progress
   } deriving (Show, Read, Eq)
 
 $(makeLenses ''Progress)
-$(deriveJSON omitLensPrefix ''Progress)
 
 -- | UDP tracker compatible encoding.
 instance Serialize Progress where