redirection

[Rakka.git] / Rakka / Resource / Object.hs

diff --git a/Rakka/Resource/Object.hs b/Rakka/Resource/Object.hs
index 1a81e6719dc7d61f7d8e20723b969a3e7ee7b667..00ebc28e140a622e9d7560e66fb52afc7810adfa 100644 (file)
--- a/Rakka/Resource/Object.hs
+++ b/Rakka/Resource/Object.hs
@@ -1,15 +1,17 @@
+-- -*- Coding: utf-8 -*-
 module Rakka.Resource.Object
     ( resObject
     )
     where
 
+import           Data.ByteString.Char8 as C8
+import           Data.Maybe
 import           Network.HTTP.Lucu
 import           Network.HTTP.Lucu.Utils
 import           Rakka.Environment
 import           Rakka.Page
 import           Rakka.Storage
 import           Rakka.SystemConfig
-import           System.Time
 
 
 resObject :: Environment -> ResourceDef
@@ -30,16 +32,16 @@ resObject env
 
 handleGet :: Environment -> PageName -> Resource ()
 handleGet env name
-    = do pageM <- getPage (envStorage env) name
+    = do pageM <- getPage (envStorage env) name Nothing
          case pageM of
            Nothing
                -> foundNoEntity Nothing
 
-           Just redir@(Redirection _ _ _ _)
+           Just redir@(Redirection _ _ _ _ _)
                -> handleRedirect env redir
 
-           Just entity@(Entity _ _ _ _ _ _ _ _ _ _ _ _ _)
-               -> handleGetEntity env entity
+           Just entity@(Entity _ _ _ _ _ _ _ _ _ _ _ _ _ _ _)
+               -> handleGetEntity entity
 
 
 {-
@@ -58,13 +60,13 @@ handleRedirect env redir
   
   ...
 -}
-handleGetEntity :: Environment -> Page -> Resource ()
-handleGetEntity env page
-    = do let lastMod = toClockTime $ pageLastMod page
+handleGetEntity :: Page -> Resource ()
+handleGetEntity page
+    = do case entityRevision page of
+           0   -> foundTimeStamp (entityLastMod page) -- 0 はデフォルトページ
+           rev -> foundEntity (strongETag $ show rev) (entityLastMod page)
 
-         case pageRevision page of
-           0   -> foundTimeStamp lastMod -- 0 はデフォルトページ
-           rev -> foundEntity (strongETag $ show rev) lastMod
-
-         setContentType (pageType    page)
-         outputLBS      (pageContent page)
+         setContentType (entityType page)
+         setHeader (C8.pack "Content-Disposition")
+                       (C8.pack $ "attachment; filename=" ++ quoteStr (entityFileName' page))
+         outputLBS (entityContent page)