mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Added --mimetype and --mimeencoding file matching options.

Browse source 
Already had these for largefiles matching, but I forgot to add them as
command-line options.
This commit is contained in:
Joey Hess 2019-09-19 11:32:12 -04:00
parent 133aba5729
commit fda1bdd679
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 75 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Annex/Magic.hs
View file

@ -17,6 +17,7 @@ module Annex.Magic (
) where
import Types.Mime
import Control.Monad.IO.Class
#ifdef WITH_MAGICMIME
import Magic
import Utility.Env
@ -52,8 +53,8 @@ getMagicMime m f = Just . parse <$> magicFile m f
getMagicMime _ _ = return Nothing
#endif
getMagicMimeType :: Magic -> FilePath -> IO (Maybe MimeType)
getMagicMimeType m f = fmap fst <$> getMagicMime m f
getMagicMimeType :: MonadIO m => Magic -> FilePath -> m (Maybe MimeType)
getMagicMimeType m f = liftIO $ fmap fst <$> getMagicMime m f
getMagicMimeEncoding :: Magic -> FilePath -> IO (Maybe MimeEncoding)
getMagicMimeEncoding m f = fmap snd <$> getMagicMime m f
getMagicMimeEncoding :: MonadIO m => Magic -> FilePath -> m(Maybe MimeEncoding)
getMagicMimeEncoding m f = liftIO $ fmap snd <$> getMagicMime m f