The big change

[Rakka.git] / Rakka / Page.hs

diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index ec6ce8008209b498afb4064d9560f26e2df4d85c..9d84cf28df7f0285c2788842773063998c638a5b 100644 (file)
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -8,6 +8,7 @@ module Rakka.Page
     , decodePageName
 
     , pageFileName'
+    , defaultFileName
 
     , mkPageURI
     , mkPageFragmentURI
@@ -89,14 +90,15 @@ encodeFragment = escapeURIString isSafeChar . C8.unpack . encode UTF8
 
 
 pageFileName' :: Page -> String
-pageFileName' page = fromMaybe (defaultFileName page) (pageFileName page)
+pageFileName' page
+    = fromMaybe (defaultFileName (pageType page) (pageName page)) (pageFileName page)
 
 
-defaultFileName :: Page -> String
-defaultFileName page
-    = let baseName = takeFileName (pageName page)
+defaultFileName :: MIMEType -> PageName -> String
+defaultFileName pType pName
+    = let baseName = takeFileName pName
       in 
-        case pageType page of
+        case pType of
           MIMEType "text" "x-rakka" _ -> baseName <.> "rakka"
           MIMEType "text" "css"     _ -> baseName <.> "css"
           _                           -> baseName