From 4ab830c4d9da59044f3a0f309be25fda5209437f Mon Sep 17 00:00:00 2001
From: Paul Rouse <pgr@doynton.org>
Date: Wed, 9 Nov 2016 09:31:28 +0000
Subject: [PATCH 1/2] Don't keep partial autogen file when exception occurs

---
 yesod/Yesod/Default/Util.hs | 6 ++++--
 yesod/yesod.cabal           | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/yesod/Yesod/Default/Util.hs b/yesod/Yesod/Default/Util.hs
index 488312ae..3f5319e2 100644
--- a/yesod/Yesod/Default/Util.hs
+++ b/yesod/Yesod/Default/Util.hs
@@ -17,8 +17,9 @@ module Yesod.Default.Util
 import qualified Data.ByteString.Lazy as L
 import Data.Text (Text, pack, unpack)
 import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent
+import Control.Exception (onException)
 import Control.Monad (when, unless)
-import System.Directory (doesFileExist, createDirectoryIfMissing)
+import System.Directory (doesFileExist, createDirectoryIfMissing, removeFile)
 import Language.Haskell.TH.Syntax
 import Text.Lucius (luciusFile, luciusFileReload)
 import Text.Julius (juliusFile, juliusFileReload)
@@ -43,7 +44,7 @@ addStaticContentExternal
 addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
     liftIO $ createDirectoryIfMissing True statictmp
     exists <- liftIO $ doesFileExist fn'
-    unless exists $ liftIO $ L.writeFile fn' content'
+    unless exists $ liftIO $ L.writeFile fn' content' `onException` remove fn'
     return $ Just $ Right (toRoute ["tmp", pack fn], [])
   where
     fn, statictmp, fn' :: FilePath
@@ -52,6 +53,7 @@ addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
     fn = hash content ++ '.' : unpack ext'
     statictmp = staticDir ++ "/tmp/"
     fn' = statictmp ++ fn
+    remove f = doesFileExist f >>= \x -> when x $ removeFile f
 
     content' :: L.ByteString
     content'
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 55976c60..5359aba0 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         1.4.3
+version:         1.4.3.1
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From a46dcbedc2069c8e7b390e0dccaa97481ce6dceb Mon Sep 17 00:00:00 2001
From: Paul Rouse <pgr@doynton.org>
Date: Thu, 10 Nov 2016 21:50:08 +0000
Subject: [PATCH 2/2] Revised don't keep partial autogen file when exception
 occurs

---
 yesod/ChangeLog.md          |  4 ++++
 yesod/Yesod/Default/Util.hs | 10 ++++++----
 yesod/yesod.cabal           |  4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/yesod/ChangeLog.md b/yesod/ChangeLog.md
index 2d558f7e..cede03f3 100644
--- a/yesod/ChangeLog.md
+++ b/yesod/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.4.3.1
+
+*  Handle exceptions while writing a file in `addStaticContentExternal`
+
 ## 1.4.3
 
 * Switch to `Data.Yaml.Config`
diff --git a/yesod/Yesod/Default/Util.hs b/yesod/Yesod/Default/Util.hs
index 3f5319e2..cf6f9cdc 100644
--- a/yesod/Yesod/Default/Util.hs
+++ b/yesod/Yesod/Default/Util.hs
@@ -17,9 +17,11 @@ module Yesod.Default.Util
 import qualified Data.ByteString.Lazy as L
 import Data.Text (Text, pack, unpack)
 import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent
-import Control.Exception (onException)
 import Control.Monad (when, unless)
-import System.Directory (doesFileExist, createDirectoryIfMissing, removeFile)
+import Control.Monad.Trans.Resource (runResourceT)
+import Data.Conduit (($$))
+import Data.Conduit.Binary (sourceLbs, sinkFileCautious)
+import System.Directory (doesFileExist, createDirectoryIfMissing)
 import Language.Haskell.TH.Syntax
 import Text.Lucius (luciusFile, luciusFileReload)
 import Text.Julius (juliusFile, juliusFileReload)
@@ -44,7 +46,8 @@ addStaticContentExternal
 addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
     liftIO $ createDirectoryIfMissing True statictmp
     exists <- liftIO $ doesFileExist fn'
-    unless exists $ liftIO $ L.writeFile fn' content' `onException` remove fn'
+    unless exists $
+        liftIO $ runResourceT $ sourceLbs content' $$ sinkFileCautious fn'
     return $ Just $ Right (toRoute ["tmp", pack fn], [])
   where
     fn, statictmp, fn' :: FilePath
@@ -53,7 +56,6 @@ addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
     fn = hash content ++ '.' : unpack ext'
     statictmp = staticDir ++ "/tmp/"
     fn' = statictmp ++ fn
-    remove f = doesFileExist f >>= \x -> when x $ removeFile f
 
     content' :: L.ByteString
     content'
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 5359aba0..4e42fa08 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -40,7 +40,9 @@ library
                    , bytestring
                    , monad-logger
                    , fast-logger
-                   , conduit-extra
+                   , conduit
+                   , conduit-extra             >= 1.1.14
+                   , resourcet
                    , shakespeare
                    , streaming-commons
                    , wai-logger