X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FPage.hs;h=0affbf52f3b700bceb02e38a1770ad0d19165981;hb=bc8616eec0bcac3102860c76f93ebfd0da24c2d6;hp=b293b1fb0258445edfec5261687c3996c1893e9a;hpb=b4a3d2cf3854b10d923cb4c546bf1fe32b021a68;p=Rakka.git
diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index b293b1f..0affbf5 100644
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -10,13 +10,11 @@ module Rakka.Page
, pageName
, pageUpdateInfo
+ , pageRevision
, encodePageName
, decodePageName
- , entityFileName'
- , defaultFileName
-
, mkPageURI
, mkPageFragmentURI
, mkObjectURI
@@ -30,7 +28,7 @@ module Rakka.Page
where
import qualified Codec.Binary.Base64 as B64
-import Codec.Binary.UTF8.String
+import qualified Codec.Binary.UTF8.String as UTF8
import Control.Arrow
import Control.Arrow.ArrowIO
import Control.Arrow.ArrowList
@@ -70,11 +68,9 @@ data Page
entityName :: !PageName
, entityType :: !MIMEType
, entityLanguage :: !(Maybe LanguageTag)
- , entityFileName :: !(Maybe String)
, entityIsTheme :: !Bool -- text/css 以å¤ã§ã¯ç¡æå³
, entityIsFeed :: !Bool -- text/x-rakka 以å¤ã§ã¯ç¡æå³
, entityIsLocked :: !Bool
- , entityIsBoring :: !Bool
, entityIsBinary :: !Bool
, entityRevision :: RevNum
, entityLastMod :: UTCTime
@@ -100,27 +96,34 @@ isRedirect _ = False
isEntity :: Page -> Bool
-isEntity (Entity _ _ _ _ _ _ _ _ _ _ _ _ _ _ _) = True
-isEntity _ = False
+isEntity (Entity _ _ _ _ _ _ _ _ _ _ _ _ _) = True
+isEntity _ = False
pageName :: Page -> PageName
pageName p
| isRedirect p = redirName p
| isEntity p = entityName p
- | otherwise = fail "neither redirection nor entity"
+ | otherwise = error "neither redirection nor entity"
pageUpdateInfo :: Page -> Maybe UpdateInfo
pageUpdateInfo p
| isRedirect p = redirUpdateInfo p
| isEntity p = entityUpdateInfo p
- | otherwise = fail "neither redirection nor entity"
+ | otherwise = error "neither redirection nor entity"
+
+
+pageRevision :: Page -> RevNum
+pageRevision p
+ | isRedirect p = redirRevision p
+ | isEntity p = entityRevision p
+ | otherwise = error "neither redirection nor entity"
-- UTF-8 ã« encode ãã¦ãã 0x20 - 0x7E ã®ç¯åãé¤ã㦠URI escape ããã
encodePageName :: PageName -> FilePath
-encodePageName = escapeURIString isSafeChar . encodeString . fixPageName
+encodePageName = escapeURIString isSafeChar . UTF8.encodeString . fixPageName
where
fixPageName :: PageName -> PageName
fixPageName = (\ (x:xs) -> toUpper x : xs) . map (\ c -> if c == ' ' then '_' else c)
@@ -136,26 +139,11 @@ isSafeChar c
-- URI unescape ã㦠UTF-8 ãã decode ããã
decodePageName :: FilePath -> PageName
-decodePageName = decodeString . unEscapeString
+decodePageName = UTF8.decodeString . unEscapeString
encodeFragment :: String -> String
-encodeFragment = escapeURIString isSafeChar . encodeString
-
-
-entityFileName' :: Page -> String
-entityFileName' page
- = fromMaybe (defaultFileName (entityType page) (entityName page)) (entityFileName page)
-
-
-defaultFileName :: MIMEType -> PageName -> String
-defaultFileName pType pName
- = let baseName = takeFileName pName
- in
- case pType of
- MIMEType "text" "x-rakka" _ -> baseName <.> "rakka"
- MIMEType "text" "css" _ -> baseName <.> "css"
- _ -> baseName
+encodeFragment = escapeURIString isSafeChar . UTF8.encodeString
mkPageURI :: URI -> PageName -> URI
@@ -206,12 +194,11 @@ mkRakkaURI name = URI {
-- ããã©ã«ãã§ãªãå ´åã®ã¿åå¨
+ revision="112"
lastModified="2000-01-01T00:00:00">
@@ -230,59 +217,79 @@ mkRakkaURI name = URI {
SKJaHKS8JK/DH8KS43JDK2aKKaSFLLS...
+
+
-}
xmlizePage :: (ArrowXml a, ArrowChoice a, ArrowIO a) => a Page XmlTree
xmlizePage
= proc page
- -> do lastMod <- arrIO (utcToLocalZonedTime . entityLastMod) -< page
- ( eelem "/"
- += ( eelem "page"
- += sattr "name" (pageName page)
- += sattr "type" (show $ entityType page)
- += ( case entityLanguage page of
- Just x -> sattr "lang" x
- Nothing -> none
- )
- += ( case entityFileName page of
- Just x -> sattr "fileName" x
- Nothing -> none
- )
- += ( case entityType page of
- MIMEType "text" "css" _
- -> sattr "isTheme" (yesOrNo $ entityIsTheme page)
- MIMEType "text" "x-rakka" _
- -> sattr "isFeed" (yesOrNo $ entityIsFeed page)
- _
- -> none
- )
- += sattr "isLocked" (yesOrNo $ entityIsLocked page)
- += sattr "isBoring" (yesOrNo $ entityIsBoring page)
- += sattr "isBinary" (yesOrNo $ entityIsBinary page)
- += sattr "revision" (show $ entityRevision page)
- += sattr "lastModified" (formatW3CDateTime lastMod)
- += ( case entitySummary page of
- Just s -> eelem "summary" += txt s
- Nothing -> none
- )
- += ( if M.null (entityOtherLang page) then
- none
- else
- selem "otherLang"
- [ eelem "link"
- += sattr "lang" lang
- += sattr "page" name
- | (lang, name) <- M.toList (entityOtherLang page) ]
- )
- += ( if entityIsBinary page then
- ( eelem "binaryData"
- += txt (B64.encode $ L.unpack $ entityContent page)
+ -> if isRedirect page then
+ xmlizeRedirection -< page
+ else
+ xmlizeEntity -< page
+ where
+ xmlizeRedirection :: (ArrowXml a, ArrowChoice a, ArrowIO a) => a Page XmlTree
+ xmlizeRedirection
+ = proc page
+ -> do lastMod <- arrIO (utcToLocalZonedTime . redirLastMod) -< page
+ ( eelem "/"
+ += ( eelem "page"
+ += sattr "name" (redirName page)
+ += sattr "redirect" (redirDest page)
+ += sattr "revision" (show $ redirRevision page)
+ += sattr "lastModified" (formatW3CDateTime lastMod)
+ )) -<< ()
+
+ xmlizeEntity :: (ArrowXml a, ArrowChoice a, ArrowIO a) => a Page XmlTree
+ xmlizeEntity
+ = proc page
+ -> do lastMod <- arrIO (utcToLocalZonedTime . entityLastMod) -< page
+ ( eelem "/"
+ += ( eelem "page"
+ += sattr "name" (pageName page)
+ += sattr "type" (show $ entityType page)
+ += ( case entityLanguage page of
+ Just x -> sattr "lang" x
+ Nothing -> none
+ )
+ += ( case entityType page of
+ MIMEType "text" "css" _
+ -> sattr "isTheme" (yesOrNo $ entityIsTheme page)
+ MIMEType "text" "x-rakka" _
+ -> sattr "isFeed" (yesOrNo $ entityIsFeed page)
+ _
+ -> none
)
- else
- ( eelem "textData"
- += txt (decode $ L.unpack $ entityContent page)
+ += sattr "isLocked" (yesOrNo $ entityIsLocked page)
+ += sattr "isBinary" (yesOrNo $ entityIsBinary page)
+ += sattr "revision" (show $ entityRevision page)
+ += sattr "lastModified" (formatW3CDateTime lastMod)
+ += ( case entitySummary page of
+ Just s -> eelem "summary" += txt s
+ Nothing -> none
)
- )
- )) -<< ()
+ += ( if M.null (entityOtherLang page) then
+ none
+ else
+ selem "otherLang"
+ [ eelem "link"
+ += sattr "lang" lang
+ += sattr "page" name
+ | (lang, name) <- M.toList (entityOtherLang page) ]
+ )
+ += ( if entityIsBinary page then
+ ( eelem "binaryData"
+ += txt (B64.encode $ L.unpack $ entityContent page)
+ )
+ else
+ ( eelem "textData"
+ += txt (UTF8.decode $ L.unpack $ entityContent page)
+ )
+ )
+ )) -<< ()
parseXmlizedPage :: (ArrowXml a, ArrowChoice a) => a (PageName, XmlTree) Page
@@ -306,11 +313,9 @@ parseEntity
= proc (name, tree)
-> do updateInfo <- maybeA parseUpdateInfo -< tree
- mimeType <- (getXPathTreesInDoc "/page/@type/text()" >>> getText
- >>> arr read) -< tree
+ mimeTypeStr <- withDefault (getXPathTreesInDoc "/page/@type/text()" >>> getText) "" -< tree
lang <- maybeA (getXPathTreesInDoc "/page/@lang/text()" >>> getText) -< tree
- fileName <- maybeA (getXPathTreesInDoc "/page/@filename/text()" >>> getText) -< tree
isTheme <- (withDefault (getXPathTreesInDoc "/page/@isTheme/text()" >>> getText) "no"
>>> parseYesOrNo) -< tree
@@ -318,8 +323,6 @@ parseEntity
>>> parseYesOrNo) -< tree
isLocked <- (withDefault (getXPathTreesInDoc "/page/@isLocked/text()" >>> getText) "no"
>>> parseYesOrNo) -< tree
- isBoring <- (withDefault (getXPathTreesInDoc "/page/@isBoring/text()" >>> getText) "no"
- >>> parseYesOrNo) -< tree
summary <- (maybeA (getXPathTreesInDoc "/page/summary/text()"
>>> getText
@@ -336,19 +339,25 @@ parseEntity
let (isBinary, content)
= case (textData, binaryData) of
- (Just text, Nothing ) -> (False, L.pack $ encode text )
+ (Just text, Nothing ) -> (False, L.pack $ UTF8.encode text )
(Nothing , Just binary) -> (True , L.pack $ B64.decode binary)
_ -> error "one of textData or binaryData is required"
+ mimeType
+ = if isBinary then
+ if null mimeTypeStr then
+ guessMIMEType content
+ else
+ read mimeTypeStr
+ else
+ read mimeTypeStr
returnA -< Entity {
entityName = name
, entityType = mimeType
, entityLanguage = lang
- , entityFileName = fileName
, entityIsTheme = isTheme
, entityIsFeed = isFeed
, entityIsLocked = isLocked
- , entityIsBoring = isBoring
, entityIsBinary = isBinary
, entityRevision = undefined
, entityLastMod = undefined
@@ -362,9 +371,9 @@ parseEntity
parseUpdateInfo :: (ArrowXml a, ArrowChoice a) => a XmlTree UpdateInfo
parseUpdateInfo
= proc tree
- -> do uInfo <- getXPathTreesInDoc "/*/updateInfo" -< tree
+ -> do uInfo <- getXPathTreesInDoc "/page/updateInfo" -< tree
oldRev <- (getAttrValue0 "oldRevision" >>> arr read) -< uInfo
- oldName <- maybeA (getXPathTrees "/move/@from/text()" >>> getText) -< uInfo
+ oldName <- maybeA (getXPathTrees "/updateInfo/move/@from/text()" >>> getText) -< uInfo
returnA -< UpdateInfo {
uiOldRevision = oldRev
, uiOldName = oldName