Remove folderName
commit360c4020ba69912d74652cda8467d6852573482f
authorMichael Snoyman <michael@snoyman.com>
dateTue 22 May 2012, 06:38 (14 years ago)
parent3f42a79
wai-app-static/Backend/Filesystem.hs+1−1
@@ -136,7 +136,7 @@ fileSystemLookupHash hashFunc prefix pieces = do
136136 case mfile of
137137 Nothing -> return Nothing
138138 Just file -> return $ Just $ Right file
139− return $ LRFolder $ Folder lastPiece $ catMaybes entries
139+ return $ LRFolder $ Folder $ catMaybes entries
140140 else return LRNotFound
141141 where
142142 lastPiece
wai-app-static/Listing.hs+1−1
@@ -19,7 +19,7 @@ import qualified Text.Blaze.Html.Renderer.Utf8 as HU
1919
2020-- Code below taken from Happstack: http://patch-tag.com/r/mae/happstack/snapshot/current/content/pretty/happstack-server/src/Happstack/Server/FileServe/BuildingBlocks.hs
2121defaultListing :: Listing
22−defaultListing pieces (Folder _ contents) = do
22+defaultListing pieces (Folder contents) = do
2323 let isTop = null pieces || map Just pieces == [toPiece ""]
2424 let fps'' :: [Either FolderName File]
2525 fps'' = (if isTop then id else (Left (unsafeToPiece "") :)) contents -- FIXME emptyParentFolder feels like a bit of a hack
wai-app-static/WaiAppStatic/Types.hs+1−2
@@ -91,8 +91,7 @@ type FolderName = Piece
9191-- | Represent contents of a single folder, which can be itself either a file
9292-- or a folder.
9393data Folder = Folder
94− { folderName :: Piece
95− , folderContents :: [Either FolderName File]
94+ { folderContents :: [Either FolderName File]
9695 }
9796
9897-- | Information on an individual file.