@@ -68,10 +68,9 @@ import qualified Text.Pandoc.Shared as IO ( fetchItem
69 , readDataFile)
69 , readDataFile)
70import Text.Pandoc.MediaBag (MediaBag, lookupMedia)
70import Text.Pandoc.MediaBag (MediaBag, lookupMedia)
71−import Data.Time.Clock.POSIX (POSIXTime, utcTimeToPOSIXSeconds)
72−import qualified Data.Time.Clock.POSIX as IO (getPOSIXTime)
73import Text.Pandoc.Compat.Time (UTCTime)
71import Text.Pandoc.Compat.Time (UTCTime)
74import qualified Text.Pandoc.Compat.Time as IO (getCurrentTime)
72import qualified Text.Pandoc.Compat.Time as IO (getCurrentTime)
73+import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds, POSIXTime )
75import Text.Pandoc.MIME (MimeType, getMimeType)
74import Text.Pandoc.MIME (MimeType, getMimeType)
76import qualified Data.ByteString as B
75import qualified Data.ByteString as B
77import qualified Data.ByteString.Lazy as BL
76import qualified Data.ByteString.Lazy as BL
@@ -89,7 +88,6 @@ import Data.Typeable
89data PandocActionF nxt =
88data PandocActionF nxt =
90 LookupEnv String (Maybe String -> nxt)
89 LookupEnv String (Maybe String -> nxt)
91 | GetCurrentTime (UTCTime -> nxt)
90 | GetCurrentTime (UTCTime -> nxt)
92− | GetPOSIXTime (POSIXTime -> nxt)
93 | GetDefaultReferenceDocx (Maybe FilePath) (Archive -> nxt)
91 | GetDefaultReferenceDocx (Maybe FilePath) (Archive -> nxt)
94 | GetDefaultReferenceODT (Maybe FilePath) (Archive -> nxt)
92 | GetDefaultReferenceODT (Maybe FilePath) (Archive -> nxt)
95 | NewStdGen (StdGen -> nxt)
93 | NewStdGen (StdGen -> nxt)
@@ -114,7 +112,7 @@ getCurrentTime :: PandocAction UTCTime
114getCurrentTime = liftF $ GetCurrentTime id
112getCurrentTime = liftF $ GetCurrentTime id
116getPOSIXTime :: PandocAction POSIXTime
114getPOSIXTime :: PandocAction POSIXTime
117−getPOSIXTime = liftF $ GetPOSIXTime id
115+getPOSIXTime = utcTimeToPOSIXSeconds <$> getCurrentTime
119getDefaultReferenceDocx :: Maybe FilePath -> PandocAction Archive
117getDefaultReferenceDocx :: Maybe FilePath -> PandocAction Archive
120getDefaultReferenceDocx fp = liftF $ GetDefaultReferenceDocx fp id
118getDefaultReferenceDocx fp = liftF $ GetDefaultReferenceDocx fp id
@@ -158,7 +156,6 @@ glob s = liftF $ Glob s id
158runIO :: PandocAction nxt -> IO nxt
156runIO :: PandocAction nxt -> IO nxt
159runIO (Free (LookupEnv s f)) = IO.lookupEnv s >>= runIO . f
157runIO (Free (LookupEnv s f)) = IO.lookupEnv s >>= runIO . f
160runIO (Free (GetCurrentTime f)) = IO.getCurrentTime >>= runIO . f
158runIO (Free (GetCurrentTime f)) = IO.getCurrentTime >>= runIO . f
161−runIO (Free (GetPOSIXTime f)) = IO.getPOSIXTime >>= runIO . f
162runIO (Free (GetDefaultReferenceDocx mfp f)) =
159runIO (Free (GetDefaultReferenceDocx mfp f)) =
163 IO.getDefaultReferenceDocx mfp >>= runIO . f
160 IO.getDefaultReferenceDocx mfp >>= runIO . f
164runIO (Free (GetDefaultReferenceODT mfp f)) =
161runIO (Free (GetDefaultReferenceODT mfp f)) =
@@ -211,8 +208,6 @@ runTest (Free (LookupEnv s f)) = do
211 return (lookup s env) >>= runTest . f
208 return (lookup s env) >>= runTest . f
212runTest (Free (GetCurrentTime f)) =
209runTest (Free (GetCurrentTime f)) =
213 asks envTime >>= runTest . f
210 asks envTime >>= runTest . f
214−runTest (Free (GetPOSIXTime f)) =
215− (utcTimeToPOSIXSeconds <$> asks envTime) >>= runTest . f
216runTest (Free (GetDefaultReferenceDocx _ f)) =
211runTest (Free (GetDefaultReferenceDocx _ f)) =
217 asks envReferenceDocx >>= runTest . f
212 asks envReferenceDocx >>= runTest . f
218runTest (Free (GetDefaultReferenceODT _ f)) =
213runTest (Free (GetDefaultReferenceODT _ f)) =