From 25b8c8b199082ebbc41d1af03fc19202b798f156 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sun, 25 Nov 2012 10:45:55 +0100 Subject: A bit of cleanup --- src/Hakyll/Core/Util/File.hs | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) (limited to 'src/Hakyll/Core/Util') diff --git a/src/Hakyll/Core/Util/File.hs b/src/Hakyll/Core/Util/File.hs index 85fbd76..6d6b5c2 100644 --- a/src/Hakyll/Core/Util/File.hs +++ b/src/Hakyll/Core/Util/File.hs @@ -3,23 +3,15 @@ module Hakyll.Core.Util.File ( makeDirectories , getRecursiveContents - , isFileInternal ) where -------------------------------------------------------------------------------- -import Control.Applicative ((<$>)) -import Control.Monad (forM) -import Data.List (isPrefixOf) -import System.Directory (createDirectoryIfMissing, - doesDirectoryExist, - getDirectoryContents) -import System.FilePath (dropTrailingPathSeparator, - splitPath, takeDirectory, ()) - - --------------------------------------------------------------------------------- -import Hakyll.Core.Configuration +import Control.Applicative ((<$>)) +import Control.Monad (forM) +import System.Directory (createDirectoryIfMissing, + doesDirectoryExist, getDirectoryContents) +import System.FilePath (takeDirectory, ()) -------------------------------------------------------------------------------- @@ -50,18 +42,3 @@ getRecursiveContents top = go "" else return [rel] return $ concat paths - - --------------------------------------------------------------------------------- --- | Check if a file is meant for Hakyll internal use, i.e. if it is located in --- the destination or store directory -isFileInternal :: Configuration -- ^ Configuration - -> FilePath -- ^ File to check - -> Bool -- ^ If the given file is internal -isFileInternal configuration file = - any (`isPrefixOf` split file) dirs - where - split = map dropTrailingPathSeparator . splitPath - dirs = map (split . ($ configuration)) [ destinationDirectory - , storeDirectory - ] -- cgit v1.2.3