Support for Snap 1.0

jaspervdj · Aug 9, 2016 · eea9fcc · eea9fcc
1 parent 3c95d86
commit eea9fcc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/digestive-functors-snap/digestive-functors-snap.cabal b/digestive-functors-snap/digestive-functors-snap.cabal
@@ -20,7 +20,7 @@ Library
     base               >= 4    && < 5,
     containers         >= 0.3  && < 0.6,
     digestive-functors >= 0.8  && < 0.9,
-    snap-core          >= 0.7  && < 0.10,
+    snap-core          >= 1.0,
     text               >= 0.11 && < 1.3,
     directory          >= 1.0  && < 1.4,
     filepath           >= 1.0  && < 1.5,

diff --git a/digestive-functors-snap/src/Text/Digestive/Snap.hs b/digestive-functors-snap/src/Text/Digestive/Snap.hs
@@ -63,11 +63,11 @@ snapFiles config = do
         temporaryDirectory config
 
     -- Actually do the work...
-    Snap.handleFileUploads tmpDir (uploadPolicy config) (partPolicy config) $
-        fmap catMaybes . mapM (storeFile tmpDir)
+    fmap catMaybes $ Snap.handleFileUploads tmpDir (uploadPolicy config) (partPolicy config) $
+        storeFile tmpDir
   where
-    storeFile _   (_,        Left _)     = return Nothing
-    storeFile tmp (partinfo, Right path) = do
+    storeFile _   _        (Left _)      = return Nothing
+    storeFile tmp partinfo (Right path)  = do
         let newPath = tmp </> "_" ++ takeFileName path ++
                 maybe "" B.unpack (Snap.partFileName partinfo)
         liftIO $ copyFile path newPath