Changeset 126bdbc in adblock2privoxy


Ignore:
Timestamp:
Feb 7, 2015 11:38:09 PM (5 years ago)
Author:
Alexey Zubritskiy <a.zubritskiy@…>
Branches:
master
Children:
fcb4d77
Parents:
18729f8
Message:

encoding fix and new cabal lib compatibility

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • adblock2privoxy-utils/launches/adblock2privoxy (no args).launch

    r6bfb8d3 r126bdbc  
    33<stringAttribute key="PROJECT_NAME" value="adblock2privoxy"/> 
    44<stringAttribute key="STANZA" value="adblock2privoxy"/> 
    5 <stringAttribute key="WORKING_DIRECTORY" value="/mnt/data/Projects/adblock2privoxy/adblock2privoxy"/> 
     5<stringAttribute key="WORKING_DIRECTORY" value="/home/alexey/Projects/adblock2privoxy/adblock2privoxy"/> 
    66<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> 
    77<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> 
  • adblock2privoxy-utils/launches/adblock2privoxy (run file use task).launch

    rb4685e7 r126bdbc  
    44<stringAttribute key="PROJECT_NAME" value="adblock2privoxy"/> 
    55<stringAttribute key="STANZA" value="adblock2privoxy"/> 
    6 <stringAttribute key="WORKING_DIRECTORY" value="/mnt/data/Projects/adblock2privoxy/adblock2privoxy"/> 
     6<stringAttribute key="WORKING_DIRECTORY" value="/home/alexey/Projects/adblock2privoxy/adblock2privoxy"/> 
    77<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> 
    88<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> 
  • adblock2privoxy-utils/launches/adblock2privoxy (run file).launch

    rff7ee56 r126bdbc  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    22<launchConfiguration type="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableHaskellLaunchDelegate"> 
    3 <stringAttribute key="EXTRA_ARGUMENTS" value="-p ../.out/privoxy -w ../.out/web  ../.data/cntblock.txt"/> 
     3<stringAttribute key="EXTRA_ARGUMENTS" value="-p ../.out/privoxy -w ../.out/web  -d tst.zu ../.data/easylist.txt"/> 
    44<stringAttribute key="PROJECT_NAME" value="adblock2privoxy"/> 
    55<stringAttribute key="STANZA" value="adblock2privoxy"/> 
    6 <stringAttribute key="WORKING_DIRECTORY" value="/mnt/data/Projects/adblock2privoxy/adblock2privoxy"/> 
     6<stringAttribute key="WORKING_DIRECTORY" value="/home/alexey/Projects/adblock2privoxy/adblock2privoxy"/> 
    77<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> 
    88<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> 
  • adblock2privoxy-utils/launches/adblock2privoxy (run web).launch

    r18729f8 r126bdbc  
    44<stringAttribute key="PROJECT_NAME" value="adblock2privoxy"/> 
    55<stringAttribute key="STANZA" value="adblock2privoxy"/> 
    6 <stringAttribute key="WORKING_DIRECTORY" value="/mnt/data/Projects/adblock2privoxy/adblock2privoxy"/> 
     6<stringAttribute key="WORKING_DIRECTORY" value="/home/alexey/Projects/adblock2privoxy/adblock2privoxy"/> 
    77<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> 
    88<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> 
  • adblock2privoxy-utils/launches/adblock2privoxy (task run).launch

    rff7ee56 r126bdbc  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    22<launchConfiguration type="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableHaskellLaunchDelegate"> 
    3 <stringAttribute key="EXTRA_ARGUMENTS" value="-d -t ../.out/privoxy/ab2p.task -f"/> 
     3<stringAttribute key="EXTRA_ARGUMENTS" value="-t ../.out/privoxy/ab2p.task -f"/> 
    44<stringAttribute key="PROJECT_NAME" value="adblock2privoxy"/> 
    55<stringAttribute key="STANZA" value="adblock2privoxy"/> 
    6 <stringAttribute key="WORKING_DIRECTORY" value="/mnt/data/Projects/adblock2privoxy/adblock2privoxy"/> 
     6<stringAttribute key="WORKING_DIRECTORY" value="/home/alexey/Projects/adblock2privoxy/adblock2privoxy"/> 
    77<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> 
    88<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> 
  • adblock2privoxy-utils/launches/adblock2privoxy-utils.launch

    r828fba4 r126bdbc  
    44<stringAttribute key="PROJECT_NAME" value="adblock2privoxy-utils"/> 
    55<stringAttribute key="STANZA" value="adblock2privoxy-utils"/> 
    6 <stringAttribute key="WORKING_DIRECTORY" value="/mnt/data/Projects/adblock2privoxy/adblock2privoxy"/> 
     6<stringAttribute key="WORKING_DIRECTORY" value="/home/alexey/Projects/adblock2privoxy/adblock2privoxy"/> 
    77<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> 
    88<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> 
  • adblock2privoxy-utils/src/RpmSpec.hs

    r18729f8 r126bdbc  
    6969        ## "%files" 
    7070        ## "%doc %{_mandir}" 
    71         ## "%doc " # (unwords <$> licenseFiles) # " "  
     71        ## "%doc " # (licenseFile) # " "  
    7272                   # (unwords <$> filter (not.startswith "man")  
    7373                                 .filter (not.startswith "distribution")  
  • adblock2privoxy/adblock2privoxy.cabal

    r18729f8 r126bdbc  
    11name:                adblock2privoxy 
    2 version:             1.3.1 
     2version:             1.3.2 
    33cabal-version:       >= 1.10 
    44build-type:          Simple 
     
    9999  location:  ​http://projects.zubr.me/adblock2privoxy.git 
    100100  subdir:    adblock2privoxy 
    101   tag:       1.3.1 
     101  tag:       1.3.2 
  • adblock2privoxy/distribution/rpmbuild/SPECS/adblock2privoxy.spec

    r18729f8 r126bdbc  
    11Name:    adblock2privoxy 
    2 Version: 1.3.1 
     2Version: 1.3.2 
    33Release: 1%{?dist} 
    44Summary: Convert adblock config files to privoxy format 
     
    66License: GPL-3 
    77URL:     https://projects.zubr.me/wiki/adblock2privoxy 
    8 Source0: http://hackage.haskell.org/package/adblock2privoxy-1.3.1/adblock2privoxy-1.3.1.tar.gz 
     8Source0: http://hackage.haskell.org/package/adblock2privoxy-1.3.2/adblock2privoxy-1.3.2.tar.gz 
    99Vendor:  Alexey Zubritskiy <adblock2privoxy@zubr.me> 
    1010Group:   Web 
     
    6868 
    6969%changelog 
    70 * Mon Jan 05 2015 Alexey Zubritskiy <adblock2privoxy@zubr.me> - 1.3.1 
     70* Sat Feb 07 2015 Alexey Zubritskiy <adblock2privoxy@zubr.me> - 1.3.2 
    7171- Rpm release for new version (generated from cabal file) 
  • adblock2privoxy/man/man1/adblock2privoxy.1

    r18729f8 r126bdbc  
    1 .TH "ADBLOCK2PRIVOXY" "1" "2015\-01\-05" "adblock2privoxy 1.3.1" "General Commands Manual" 
     1.TH "ADBLOCK2PRIVOXY" "1" "2015\-02\-07" "adblock2privoxy 1.3.2" "General Commands Manual" 
    22.SH ADBLOCK2PRIVOXY 
    33.PP 
  • adblock2privoxy/src/ElementBlocker.hs

    rb4685e7 r126bdbc  
    99import Data.Maybe 
    1010import Utils 
    11 import System.IO hiding (hGetContents) 
     11import System.IO 
    1212import System.FilePath 
    1313import Data.List  
  • adblock2privoxy/src/Main.hs

    rff7ee56 r126bdbc  
    1717import Network.Socket 
    1818import System.Directory 
     19import System.IO 
     20 
    1921 
    2022   
     
    2325        putStrLn $ "load " ++ url ++ "..." 
    2426        withSocketsDo $ unpack . decodeUtf8 <$> simpleHttp url 
     27         
     28getFileContent :: String -> IO String 
     29getFileContent url = do 
     30    handle <- openFile url ReadMode  
     31    hSetEncoding handle utf8 
     32    hGetContents handle 
    2533 
    2634processSources :: Options -> String -> [SourceInfo]-> IO () 
     
    4149            let  
    4250                url = _url sourceInfo 
    43                 loader = if isURI url then getResponse else readFile 
     51                loader = if isURI url then getResponse else getFileContent 
    4452            putStrLn $ "process " ++ url 
    4553            text <- loader url 
Note: See TracChangeset for help on using the changeset viewer.