Changes from 0.4 to 0.4.1

[Lucu.git] / examples / HelloWorld.hs

diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs
index f3a36219fbd69fda04fefef40648dc1d5ca98b63..187bd349415539228c5cc425b260551e2ab5aa72 100644 (file)
--- a/examples/HelloWorld.hs
+++ b/examples/HelloWorld.hs
@@ -1,46 +1,39 @@
-import Control.Monad.Trans
-import Data.Maybe
 import Network
-import Network.HTTP.Lucu.Config
-import Network.HTTP.Lucu.ETag
-import Network.HTTP.Lucu.Httpd
-import Network.HTTP.Lucu.MIMEType
-import Network.HTTP.Lucu.MIMEType.Guess
-import Network.HTTP.Lucu.Parser
-import Network.HTTP.Lucu.Parser.Http
-import Network.HTTP.Lucu.Resource
-import Network.HTTP.Lucu.Resource.Tree
-import Network.HTTP.Lucu.Response
-import Network.URI
-import System.Posix.Signals
-import System.Time
+import Network.HTTP.Lucu
 
 main :: IO ()
 main = let config    = defaultConfig { cnfServerPort = PortNumber 9999 }
-           resources = mkResTree [ ([], helloWorld) ]
+           resources = mkResTree [ ( []
+                                   , helloWorld )
+
+                                 , ( ["urandom"]
+                                   , staticFile "/dev/urandom" )
+
+                                 , ( ["inc"]
+                                   , staticDir "/usr/include" )
+                                 ]
+           fallbacks = [ \ path -> case path of
+                                     ["hello"] -> return $ Just helloWorld
+                                     _         -> return Nothing
+                       ]
        in
-         do installHandler sigPIPE Ignore Nothing
-            runHttpd config resources
+         do putStrLn "Access http://localhost:9999/ with your browser."
+            runHttpd config resources fallbacks
 
 
 helloWorld :: ResourceDef
 helloWorld
-    = ResourceDef {
-        resUsesNativeThread = False
-      , resIsGreedy         = False
-      , resGet
-          = Just $ do time <- liftIO $ getClockTime
-                      foundEntity (strongETag "abcde") time
-                      setContentType $ "text" +/+ "hello"
+    = emptyResource {
+        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 $ "text" +/+ "hello"
+                      setContentType $ read "text/hello"
                       output ("[" ++ str1 ++ " - " ++ str2 ++ "#" ++ str3 ++ "]")
-      , resPut    = Nothing
-      , resDelete = Nothing
       }
\ No newline at end of file