X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FUtils.hs;h=387cca24a58f16bf3b08f4a63a99e2a3f41aeedc;hb=9bb89434103e9a22f100d6ecb7e65a5d461e0454;hp=12f89965c2358f49920aea5b8d36cfb18823c463;hpb=30fcb38426696db8b80d322196cc594431e30407;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs
index 12f8996..387cca2 100644
--- a/Network/HTTP/Lucu/Utils.hs
+++ b/Network/HTTP/Lucu/Utils.hs
@@ -1,62 +1,79 @@
+{-# LANGUAGE
+    BangPatterns
+  , OverloadedStrings
+  , UnicodeSyntax
+  #-}
 -- |Utility functions used internally in the Lucu httpd. These
 -- functions may be useful too for something else.
 module Network.HTTP.Lucu.Utils
     ( splitBy
     , joinWith
-    , trim
-    , noCaseEq
-    , isWhiteSpace
     , quoteStr
+    , parseWWWFormURLEncoded
     )
     where
-
-import Control.Monad.Trans
-import Data.Char
-import Data.List
-import Foreign
-import Foreign.C
+import Control.Monad
+import Data.Ascii (Ascii, AsciiBuilder)
+import qualified Data.Ascii as A
+import qualified Data.ByteString.Char8 as BS
+import Data.List hiding (last)
+import Data.Monoid.Unicode
 import Network.URI
+import Prelude hiding (last)
+import Prelude.Unicode
 
 -- |> splitBy (== ':') "ab:c:def"
 --  > ==> ["ab", "c", "def"]
-splitBy :: (a -> Bool) -> [a] -> [[a]]
-splitBy isSeparator src
-    = case break isSeparator src
-      of (last , []      ) -> last  : []
-         (first, sep:rest) -> first : splitBy isSeparator rest
+splitBy ∷ (a → Bool) → [a] → [[a]]
+splitBy isSep src
+    = case break isSep src
+      of (last , []       ) → [last]
+         (first, _sep:rest) → first : splitBy isSep rest
 
--- |> joinWith ':' ["ab", "c", "def"]
+-- |> joinWith ":" ["ab", "c", "def"]
 --  > ==> "ab:c:def"
-joinWith :: [a] -> [[a]] -> [a]
-joinWith separator xs
-    = foldr (++) [] $ intersperse separator xs
-
--- |> trim (== '_') "__ab_c__def___"
---  > ==> "ab_c__def"
-trim :: (a -> Bool) -> [a] -> [a]
-trim p = trimTail . trimHead
+joinWith ∷ Ascii → [Ascii] → AsciiBuilder
+{-# INLINEABLE joinWith #-}
+joinWith sep = flip go (∅)
     where
-      trimHead = dropWhile p
-      trimTail = reverse . trimHead . reverse
-
--- |@'noCaseEq' a b@ is equivalent to @(map toLower a) == (map toLower
--- b)@
-noCaseEq :: String -> String -> Bool
-noCaseEq a b
-    = (map toLower a) == (map toLower b)
-
--- |@'isWhiteSpace' c@ is True iff c is one of SP, HT, CR and LF.
-isWhiteSpace :: Char -> Bool
-isWhiteSpace = flip elem " \t\r\n"
+      go ∷ [Ascii] → A.AsciiBuilder → A.AsciiBuilder
+      {-# INLINE go #-}
+      go []     ab = ab
+      go (x:[]) ab = ab ⊕ A.toAsciiBuilder x
+      go (x:xs) ab = go xs ( ab ⊕
+                             A.toAsciiBuilder sep ⊕
+                             A.toAsciiBuilder x )
 
 -- |> quoteStr "abc"
 --  > ==> "\"abc\""
 --
 --  > quoteStr "ab\"c"
 --  > ==> "\"ab\\\"c\""
-quoteStr :: String -> String
-quoteStr str = foldr (++) "" (["\""] ++ map quote str ++ ["\""])
+quoteStr ∷ Ascii → AsciiBuilder
+quoteStr str = A.toAsciiBuilder "\"" ⊕
+               go (A.toByteString str) (∅) ⊕
+               A.toAsciiBuilder "\""
     where
-      quote :: Char -> String
-      quote '"' = "\\\""
-      quote c   = [c]
\ No newline at end of file
+      go ∷ BS.ByteString → AsciiBuilder → AsciiBuilder
+      go bs ab
+          = case BS.break (≡ '"') bs of
+              (x, y)
+                  | BS.null y → ab ⊕ b2ab x
+                  | otherwise → go (BS.tail y) (ab ⊕ b2ab x
+                                                   ⊕ A.toAsciiBuilder "\\\"")
+
+      b2ab ∷ BS.ByteString → AsciiBuilder
+      b2ab = A.toAsciiBuilder ∘ A.unsafeFromByteString
+
+-- |> parseWWWFormURLEncoded "aaa=bbb&ccc=ddd"
+--  > ==> [("aaa", "bbb"), ("ccc", "ddd")]
+parseWWWFormURLEncoded ∷ String → [(String, String)]
+parseWWWFormURLEncoded src
+    | src == "" = []
+    | otherwise = do pairStr <- splitBy (\ c → c == ';' || c == '&') src
+                     let (key, value) = break (== '=') pairStr
+                     return ( unEscapeString key
+                            , unEscapeString $ case value of
+                                                 ('=':val) → val
+                                                 val       → val
+                            )