X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FPage.hs;h=62606b35af111daa344d37d738dfabd4aa273172;hb=23977989ef4be7316b1c2c3f709ca1e8e6bb7f84;hp=50eb441b9c851c25a304256b4c6dff0b5685d87b;hpb=9681bedbfde02fa1bcda4fbbacba941378c7a57a;p=Rakka.git
diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index 50eb441..62606b3 100644
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -1,15 +1,20 @@
module Rakka.Page
( PageName
, Page(..)
+ , UpdateInfo(..)
, LanguageTag
, LanguageName
+ , isRedirect
+ , isEntity
+
+ , pageName
+ , pageUpdateInfo
+ , pageRevision
+
, encodePageName
, decodePageName
- , pageFileName'
- , defaultFileName
-
, mkPageURI
, mkPageFragmentURI
, mkObjectURI
@@ -23,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
@@ -53,33 +58,73 @@ type LanguageName = String -- i.e. "æ¥æ¬èª"
data Page
= Redirection {
- redirName :: !PageName
- , redirDest :: !PageName
- , redirRevision :: RevNum
- , redirLastMod :: UTCTime
+ redirName :: !PageName
+ , redirDest :: !PageName
+ , redirIsLocked :: !Bool
+ , redirRevision :: RevNum
+ , redirLastMod :: UTCTime
+ , redirUpdateInfo :: Maybe UpdateInfo
}
| Entity {
- pageName :: !PageName
- , pageType :: !MIMEType
- , pageLanguage :: !(Maybe LanguageTag)
- , pageFileName :: !(Maybe String)
- , pageIsTheme :: !Bool -- text/css 以å¤ã§ã¯ç¡æå³
- , pageIsFeed :: !Bool -- text/x-rakka 以å¤ã§ã¯ç¡æå³
- , pageIsLocked :: !Bool
- , pageIsBoring :: !Bool
- , pageIsBinary :: !Bool
- , pageRevision :: RevNum
- , pageLastMod :: UTCTime
- , pageSummary :: !(Maybe String)
- , pageOtherLang :: !(Map LanguageTag PageName)
- , pageContent :: !Lazy.ByteString
+ entityName :: !PageName
+ , entityType :: !MIMEType
+ , entityLanguage :: !(Maybe LanguageTag)
+ , entityIsTheme :: !Bool -- text/css 以å¤ã§ã¯ç¡æå³
+ , entityIsFeed :: !Bool -- text/x-rakka 以å¤ã§ã¯ç¡æå³
+ , entityIsLocked :: !Bool
+ , entityIsBinary :: !Bool
+ , entityRevision :: RevNum
+ , entityLastMod :: UTCTime
+ , entitySummary :: !(Maybe String)
+ , entityOtherLang :: !(Map LanguageTag PageName)
+ , entityContent :: !Lazy.ByteString
+ , entityUpdateInfo :: Maybe UpdateInfo
+ }
+ deriving (Show, Eq)
+
+
+data UpdateInfo
+ = UpdateInfo {
+ uiOldRevision :: !RevNum
+ , uiOldName :: !(Maybe PageName)
}
deriving (Show, Eq)
+isRedirect :: Page -> Bool
+isRedirect (Redirection _ _ _ _ _ _) = True
+isRedirect _ = False
+
+
+isEntity :: Page -> Bool
+isEntity (Entity _ _ _ _ _ _ _ _ _ _ _ _ _) = True
+isEntity _ = False
+
+
+pageName :: Page -> PageName
+pageName p
+ | isRedirect p = redirName p
+ | isEntity p = entityName p
+ | otherwise = error "neither redirection nor entity"
+
+
+pageUpdateInfo :: Page -> Maybe UpdateInfo
+pageUpdateInfo p
+ | isRedirect p = redirUpdateInfo p
+ | isEntity p = entityUpdateInfo p
+ | 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)
@@ -95,26 +140,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
-
-
-pageFileName' :: Page -> String
-pageFileName' page
- = fromMaybe (defaultFileName (pageType page) (pageName page)) (pageFileName 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
@@ -165,12 +195,11 @@ mkRakkaURI name = URI {
-- ããã©ã«ãã§ãªãå ´åã®ã¿åå¨
+ revision="112"
lastModified="2000-01-01T00:00:00">
@@ -189,83 +218,109 @@ mkRakkaURI name = URI {
SKJaHKS8JK/DH8KS43JDK2aKKaSFLLS...
+
+
-}
xmlizePage :: (ArrowXml a, ArrowChoice a, ArrowIO a) => a Page XmlTree
xmlizePage
= proc page
- -> do lastMod <- arrIO (utcToLocalZonedTime . pageLastMod) -< page
- ( eelem "/"
- += ( eelem "page"
- += sattr "name" (pageName page)
- += sattr "type" (show $ pageType page)
- += ( case pageLanguage page of
- Just x -> sattr "lang" x
- Nothing -> none
- )
- += ( case pageFileName page of
- Just x -> sattr "fileName" x
- Nothing -> none
- )
- += ( case pageType page of
- MIMEType "text" "css" _
- -> sattr "isTheme" (yesOrNo $ pageIsTheme page)
- MIMEType "text" "x-rakka" _
- -> sattr "isFeed" (yesOrNo $ pageIsFeed page)
- _
- -> none
- )
- += sattr "isLocked" (yesOrNo $ pageIsLocked page)
- += sattr "isBoring" (yesOrNo $ pageIsBoring page)
- += sattr "isBinary" (yesOrNo $ pageIsBinary page)
- += sattr "revision" (show $ pageRevision page)
- += sattr "lastModified" (formatW3CDateTime lastMod)
- += ( case pageSummary page of
- Just s -> eelem "summary" += txt s
- Nothing -> none
- )
- += ( if M.null (pageOtherLang page) then
- none
- else
- selem "otherLang"
- [ eelem "link"
- += sattr "lang" lang
- += sattr "page" name
- | (lang, name) <- M.toList (pageOtherLang page) ]
- )
- += ( if pageIsBinary page then
- ( eelem "binaryData"
- += txt (B64.encode $ L.unpack $ pageContent 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 "isLocked" (yesOrNo $ redirIsLocked 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
)
- else
- ( eelem "textData"
- += txt (decode $ L.unpack $ pageContent page)
+ += ( 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 "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
parseXmlizedPage
= proc (name, tree)
- -> do redirect <- maybeA (getXPathTreesInDoc "/page/@redirect/text()" >>> getText) -< tree
+ -> do updateInfo <- maybeA parseUpdateInfo -< tree
+ redirect <- maybeA (getXPathTreesInDoc "/page/@redirect/text()" >>> getText) -< tree
+ isLocked <- (withDefault (getXPathTreesInDoc "/page/@isLocked/text()" >>> getText) "no"
+ >>> parseYesOrNo) -< tree
case redirect of
Nothing -> parseEntity -< (name, tree)
Just dest -> returnA -< (Redirection {
- redirName = name
- , redirDest = dest
- , redirRevision = undefined
- , redirLastMod = undefined
+ redirName = name
+ , redirDest = dest
+ , redirIsLocked = isLocked
+ , redirRevision = undefined
+ , redirLastMod = undefined
+ , redirUpdateInfo = updateInfo
})
parseEntity :: (ArrowXml a, ArrowChoice a) => a (PageName, XmlTree) Page
parseEntity
= proc (name, tree)
- -> do mimeType <- (getXPathTreesInDoc "/page/@type/text()" >>> getText
- >>> arr read) -< tree
+ -> do updateInfo <- maybeA parseUpdateInfo -< 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
@@ -273,8 +328,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
@@ -291,23 +344,52 @@ parseEntity
let (isBinary, content)
= case (textData, binaryData) of
- (Just text, Nothing ) -> (False, L.pack $ encode text )
- (Nothing , Just binary) -> (True , L.pack $ B64.decode binary)
+ (Just text, Nothing ) -> (False, L.pack $ UTF8.encode text )
+ (Nothing , Just binary) -> (True , L.pack $ fromJust $ B64.decode $ dropWhitespace 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 {
- pageName = name
- , pageType = mimeType
- , pageLanguage = lang
- , pageFileName = fileName
- , pageIsTheme = isTheme
- , pageIsFeed = isFeed
- , pageIsLocked = isLocked
- , pageIsBoring = isBoring
- , pageIsBinary = isBinary
- , pageRevision = undefined
- , pageLastMod = undefined
- , pageSummary = summary
- , pageOtherLang = M.fromList otherLang
- , pageContent = content
+ entityName = name
+ , entityType = mimeType
+ , entityLanguage = lang
+ , entityIsTheme = isTheme
+ , entityIsFeed = isFeed
+ , entityIsLocked = isLocked
+ , entityIsBinary = isBinary
+ , entityRevision = undefined
+ , entityLastMod = undefined
+ , entitySummary = summary
+ , entityOtherLang = M.fromList otherLang
+ , entityContent = content
+ , entityUpdateInfo = updateInfo
+ }
+ where
+ dropWhitespace :: String -> String
+ dropWhitespace [] = []
+ dropWhitespace (x:xs)
+ | x == ' ' || x == '\t' || x == '\n'
+ = dropWhitespace xs
+ | otherwise
+ = x : dropWhitespace xs
+
+
+parseUpdateInfo :: (ArrowXml a, ArrowChoice a) => a XmlTree UpdateInfo
+parseUpdateInfo
+ = proc tree
+ -> do uInfo <- getXPathTreesInDoc "/page/updateInfo" -< tree
+ oldRev <- (getAttrValue0 "oldRevision" >>> arr read) -< uInfo
+ oldName <- maybeA (getXPathTrees "/updateInfo/move/@from/text()" >>> getText) -< uInfo
+ returnA -< UpdateInfo {
+ uiOldRevision = oldRev
+ , uiOldName = oldName
}
+
+
\ No newline at end of file