on master help sign in
Use Integer for file size #524
b0fa553Michael Snoyman
wai-app-static/WaiAppStatic/Storage/Embedded/Runtime.hs+2−2
@@ -49,7 +49,7 @@ embeddedLookup root pieces =
49toEntry :: (Piece, EmbeddedEntry) -> Either FolderName File
49toEntry :: (Piece, EmbeddedEntry) -> Either FolderName File
50toEntry (name, EEFolder{}) = Left name
50toEntry (name, EEFolder{}) = Left name
51toEntry (name, EEFile bs) = Right File
51toEntry (name, EEFile bs) = Right File
52− { fileGetSize = S.length bs
52+ { fileGetSize = fromIntegral $ S.length bs
53 , fileToResponse = \s h -> W.responseBuilder s h $ fromByteString bs
53 , fileToResponse = \s h -> W.responseBuilder s h $ fromByteString bs
54 , fileName = name
54 , fileName = name
55 , fileGetHash = return $ Just $ runHash bs
55 , fileGetHash = return $ Just $ runHash bs
@@ -86,7 +86,7 @@ toEmbedded fps =
86
86
87bsToFile :: Piece -> ByteString -> File
87bsToFile :: Piece -> ByteString -> File
88bsToFile name bs = File
88bsToFile name bs = File
89− { fileGetSize = S.length bs
89+ { fileGetSize = fromIntegral $ S.length bs
90 , fileToResponse = \s h -> W.responseBuilder s h $ fromByteString bs
90 , fileToResponse = \s h -> W.responseBuilder s h $ fromByteString bs
91 , fileName = name
91 , fileName = name
92 , fileGetHash = return $ Just $ runHash bs
92 , fileGetHash = return $ Just $ runHash bs
wai-app-static/WaiAppStatic/Types.hs+1−1
@@ -79,7 +79,7 @@ data Folder = Folder
79-- | Information on an individual file.
79-- | Information on an individual file.
80data File = File
80data File = File
81 { -- | Size of file in bytes
81 { -- | Size of file in bytes
82− fileGetSize :: Int
82+ fileGetSize :: Integer
83 -- | How to construct a WAI response for this file. Some files are stored
83 -- | How to construct a WAI response for this file. Some files are stored
84 -- on the filesystem and can use @ResponseFile@, while others are stored
84 -- on the filesystem and can use @ResponseFile@, while others are stored
85 -- in memory and should use @ResponseBuilder@.
85 -- in memory and should use @ResponseBuilder@.