X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FUtils.hs;h=9cc06984440e09a9d7afe2ec12411f550d1a1f56;hb=88747f2;hp=9f2873c9ae328d626d9679b2ac0c777750c1e50e;hpb=3c5211253dc61c31196a47486c538b64c32d8c5e;p=Rakka.git

diff --git a/Rakka/Utils.hs b/Rakka/Utils.hs
index 9f2873c..9cc0698 100644
--- a/Rakka/Utils.hs
+++ b/Rakka/Utils.hs
@@ -1,79 +1,98 @@
+{-# LANGUAGE
+    Arrows
+  , UnicodeSyntax
+  #-}
 module Rakka.Utils
     ( yesOrNo
+    , trueOrFalse
     , parseYesOrNo
     , maybeA
     , deleteIfEmpty
-    , formatW3CDateTime
     , chomp
+    , guessMIMEType
+    , isSafeChar
+    , mkQueryString
     )
     where
+import qualified Codec.Binary.Url as Url
+import Control.Arrow
+import Control.Arrow.ArrowList
+import qualified Data.ByteString as BS
+import qualified Data.ByteString.Lazy as LS
+import qualified Data.ByteString.Lazy.Char8 as L8
+import Data.List
+import qualified Data.Text as T
+import Data.Text.Encoding
+import Network.HTTP.Lucu
+import Network.URI
+import Prelude.Unicode
+import System.IO.Unsafe
 
-import           Control.Arrow
-import           Control.Arrow.ArrowList
-import           System.Time
-import           Text.Printf
 
-
-yesOrNo :: Bool -> String
+yesOrNo ∷ Bool → String
 yesOrNo True  = "yes"
 yesOrNo False = "no"
 
 
-parseYesOrNo :: ArrowChoice a => a String Bool
+trueOrFalse ∷ Bool → String
+trueOrFalse True  = "true"
+trueOrFalse False = "false"
+
+
+parseYesOrNo ∷ ArrowChoice a => a String Bool
 parseYesOrNo 
-    = proc str -> do case str of
-                       "yes" -> returnA -< True
-                       "no"  -> returnA -< False
-                       _     -> returnA -< error ("Expected yes or no: " ++ str)
+    = proc str → do case str of
+                       "yes" → returnA -< True
+                       "no"  → returnA -< False
+                       _     → returnA -< error ("Expected yes or no: " ⧺ str)
 
 
-maybeA :: (ArrowList a, ArrowChoice a) => a b c -> a b (Maybe c)
+maybeA ∷ (ArrowList a, ArrowChoice a) => a b c → a b (Maybe c)
 maybeA a = listA a
            >>>
-           proc xs -> case xs of
-                        []    -> returnA -< Nothing
-                        (x:_) -> returnA -< Just x
+           proc xs → case xs of
+                        []    → returnA -< Nothing
+                        (x:_) → returnA -< Just x
 
 
-deleteIfEmpty :: (ArrowList a, ArrowChoice a) => a String String
+deleteIfEmpty ∷ (ArrowList a, ArrowChoice a) => a String String
 deleteIfEmpty
-    = proc str -> do case str of
-                       "" -> none    -< ()
-                       _  -> returnA -< str
+    = proc str → do case str of
+                       "" → none    -< ()
+                       _  → returnA -< str
 
 
-formatW3CDateTime :: CalendarTime -> String
-formatW3CDateTime time
-    = formatDateTime time ++ formatTimeZone time
-    where
-      formatDateTime :: CalendarTime -> String
-      formatDateTime time
-          = printf "%04d-%02d-%02dT%02d:%02d:%02d"
-            (ctYear time)
-            (fromEnum (ctMonth time) + 1)
-            (ctDay  time)
-            (ctHour time)
-            (ctMin  time)
-            (ctSec  time)
-      
-      formatTimeZone :: CalendarTime -> String
-      formatTimeZone time
-          = case ctTZ time
-            of offset | offset <  0 -> '-':(showTZ $ negate offset)
-                      | offset == 0 -> "Z"
-                      | otherwise   -> '+':(showTZ offset)
-      
-      showTZ :: Int -> String   
-      showTZ offset
-          = let hour = offset `div` 3600
-                min  = (offset - hour * 3600) `div` 60
-            in 
-              show2 hour ++ ":" ++ show2 min
-            
-      show2 :: Int -> String
-      show2 n | n < 10    = '0':(show n)
-              | otherwise = show n
-
-
-chomp :: String -> String
+chomp ∷ String → String
 chomp = reverse . snd . break (/= '\n') . reverse
+
+
+guessMIMEType ∷ LS.ByteString → MIMEType
+guessMIMEType = read . unsafePerformIO . magicString magic . L8.unpack
+    where
+      magic ∷ Magic
+      magic = unsafePerformIO
+              $ do m <- magicOpen [MagicMime]
+                   magicLoadDefault m
+                   return m
+
+
+isSafeChar ∷ Char → Bool
+isSafeChar c
+    | c ≡ '/'           = True
+    | isReserved c      = False
+    | isUnreserved c    = True
+    | otherwise         = False
+
+
+mkQueryString ∷ [(T.Text, T.Text)] → String
+{-# INLINEABLE mkQueryString #-}
+mkQueryString = intercalate ";" ∘ map pairToStr
+    where
+      pairToStr ∷ (T.Text, T.Text) → String
+      {-# INLINE pairToStr #-}
+      pairToStr (k, v)
+          = encode k ⧺ ('=':encode v)
+
+      encode ∷ T.Text → String
+      {-# INLINE encode #-}
+      encode = Url.encode ∘ BS.unpack ∘ encodeUtf8