X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FStorage%2FDefaultPage.hs;h=de1e3a1321029aa3dcd19b7a72dd373f53651068;hb=02cf9c5f184e1ee977479fa43cadce79f8f93d09;hp=8e79a6dbc9470062677d8a2a1a64e2d8e9aa930c;hpb=04f57f2ee2e6e696b4bf0bbd8cda51cdc3d7b4a4;p=Rakka.git diff --git a/Rakka/Storage/DefaultPage.hs b/Rakka/Storage/DefaultPage.hs index 8e79a6d..de1e3a1 100644 --- a/Rakka/Storage/DefaultPage.hs +++ b/Rakka/Storage/DefaultPage.hs @@ -49,14 +49,14 @@ findAllDefaultPages findAllIn dirPath = find always (fileType ==? RegularFile) dirPath >>= - return . S.fromList . map (decodePageName . makeRelative dirPath) + return . S.fromList . map (decodePageName . makeRelative dirPath . dropExtension) loadDefaultPage :: PageName -> IO (Maybe Page) loadDefaultPage name - -- ./defaultPages が存在するなら、./defaultPages/Foo を探す。無けれ - -- ば Cabal で defaultPages/Foo を探す。 - = do let pagePath = "defaultPages" encodePageName name + -- ./defaultPages が存在するなら、./defaultPages/Foo.xml を探す。無 + -- ければ Cabal で defaultPages/Foo.xml を探す。 + = do let pagePath = "defaultPages" (encodePageName name `addExtension` "xml") localDirExists <- doesLocalDirExist if localDirExists then