Move Data.Torrent to torrent-types library

8 files changed, 107 insertions, 2 deletions

diff --git a/dht/dht-client.cabal b/dht/dht-client.cabal
index 7355bae6..7efc2392 100644
--- a/dht/dht-client.cabal
+++ b/dht/dht-client.cabal
@@ -76,7 +76,6 @@ library
                     Data.Digest.CRC32C
                     Data.Bits.ByteString
                     Data.TableMethods
-                    Data.Torrent
                     Network.BitTorrent.DHT.ContactInfo
                     Network.BitTorrent.DHT.Token
                     Network.QueryResponse
@@ -222,6 +221,7 @@ library
                     , minmax-psq
                     , kad
                     , tasks
+                    , torrent-types
 
   if impl(ghc < 8)
       Build-depends:  transformers
diff --git a/torrent-types/CHANGELOG.md b/torrent-types/CHANGELOG.md
new file mode 100644
index 00000000..ef14ae8c
--- /dev/null
+++ b/torrent-types/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for torrents
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/torrent-types/LICENSE b/torrent-types/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/torrent-types/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/torrent-types/Setup.hs b/torrent-types/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/torrent-types/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/torrent-types/src/Data/.Torrent.hs.swo b/torrent-types/src/Data/.Torrent.hs.swo
new file mode 100644
index 00000000..9f06d911
--- /dev/null
+++ b/torrent-types/src/Data/.Torrent.hs.swo
diff --git a/torrent-types/src/Data/.Torrent.hs.swp b/torrent-types/src/Data/.Torrent.hs.swp
new file mode 100644
index 00000000..0aecaad6
--- /dev/null
+++ b/torrent-types/src/Data/.Torrent.hs.swp
diff --git a/dht/src/Data/Torrent.hs b/torrent-types/src/Data/Torrent.hs
index 32c709be..a1eb286c 100644
--- a/dht/src/Data/Torrent.hs
+++ b/torrent-types/src/Data/Torrent.hs
@@ -28,6 +28,8 @@
 {-# LANGUAGE DeriveFoldable             #-}
 {-# LANGUAGE DeriveTraversable          #-}
 {-# LANGUAGE TemplateHaskell            #-}
+{-# LANGUAGE RecordWildCards            #-}
+{-# LANGUAGE OverloadedStrings          #-}
 {-# OPTIONS -fno-warn-orphans           #-}
 module Data.Torrent
        ( -- * InfoHash
@@ -203,6 +205,15 @@ import Text.PrettyPrint as PP
 import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
 import System.FilePath
 import System.Posix.Types
+#ifdef USE_lens
+#ifdef VERSION_lens
+import Control.Lens.TH
+#elif defined(VERSION_microlens_th)
+import Lens.Micro.TH
+#elif defined(VERSION_lens_family_th)
+import Lens.Family.TH
+#endif
+#endif
 
 import Network.Address
 
@@ -626,6 +637,7 @@ toPow2 :: Int -> Int
 #ifdef VERSION_bits_extras
 toPow2 x = bit $ fromIntegral (leadingZeros (0 :: Int) - leadingZeros x)
 #else
+-- base >= 4.8.0.0
 toPow2 x = bit $ fromIntegral (countLeadingZeros (0 :: Int) - countLeadingZeros x)
 #endif
 
@@ -782,7 +794,7 @@ data InfoDict = InfoDict
     --   BEP 27: <http://www.bittorrent.org/beps/bep_0027.html>
   } deriving (Show, Read, Eq, Typeable)
 
-#ifdef VERISON_lens
+#ifdef USE_lens
 makeLensesFor
   [ ("idInfoHash"  , "infohash"  )
   , ("idLayoutInfo", "layoutInfo")
@@ -944,6 +956,11 @@ instance BEncode POSIXTime where
 instance {-# OVERLAPPING #-} BEncode String where
   toBEncode = toBEncode . T.pack
   fromBEncode v = T.unpack <$> fromBEncode v
+{-
+instance {-# OVERLAPPING #-} BEncode HostName where
+  toBEncode = toBEncode . T.pack
+  fromBEncode v = T.unpack <$> fromBEncode v
+-}
 
 instance BEncode Torrent where
   toBEncode Torrent {..} = toDict $
diff --git a/torrent-types/torrent-types.cabal b/torrent-types/torrent-types.cabal
new file mode 100644
index 00000000..c5939983
--- /dev/null
+++ b/torrent-types/torrent-types.cabal
@@ -0,0 +1,51 @@
+cabal-version:       >=1.10
+-- Initial package description 'torrents.cabal' generated by 'cabal init'.
+--   For further documentation, see http://haskell.org/cabal/users-guide/
+
+name:                torrent-types
+version:             0.1.0.0
+-- synopsis:
+-- description:
+-- bug-reports:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+
+library
+  exposed-modules:     Data.Torrent
+  -- other-modules:
+  other-extensions:    CPP, NamedFieldPuns, FlexibleInstances, MultiParamTypeClasses, BangPatterns, GeneralizedNewtypeDeriving, StandaloneDeriving, DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, TemplateHaskell
+  build-depends:
+      base
+    , deepseq
+    , memory
+    , bytestring
+    , base16-bytestring
+    , base64-bytestring
+    , hashable
+    , containers
+    , text
+    , time
+    , network < 2.7
+    , network-addr
+    , data-default
+    , network-uri
+    , cereal
+    , convertible
+    , pretty
+    , filepath
+    , base32-bytestring
+    , http-types
+    , cryptonite
+    , bencoding
+    , bits
+    , microlens-th
+  cpp-options: -DUSE_lens
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+