X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=examples%2FMultipart.hs;h=f7122f9cc58aab710337c234c813b490bc0212ad;hb=3b448555e621530c3483f03b4b5156dc606b2035;hp=49945ec666268401256147eee98b201cd07a9876;hpb=9be2b946657c536a4363a076235f70728be087c4;p=Lucu.git

diff --git a/examples/Multipart.hs b/examples/Multipart.hs
index 49945ec..f7122f9 100644
--- a/examples/Multipart.hs
+++ b/examples/Multipart.hs
@@ -1,41 +1,55 @@
 {-# LANGUAGE
     OverloadedStrings
+  , QuasiQuotes
   , UnicodeSyntax
   #-}
 import qualified Data.ByteString.Lazy.Char8 as Lazy
 import Control.Applicative
 import qualified Data.Collections as C
 import Control.Monad.Unicode
+import Data.Default
 import Data.Maybe
 import Data.Monoid.Unicode
+import Network
 import Network.HTTP.Lucu
+import Prelude hiding (head)
+import Prelude.Unicode
+import Text.Blaze hiding (text)
+import Text.Blaze.Html5 hiding (text)
+import Text.Blaze.Html5.Attributes hiding (form, title)
+import Text.Blaze.Renderer.Utf8
 
 main ∷ IO ()
-main = let config = defaultConfig { cnfServerPort = "9999" }
+main = let config = def { cnfServerPort = "9999" }
            tree   ∷ ResourceTree
            tree   = C.fromList [ ([], nonGreedy resMain) ]
        in
          do putStrLn "Access http://localhost:9999/ with your browser."
-            runHttpd config $ resourceMap tree
+            withSocketsDo ∘ runHttpd config $ resourceMap tree
 
 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"
+            , do setContentType [mimeType| text/html; charset="UTF-8" |]
+                 putBuilder
+                     $ renderHtmlBuilder
+                     $ docTypeHtml ! lang "en"
+                     $ do head $ do meta ! charset "UTF-8"
+                                    title "Multipart Form Test"
+                          body $ form ! action  "/"
+                                      ! method  "post"
+                                      ! enctype "multipart/form-data"
+                               $ do toHtml ("Upload some file:" ∷ String)
+                                    input ! type_ "text"   ! name  "text"
+                                    input ! type_ "file"   ! name  "file"
+                                    input ! type_ "submit" ! value "Submit"
             )
           , ( 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"
+            , do f ← getForm Nothing
+                 let text     = fromMaybe (∅) $ fdContent <$> lookup "text" f
+                     file     = fromMaybe (∅) $ fdContent <$> lookup "file" f
+                     fileName = fdFileName =≪ lookup "file" f
+                 setContentType [mimeType| 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"