X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=examples%2FHelloWorld.hs;h=ec5b542fb91a82fcb7679d35709ca74bca9487dc;hb=72a3e24a952616e32845eeb4fc05048e841c91a2;hp=43e21d2b5e039c89b58e0e973072c02041310dab;hpb=854f6d1709d468f7e1bf0db2dcd2d30de6bd5f5e;p=Lucu.git

diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs
index 43e21d2..ec5b542 100644
--- a/examples/HelloWorld.hs
+++ b/examples/HelloWorld.hs
@@ -1,58 +1,42 @@
-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.HTTP.Lucu.StaticFile
-import Network.URI
-import System.Posix.Signals
-import System.Time
+{-# LANGUAGE
+    OverloadedStrings
+  , UnicodeSyntax
+  #-}
+import Control.Applicative
+import Control.Monad.Unicode
+import qualified Data.ByteString.Lazy.Char8 as Lazy
+import Data.Monoid.Unicode
+import Network.HTTP.Lucu
 
-main :: IO ()
-main = let config    = defaultConfig { cnfServerPort = PortNumber 9999 }
-           resources = mkResTree [ ( []
-                                   , helloWorld )
-
-                                 , ( ["index.html"]
-                                   , staticFile "/Users/admin/Sites/index.html" )
-
-                                 , ( ["urandom"]
-                                   , staticFile "/dev/urandom" )
-
-                                 , ( ["inc"]
-                                   , staticDir "/usr/include" )
-                                 ]
+main ∷ IO ()
+main = let config    = defaultConfig { cnfServerPort = "9999" }
+           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
 helloWorld
-    = ResourceDef {
-        resUsesNativeThread = False
-      , resIsGreedy         = False
-      , resGet
-          = Just $ do time <- liftIO $ getClockTime
-                      foundEntity (strongETag "abcde") time
-                      setContentType $ "text" +/+ "hello"
+    = emptyResource {
+        resGet
+          = Just $ do setContentType $ parseMIMEType "text/hello"
                       outputChunk "Hello, "
                       outputChunk "World!\n"
-      , resHead   = Nothing
+                      outputChunk =≪ Lazy.pack <$> getRemoteAddr'
+                      
       , resPost
-          = Just $ do str1 <- inputChunk 3
-                      str2 <- inputChunk 3
-                      str3 <- inputChunk 3
-                      setContentType $ "text" +/+ "hello"
-                      output ("[" ++ str1 ++ " - " ++ str2 ++ "#" ++ str3 ++ "]")
-      , resPut    = Nothing
-      , resDelete = Nothing
-      }
\ No newline at end of file
+          = Just $ do str1 ← inputChunk 3
+                      str2 ← inputChunk 3
+                      str3 ← inputChunk 3
+                      setContentType $ parseMIMEType "text/hello"
+                      output ("[" ⊕ str1 ⊕ " - " ⊕ str2 ⊕ "#" ⊕ str3 ⊕ "]")
+      }