add readFileStrictAnyEncoding

Assistant/WebApp/Control.hs

@@ -67,9 +67,5 @@ getLogR :: Handler Html
 getLogR = page "Logs" Nothing $ do
 	logfile <- liftAnnex $ fromRepo gitAnnexLogFile
 	logs <- liftIO $ listLogs logfile
-	logcontent <- liftIO $ concat <$> mapM readlog logs
+	logcontent <- liftIO $ concat <$> mapM readFileStrictAnyEncoding logs
 	$(widgetFile "control/log")
-  where
-	readlog f = withFile f ReadMode $ \h -> do
-		fileEncoding h -- log may contain invalid utf-8
-		hClose h `after` hGetContentsStrict h

Command/ImportFeed.hs

@@ -106,7 +106,7 @@ downloadFeed url = do
 	liftIO $ withTmpFile "feed" $ \f h -> do
 		fileEncoding h
 		ifM (Url.download url [] [] f ua)
-			( liftIO $ parseFeedString <$> hGetContentsStrict h
+			( parseFeedString <$> hGetContentsStrict h
 			, return Nothing
 			)
 

Utility/Misc.hs

@@ -21,6 +21,9 @@ import System.Posix.Process (getAnyProcessStatus)
 import Utility.Exception
 #endif
 
+import Utility.FileSystemEncoding
+import Utility.Monad
+
 {- A version of hgetContents that is not lazy. Ensures file is 
  - all read before it gets closed. -}
 hGetContentsStrict :: Handle -> IO String
@@ -30,6 +33,13 @@ hGetContentsStrict = hGetContents >=> \s -> length s `seq` return s
 readFileStrict :: FilePath -> IO String
 readFileStrict = readFile >=> \s -> length s `seq` return s
 
+{-  Reads a file strictly, and using the FileSystemEncofing, so it will
+ -  never crash on a badly encoded file. -}
+readFileStrictAnyEncoding :: FilePath -> IO String
+readFileStrictAnyEncoding f = withFile f ReadMode $ \h -> do
+	fileEncoding h
+	hClose h `after` hGetContentsStrict h
+
 {- Like break, but the item matching the condition is not included
  - in the second result list.
  -