adblock2privoxy 1.3.1 → 1.3.2

raw patch · 5 files changed

+16/−8 lines, 5 files

Files

• adblock2privoxy.cabal +2/−2
• distribution/rpmbuild/SPECS/adblock2privoxy.spec +3/−3
• man/man1/adblock2privoxy.1 +1/−1
• src/ElementBlocker.hs +1/−1
• src/Main.hs +9/−1

@@ -1,5 +1,5 @@ name:                adblock2privoxy-version:             1.3.1+version:             1.3.2 cabal-version:       >= 1.10 build-type:          Simple tested-with:         @@ -98,4 +98,4 @@   type:      git   location:  ​http://projects.zubr.me/adblock2privoxy.git   subdir:    adblock2privoxy-  tag:       1.3.1+  tag:       1.3.2

@@ -1,11 +1,11 @@ Name:    adblock2privoxy-Version: 1.3.1+Version: 1.3.2 Release: 1%{?dist} Summary: Convert adblock config files to privoxy format  License: GPL-3 URL:     https://projects.zubr.me/wiki/adblock2privoxy-Source0: http://hackage.haskell.org/package/adblock2privoxy-1.3.1/adblock2privoxy-1.3.1.tar.gz+Source0: http://hackage.haskell.org/package/adblock2privoxy-1.3.2/adblock2privoxy-1.3.2.tar.gz Vendor:  Alexey Zubritskiy <adblock2privoxy@zubr.me> Group:   Web @@ -67,5 +67,5 @@   %changelog-* Mon Jan 05 2015 Alexey Zubritskiy <adblock2privoxy@zubr.me> - 1.3.1+* Sat Feb 07 2015 Alexey Zubritskiy <adblock2privoxy@zubr.me> - 1.3.2 - Rpm release for new version (generated from cabal file)

@@ -1,4 +1,4 @@-.TH "ADBLOCK2PRIVOXY" "1" "2015\-01\-05" "adblock2privoxy 1.3.1" "General Commands Manual"+.TH "ADBLOCK2PRIVOXY" "1" "2015\-02\-07" "adblock2privoxy 1.3.2" "General Commands Manual" .SH ADBLOCK2PRIVOXY .PP \f[B]Convert adblock config files to privoxy format\f[]

@@ -8,7 +8,7 @@ import qualified Data.Map as Map import Data.Maybe import Utils-import System.IO hiding (hGetContents)+import System.IO import System.FilePath import Data.List  import System.Directory

@@ -16,12 +16,20 @@ import Data.Text.Lazy (unpack) import Network.Socket import System.Directory+import System.IO +    getResponse :: String -> IO String getResponse url = do         putStrLn $ "load " ++ url ++ "..."         withSocketsDo $ unpack . decodeUtf8 <$> simpleHttp url+        +getFileContent :: String -> IO String+getFileContent url = do+    handle <- openFile url ReadMode +    hSetEncoding handle utf8+    hGetContents handle  processSources :: Options -> String -> [SourceInfo]-> IO () processSources options taskFile sources = do @@ -40,7 +48,7 @@         parseSource sourceInfo = do             let                  url = _url sourceInfo-                loader = if isURI url then getResponse else readFile+                loader = if isURI url then getResponse else getFileContent             putStrLn $ "process " ++ url             text <- loader url             now <- getCurrentTime