fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
Gregor Kleen 2017-10-09 17:16:08 +02:00
parent 332be4d9ce
commit 2e65cf175c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models
View File

@ -29,7 +29,7 @@ Course json
shorthand Text shorthand Text
owner UserId owner UserId
schoolId SchoolId schoolId SchoolId
termId TermId -- TermId ist jetzt Text als Typ termId TermId -- @data TermId = TermId TermIdentifier@ stored as text
capacity Int Maybe capacity Int Maybe
created UTCTime created UTCTime
changed UTCTime changed UTCTime

2
test/Handler/ZipSpec.hs
View File

@ -28,7 +28,7 @@ spec :: Spec
spec = describe "Zip file handling" $ do spec = describe "Zip file handling" $ do
it "has compatible encoding/decoding to/from zip files" . property $ it "has compatible encoding/decoding to/from zip files" . property $
\zipFiles -> do \zipFiles -> do
(_, zipFiles') <- runConduit $ Conduit.sourceList zipFiles =$= produceZip def =$= consumeZip `fuseBoth` Conduit.consume zipFiles' <- runConduit $ Conduit.sourceList zipFiles =$= produceZip def =$= void consumeZip =$= Conduit.consume
forM_ (zipFiles `zip` zipFiles') $ \(file, file') -> do forM_ (zipFiles `zip` zipFiles') $ \(file, file') -> do
let acceptableFilenameChanges let acceptableFilenameChanges
= makeValid . bool (dropWhileEnd isPathSeparator) addTrailingPathSeparator (isNothing $ fileContent file) . normalise . makeValid = makeValid . bool (dropWhileEnd isPathSeparator) addTrailingPathSeparator (isNothing $ fileContent file) . normalise . makeValid