s434708/twilight-library-s434708
1
0
Fork 0
forked from filipg/twilight-library
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'withcurl' of git://gonito.net/twilight-library

Browse Source
This commit is contained in:
Łukasz Jędyk 2021-04-11 15:02:15 +02:00
commit 27d91d8817
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ShadowLibrary/Core.hs
View File

@ -33,7 +33,7 @@ import Data.Tree.NTree.TypeDefs
import Data.Maybe import Data.Maybe
import Control.Monad.Trans import Control.Monad.Trans
import Text.XML.HXT.XPath import Text.XML.HXT.XPath
-- import Text.XML.HXT.Curl import Text.XML.HXT.Curl
import Text.XML.HXT.HTTP import Text.XML.HXT.HTTP
import Text.Regex.TDFA import Text.Regex.TDFA
@ -64,8 +64,8 @@ downloadDocument = readFromDocument [withParseHTML yes,
withEncodingErrors no, withEncodingErrors no,
withPreserveComment yes, withPreserveComment yes,
withStrictInput yes, withStrictInput yes,
withHTTP [] -- withHTTP []
-- withCurl [("curl--user-agent","AMU Digital Libraries Indexing Agent")] withCurl [("curl--user-agent","AMU Digital Libraries Indexing Agent")]
] ]
downloadDocumentWithEncoding enc = readFromDocument [withParseHTML yes, downloadDocumentWithEncoding enc = readFromDocument [withParseHTML yes,
@ -73,13 +73,13 @@ downloadDocumentWithEncoding enc = readFromDocument [withParseHTML yes,
withEncodingErrors no, withEncodingErrors no,
withPreserveComment yes, withPreserveComment yes,
withInputEncoding enc, withInputEncoding enc,
withHTTP []] -- withHTTP []]
-- withCurl []] withCurl []]
downloadXmlDocument = readFromDocument [withWarnings no, downloadXmlDocument = readFromDocument [withWarnings no,
withEncodingErrors no, withEncodingErrors no,
withHTTP []] -- withHTTP []]
-- withCurl [] ] withCurl [] ]
data ShadowLibrary = ShadowLibrary { logoUrl :: Maybe String, data ShadowLibrary = ShadowLibrary { logoUrl :: Maybe String,

2
app/almanachmuszyny.hs
View File

@ -4,7 +4,7 @@ import ShadowLibrary.Core
import Text.XML.HXT.Core import Text.XML.HXT.Core
import Text.XML.HXT.XPath import Text.XML.HXT.XPath
-- import Text.XML.HXT.Curl --import Text.XML.HXT.Curl
import Data.List import Data.List
import Data.List.Utils (replace) import Data.List.Utils (replace)

2
shadow-library.cabal
View File

@ -20,6 +20,7 @@ library
, HTTP , HTTP
, hxt , hxt
, hxt-http , hxt-http
, hxt-curl
, hxt-xpath , hxt-xpath
, MissingH , MissingH
, monad-logger , monad-logger
@ -54,6 +55,7 @@ executable almanachmuszyny
build-depends: base build-depends: base
, hxt , hxt
, hxt-xpath , hxt-xpath
, hxt-curl
, MissingH , MissingH
, regex-posix , regex-posix
, shadow-library , shadow-library