X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=examples%2FMultipart.hs;h=906eff59ca3a78a6f425a3df28a1171e4527e31a;hp=8ddc6189be39a8ad942d372671819fd6f066e53f;hb=950640dd241222203778f8167943d30fa52f356a;hpb=ece223c516e66223ef1d5d8e6bbe4054a235d983

diff --git a/examples/Multipart.hs b/examples/Multipart.hs
index 8ddc618..906eff5 100644
--- a/examples/Multipart.hs
+++ b/examples/Multipart.hs
@@ -4,38 +4,42 @@
   #-}
 import qualified Data.ByteString.Lazy.Char8 as Lazy
 import Control.Applicative
+import qualified Data.Collections as C
 import Control.Monad.Unicode
 import Data.Maybe
 import Data.Monoid.Unicode
+import Network
 import Network.HTTP.Lucu
+import Prelude.Unicode
 
 main ∷ IO ()
-main = let config    = defaultConfig { cnfServerPort = "9999" }
-           resources = mkResTree [ ([], resMain) ]
+main = let config = defaultConfig { cnfServerPort = "9999" }
+           tree   ∷ ResourceTree
+           tree   = C.fromList [ ([], nonGreedy resMain) ]
        in
          do putStrLn "Access http://localhost:9999/ with your browser."
-            runHttpd config resources []
+            withSocketsDo ∘ runHttpd config $ resourceMap tree
 
-
-resMain ∷ ResourceDef
-resMain 
-    = emptyResource {
-        resGet
-          = Just $ do setContentType $ parseMIMEType "text/html"
-                      putChunks $ "<title>Multipart Form Test</title>\n"
-                                ⊕ "<form action=\"/\" method=\"post\" enctype=\"multipart/form-data\">\n"
-                                ⊕ "  Upload some file:\n"
-                                ⊕ "  <input type=\"text\" name=\"text\">\n"
-                                ⊕ "  <input type=\"file\" name=\"file\">\n"
-                                ⊕ "  <input type=\"submit\" value=\"Submit\">\n"
-                                ⊕ "</form>\n"
-      , resPost
-          = Just $ do form ← getForm Nothing
-                      let text     = fromMaybe (∅) $ fdContent <$> lookup "text" form
-                          file     = fromMaybe (∅) $ fdContent <$> lookup "file" form
-                          fileName = fdFileName =≪ lookup "file" form
-                      setContentType $ parseMIMEType "text/plain"
-                      putChunks $ "You entered \"" ⊕ text ⊕ "\".\n"
-                      putChunks $ "You uploaded a " ⊕ Lazy.pack (show $ Lazy.length file) ⊕ " bytes long file.\n"
-                      putChunks $ "The file name is " ⊕ Lazy.pack (show fileName) ⊕ ".\n"
-      }
+resMain ∷ Resource
+resMain = C.fromList
+          [ ( GET
+            , do setContentType $ parseMIMEType "text/html"
+                 putChunks $ "<title>Multipart Form Test</title>\n"
+                           ⊕ "<form action=\"/\" method=\"post\" enctype=\"multipart/form-data\">\n"
+                           ⊕ "  Upload some file:\n"
+                           ⊕ "  <input type=\"text\" name=\"text\">\n"
+                           ⊕ "  <input type=\"file\" name=\"file\">\n"
+                           ⊕ "  <input type=\"submit\" value=\"Submit\">\n"
+                           ⊕ "</form>\n"
+            )
+          , ( POST
+            , do form ← getForm Nothing
+                 let text     = fromMaybe (∅) $ fdContent <$> lookup "text" form
+                     file     = fromMaybe (∅) $ fdContent <$> lookup "file" form
+                     fileName = fdFileName =≪ lookup "file" form
+                 setContentType $ parseMIMEType "text/plain"
+                 putChunks $ "You entered \"" ⊕ text ⊕ "\".\n"
+                 putChunks $ "You uploaded a " ⊕ Lazy.pack (show $ Lazy.length file) ⊕ " bytes long file.\n"
+                 putChunks $ "The file name is " ⊕ Lazy.pack (show fileName) ⊕ ".\n"
+            )
+          ]