@@ -136,10 +136,10 @@ finalizeFile :: (Monad m, MonadIO m) => Text -> FileWriter -> Action m File
136
136
finalizeFile filename (FileWriter chunkSize bucket files_id i size acc md5context md5acc) = do
137
137
let md5digest = finalizeMD5 md5context (L. toStrict md5acc)
138
138
when (L. length acc > 0 ) $ putChunk bucket files_id i acc
139
- timestamp <- liftIO $ getCurrentTime
139
+ currentTimestamp <- liftIO $ getCurrentTime
140
140
let doc = [ " _id" =: files_id
141
141
, " length" =: size
142
- , " uploadDate" =: timestamp
142
+ , " uploadDate" =: currentTimestamp
143
143
, " md5" =: show (md5digest)
144
144
, " chunkSize" =: chunkSize
145
145
, " filename" =: filename
@@ -149,13 +149,13 @@ finalizeFile filename (FileWriter chunkSize bucket files_id i size acc md5contex
149
149
150
150
-- finalize the remainder and return the MD5Digest.
151
151
finalizeMD5 :: MD5Context -> S. ByteString -> MD5Digest
152
- finalizeMD5 ctx rest =
153
- md5Finalize ctx2 (S. drop lu rest ) -- can only handle max md5BlockSizeInBytes length
152
+ finalizeMD5 ctx remainder =
153
+ md5Finalize ctx2 (S. drop lu remainder ) -- can only handle max md5BlockSizeInBytes length
154
154
where
155
- l = S. length rest
155
+ l = S. length remainder
156
156
r = l `mod` md5BlockSizeInBytes
157
157
lu = l - r
158
- ctx2 = md5Update ctx (S. take lu rest )
158
+ ctx2 = md5Update ctx (S. take lu remainder )
159
159
160
160
-- Write as many chunks as can be written from the file writer
161
161
writeChunks :: (Monad m , MonadIO m ) => FileWriter -> L. ByteString -> Action m FileWriter
@@ -167,16 +167,16 @@ writeChunks (FileWriter chunkSize bucket files_id i size acc md5context md5acc)
167
167
if (L. length md5acc_temp < md5BlockLength)
168
168
then (md5context, md5acc_temp)
169
169
else let numBlocks = L. length md5acc_temp `div` md5BlockLength
170
- (current, rest ) = L. splitAt (md5BlockLength * numBlocks) md5acc_temp
171
- in (md5Update md5context (L. toStrict current), rest )
170
+ (current, remainder ) = L. splitAt (md5BlockLength * numBlocks) md5acc_temp
171
+ in (md5Update md5context (L. toStrict current), remainder )
172
172
-- Update chunks
173
173
let size' = (size + L. length chunk)
174
174
let acc_temp = (acc `L.append` chunk)
175
175
if (L. length acc_temp < chunkSize)
176
176
then return (FileWriter chunkSize bucket files_id i size' acc_temp md5context' md5acc')
177
177
else do
178
- let (chunk , acc') = L. splitAt chunkSize acc_temp
179
- putChunk bucket files_id i chunk
178
+ let (newChunk , acc') = L. splitAt chunkSize acc_temp
179
+ putChunk bucket files_id i newChunk
180
180
writeChunks (FileWriter chunkSize bucket files_id (i+ 1 ) size' acc' md5context' md5acc') L. empty
181
181
182
182
sinkFile :: (Monad m , MonadIO m ) => Bucket -> Text -> ConduitT S. ByteString o (Action m ) File
0 commit comments