Rakka.Utils: done

Ditz-issue: 1c6bfe78f0f9ebd241b8650eb62939dc932cd6f0

diff --git a/Rakka.cabal b/Rakka.cabal
index 09d8c1596cce75721fa49f5a3d9c5a9f613d9fb4..571eba4ea8c4d9d43fcf755c41db50fa29bc18f4 100644 (file)
--- a/Rakka.cabal
+++ b/Rakka.cabal
@@ -9,6 +9,7 @@ Author:        PHO <pho at cielonegro dot org>
 Maintainer:    PHO <pho at cielonegro dot org>
 Stability:     experimental
 Homepage:      http://rakka.cielonegro.org/
 Maintainer:    PHO <pho at cielonegro dot org>
 Stability:     experimental
 Homepage:      http://rakka.cielonegro.org/

+Bug-Reports:   http://static.cielonegro.org/ditz/Rakka/

 Category:      Web
 Tested-With:   GHC == 6.12.1
 Cabal-Version: >= 1.6
 Category:      Web
 Tested-With:   GHC == 6.12.1
 Cabal-Version: >= 1.6

diff --git a/Rakka/Utils.hs b/Rakka/Utils.hs
index 9cc06984440e09a9d7afe2ec12411f550d1a1f56..7673eb50230bf58fdab4c9c16ea36040b7c70444 100644 (file)
--- a/Rakka/Utils.hs
+++ b/Rakka/Utils.hs
@@ -18,71 +18,71 @@ import qualified Codec.Binary.Url as Url
 import Control.Arrow
 import Control.Arrow.ArrowList
 import qualified Data.ByteString as BS
 import Control.Arrow
 import Control.Arrow.ArrowList
 import qualified Data.ByteString as BS

+import qualified Data.ByteString.Unsafe as BS

 import qualified Data.ByteString.Lazy as LS
 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 Data.List
 import qualified Data.Text as T
 import Data.Text.Encoding

+import Magic

 import Network.HTTP.Lucu
 import Network.URI
 import Prelude.Unicode
 import System.IO.Unsafe
 
 import Network.HTTP.Lucu
 import Network.URI
 import Prelude.Unicode
 import System.IO.Unsafe
 

-

 yesOrNo ∷ Bool → String
 yesOrNo True  = "yes"
 yesOrNo False = "no"
 
 yesOrNo ∷ Bool → String
 yesOrNo True  = "yes"
 yesOrNo False = "no"
 

-

 trueOrFalse ∷ Bool → String
 trueOrFalse True  = "true"
 trueOrFalse False = "false"
 
 trueOrFalse ∷ Bool → String
 trueOrFalse True  = "true"
 trueOrFalse False = "false"
 

-
-parseYesOrNo ∷ ArrowChoice a => a String Bool
+parseYesOrNo ∷ ArrowChoice a ⇒ a String Bool

 parseYesOrNo 
     = proc str → do case str of
 parseYesOrNo 
     = proc str → do case str of

-                       "yes" → returnA -< True
-                       "no"  → returnA -< False
-                       _     → returnA -< error ("Expected yes or no: " ⧺ str)
+                       "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
 maybeA a = listA a
            >>>
            proc xs → case xs of

-                        []    → returnA -< Nothing
-                        (x:_) → returnA -< Just x
-
+                        []    → 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
 deleteIfEmpty
     = proc str → do case str of

-                       "" → none    -< ()
-                       _  → returnA -< str
-
+                       "" → none    ⤙ ()
+                       _  → returnA ⤙ str

 
 chomp ∷ String → String
 
 chomp ∷ String → String

-chomp = reverse . snd . break (/= '\n') . reverse
-
+{-# INLINE chomp #-}
+chomp = reverse . snd . break (≢ '\n') . reverse

 
 guessMIMEType ∷ LS.ByteString → MIMEType
 
 guessMIMEType ∷ LS.ByteString → MIMEType

-guessMIMEType = read . unsafePerformIO . magicString magic . L8.unpack
+{-# INLINEABLE guessMIMEType #-}
+guessMIMEType = read
+                ∘ unsafePerformIO
+                ∘ flip BS.unsafeUseAsCStringLen (magicCString magic)
+                ∘ BS.concat
+                ∘ LS.toChunks

     where
       magic ∷ Magic
     where
       magic ∷ Magic

+      {-# NOINLINE magic #-}

       magic = unsafePerformIO
       magic = unsafePerformIO

-              $ do m <- magicOpen [MagicMime]
+              $ do m ← magicOpen [MagicMime]

                    magicLoadDefault m
                    return m
 
                    magicLoadDefault m
                    return m
 

-

 isSafeChar ∷ Char → Bool
 isSafeChar ∷ Char → Bool

+{-# INLINEABLE isSafeChar #-}

 isSafeChar c
 isSafeChar c

-    | c ≡ '/'           = True
-    | isReserved c      = False
-    | isUnreserved c    = True
-    | otherwise         = False
-
+    | c ≡ '/'        = True
+    | isReserved c   = False
+    | isUnreserved c = True
+    | otherwise      = False

 
 mkQueryString ∷ [(T.Text, T.Text)] → String
 {-# INLINEABLE mkQueryString #-}
 
 mkQueryString ∷ [(T.Text, T.Text)] → String
 {-# INLINEABLE mkQueryString #-}