X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=examples%2FHelloWorld.hs;h=2d240e8bb8bb0b751cdaf1d56a76c24b159dd82f;hb=950640dd241222203778f8167943d30fa52f356a;hp=ad1263b530f133bde94f061b07e578fc212739a8;hpb=11c3854540c46bfcd9e88c2164ed554f3b6550a5;p=Lucu.git

diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs
index ad1263b..2d240e8 100644
--- a/examples/HelloWorld.hs
+++ b/examples/HelloWorld.hs
@@ -1,39 +1,48 @@
+{-# LANGUAGE
+    OverloadedStrings
+  , QuasiQuotes
+  , UnicodeSyntax
+  #-}
+import Control.Applicative
+import Control.Monad.Unicode
+import qualified Data.ByteString.Lazy.Char8 as Lazy
+import qualified Data.Collections as C
+import Data.Monoid.Unicode
 import Network
 import Network.HTTP.Lucu
+import Prelude.Unicode
 
-main :: IO ()
-main = let config    = defaultConfig { cnfServerPort = PortNumber 9999 }
-           resources = mkResTree [ ( []
-                                   , helloWorld )
-
-                                 , ( ["urandom"]
-                                   , staticFile "/dev/urandom" )
-
-                                 , ( ["inc"]
-                                   , staticDir "/usr/include" )
-                                 ]
+main ∷ IO ()
+main = let config    = defaultConfig { cnfServerPort = "9999" }
+           mapper    = resourceMap resources ⊕ resourceMap fallbacks
+           resources ∷ ResourceTree
+           resources = C.fromList
+                       [ ([]          , nonGreedy helloWorld)
+                       , (["urandom" ], nonGreedy $ staticFile "/dev/urandom")
+                       , (["inc"     ], greedy    $ staticDir  "/usr/include")
+                       , (["inc", "t"], nonGreedy $ staticFile "/usr/include/time.h")
+                       ]
+           fallbacks ∷ Path → Maybe (Path, Resource)
+           fallbacks path
+               | path ≡ ["hello"] = Just (path, helloWorld)
+               | otherwise        = Nothing
        in
-         runHttpd config resources
-
+         do putStrLn "Access http://localhost:9999/ with your browser."
+            withSocketsDo $ runHttpd config mapper
 
-helloWorld :: ResourceDef
-helloWorld
-    = ResourceDef {
-        resUsesNativeThread = False
-      , resIsGreedy         = False
-      , resGet
-          = Just $ do --time <- liftIO $ getClockTime
-                      --foundEntity (strongETag "abcde") time
-                      setContentType $ read "text/hello"
-                      outputChunk "Hello, "
-                      outputChunk "World!\n"
-      , resHead   = Nothing
-      , resPost
-          = Just $ do str1 <- inputChunk 3
-                      str2 <- inputChunk 3
-                      str3 <- inputChunk 3
-                      setContentType $ read "text/hello"
-                      output ("[" ++ str1 ++ " - " ++ str2 ++ "#" ++ str3 ++ "]")
-      , resPut    = Nothing
-      , resDelete = Nothing
-      }
\ No newline at end of file
+helloWorld ∷ Resource
+helloWorld = C.fromList
+             [ ( GET
+               , do setContentType [mimeType| text/hello |]
+                    putChunk "Hello, "
+                    putChunk "World!\n"
+                    putChunks =≪ Lazy.pack <$> getRemoteAddr'
+               )
+             , ( POST
+               , do str1 ← getChunk 3
+                    str2 ← getChunk 3
+                    str3 ← getChunk 3
+                    setContentType [mimeType| text/hello |]
+                    putChunks $ Lazy.fromChunks ["[", str1, " - ", str2, "#", str3, "]"]
+               )
+             ]