twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-01 04:31:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix escaping of URI

Browse Source
This commit is contained in:
Khudyakov Alexey
2010-04-23 20:47:07 +00:00
parent ceb24fb8b4
commit f7d8eb3fdd
1 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
XMonad/Actions/Search.hs
View File

@@ -56,15 +56,17 @@ module XMonad.Actions.Search ( -- * Usage
-- $tip -- $tip
) where ) where
import Data.Char (chr, ord, isAlpha, isMark, isDigit) import Codec.Binary.UTF8.String (encodeString)
import Data.Char (isAlphaNum, isAscii)
import Data.List (isPrefixOf) import Data.List (isPrefixOf)
import Numeric (showIntAtBase) import Text.Printf
import XMonad (X(), MonadIO, liftIO) import XMonad (X(), MonadIO, liftIO)
import XMonad.Prompt (XPrompt(showXPrompt), mkXPrompt, XPConfig(), historyCompletionP) import XMonad.Prompt (XPrompt(showXPrompt), mkXPrompt, XPConfig(), historyCompletionP)
import XMonad.Prompt.Shell (getBrowser) import XMonad.Prompt.Shell (getBrowser)
import XMonad.Util.Run (safeSpawn) import XMonad.Util.Run (safeSpawn)
import XMonad.Util.XSelection (getSelection) import XMonad.Util.XSelection (getSelection)
{- $usage {- $usage
This module is intended to allow easy access to databases on the This module is intended to allow easy access to databases on the
@@ -198,30 +200,15 @@ data Search = Search Name
instance XPrompt Search where instance XPrompt Search where
showXPrompt (Search name)= "Search [" ++ name ++ "]: " showXPrompt (Search name)= "Search [" ++ name ++ "]: "
-- | Escape the search string so search engines understand it. -- | Escape the search string so search engines understand it. Only
-- Note that everything is escaped; we could be smarter and use 'isAllowedInURI' -- digits and ASCII letters are not encoded. All non ASCII characters
-- but then that'd be hard enough to copy-and-paste we'd need to depend on @network@. -- which are encoded as UTF8
escape :: String -> String escape :: String -> String
escape = escapeURIString (\c -> isAlpha c || isDigit c || isMark c) escape = concatMap escapeURIChar
where -- Copied from Network.URI.
escapeURIString :: escapeURIChar :: Char -> String
(Char -> Bool) -- a predicate which returns 'False' if should escape escapeURIChar c | isAscii c && isAlphaNum c = [c]
-> String -- the string to process | otherwise = concatMap (printf "%%%02X") $ encodeString [c]
-> String -- the resulting URI string
escapeURIString = concatMap . escapeURIChar
escapeURIChar :: (Char->Bool) -> Char -> String
escapeURIChar p c
| p c = [c]
| otherwise = '%' : myShowHex (ord c) ""
where
myShowHex :: Int -> ShowS
myShowHex n r = case showIntAtBase 16 toChrHex n r of
[] -> "00"
[ch] -> ['0',ch]
cs -> cs
toChrHex d
| d < 10 = chr (ord '0' + fromIntegral d)
| otherwise = chr (ord 'A' + fromIntegral (d - 10))
type Browser = FilePath type Browser = FilePath
type Query = String type Query = String
@@ -239,7 +226,8 @@ use (SearchEngine _ engine) = engine
-- | Given a browser, a search engine's transformation function, and a search term, perform the -- | Given a browser, a search engine's transformation function, and a search term, perform the
-- requested search in the browser. -- requested search in the browser.
search :: Browser -> Site -> Query -> X () search :: Browser -> Site -> Query -> X ()
search browser site query = safeSpawn browser [site query] search browser site query = do
safeSpawn browser [site query]
{- | Given a base URL, create the 'SearchEngine' that escapes the query and {- | Given a base URL, create the 'SearchEngine' that escapes the query and
appends it to the base. You can easily define a new engine locally using appends it to the base. You can easily define a new engine locally using