Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:ozataman/shpider

Conflicts:
	Network/Shpider/State.hs
  • Loading branch information...
commit fef8551350617a39d2e6dd26a4ec44550f9600ac 2 parents 014e2d4 + 22dda06
@mightybyte mightybyte authored
Showing with 18 additions and 17 deletions.
  1. +17 −16 Network/Shpider/State.hs
  2. +1 −1  shpider.cabal
View
33 Network/Shpider/State.hs
@@ -26,7 +26,8 @@
-- | This module describes the state of shpider computations, and provides a monad transformer over it.
module Network.Shpider.State
- ( ShpiderState (..)
+ ( module Control.Monad.State.Strict
+ , ShpiderState (..)
, Page (..)
, Shpider
, emptyPage
@@ -37,19 +38,19 @@ module Network.Shpider.State
)
where
-import Control.Monad.State
-import Control.Monad.Trans.Maybe
-import qualified Data.Map as M
-import Data.Map (Map, (!))
-import Data.Maybe
-import Data.Time
-import Data.Word
-import Network.Curl
-import Network.Shpider.Forms
-import Network.Shpider.Links
-import System.Directory
-import System.FilePath.Posix
-import Text.HTML.TagSoup.Parsec
+import Control.Monad.State.Strict
+import Control.Monad.Trans.Maybe
+import qualified Data.Map as M
+import Data.Map (Map, (!))
+import Data.Maybe
+import Data.Time
+import Data.Word
+import Network.Curl
+import Network.Shpider.Forms
+import Network.Shpider.Links
+import System.Directory
+import System.FilePath.Posix
+import Text.HTML.TagSoup.Parsec
-- | The shpider state holds all the options for shpider transactions, the current page and all the `CurlOption`s used when calling curl.
@@ -63,12 +64,12 @@ data ShpiderState =
, downloadThrottle :: Maybe Int
-- ^ Whether to wait at least N micro-seconds between downloads
-- or form submissions. Defaults to 'Nothing'.
- , lastDownloadTime :: Maybe UTCTime
+ , lastDownloadTime :: !(Maybe UTCTime)
, pageFilenames :: Map String String
, offlineMode :: Bool
, pageSaveDir :: Maybe FilePath
- , pageCount :: Word64
+ , pageCount :: !Word64
}
deriving Show
View
2  shpider.cabal
@@ -1,5 +1,5 @@
Name: shpider
-Version: 0.2.1.1
+Version: 0.2.2.0
Synopsis: Web automation library in Haskell.
Description:
Shpider is a web automation library for Haskell. It allows you to quickly
Please sign in to comment.
Something went wrong with that request. Please try again.