restructure: split up the server module

1 files changed, 38 insertions, 26 deletions

diff --git a/lib/Server/Util.hs b/lib/Server/Util.hs
index 0106428..290b9c5 100644
--- a/lib/Server/Util.hs
+++ b/lib/Server/Util.hs
@@ -1,33 +1,41 @@
 {-# LANGUAGE BlockArguments  #-}
 {-# LANGUAGE RecordWildCards #-}
 -- | mostly the monad the service runs in
-module Server.Util (Service, ServiceM, runService, sendErrorMsg, secondsNow, utcToSeconds, runLogging) where
+module Server.Util (Service, ServiceM, runService, sendErrorMsg, secondsNow, utcToSeconds, runLogging, getTzseries) where
 
-import           Config                 (LoggingConfig (..))
-import           Control.Exception      (handle, try)
-import           Control.Monad.Extra    (void, whenJust)
-import           Control.Monad.IO.Class (MonadIO (liftIO))
-import           Control.Monad.Logger   (Loc, LogLevel (..), LogSource, LogStr,
-                                         LoggingT (..), defaultOutput,
-                                         fromLogStr, runStderrLoggingT)
-import           Control.Monad.Reader   (ReaderT (..))
-import qualified Data.Aeson             as A
-import           Data.ByteString        (ByteString)
-import qualified Data.ByteString        as C8
-import           Data.Text              (Text)
-import qualified Data.Text              as T
-import           Data.Text.Encoding     (decodeUtf8Lenient)
-import           Data.Time              (Day, UTCTime (..), diffUTCTime,
-                                         getCurrentTime,
-                                         nominalDiffTimeToSeconds)
-import           Fmt                    ((+|), (|+))
-import           GHC.IO.Exception       (IOException (IOError))
-import           GTFS                   (Seconds (..))
-import           Prometheus             (MonadMonitor (doIO))
-import           Servant                (Handler, ServerError, ServerT, err404,
-                                         errBody, errHeaders, throwError)
-import           System.IO              (stderr)
-import           System.Process.Extra   (callProcess)
+import           Config                              (LoggingConfig (..),
+                                                      ServerConfig (..))
+import           Control.Exception                   (handle, try)
+import           Control.Monad.Extra                 (void, whenJust)
+import           Control.Monad.IO.Class              (MonadIO (liftIO))
+import           Control.Monad.Logger                (Loc, LogLevel (..),
+                                                      LogSource, LogStr,
+                                                      LoggingT (..),
+                                                      defaultOutput, fromLogStr,
+                                                      runStderrLoggingT)
+import           Control.Monad.Reader                (ReaderT (..))
+import qualified Data.Aeson                          as A
+import           Data.ByteString                     (ByteString)
+import qualified Data.ByteString                     as C8
+import           Data.Text                           (Text)
+import qualified Data.Text                           as T
+import           Data.Text.Encoding                  (decodeUtf8Lenient)
+import           Data.Time                           (Day, UTCTime (..),
+                                                      diffUTCTime,
+                                                      getCurrentTime,
+                                                      nominalDiffTimeToSeconds)
+import           Data.Time.LocalTime.TimeZone.Olson  (getTimeZoneSeriesFromOlsonFile)
+import           Data.Time.LocalTime.TimeZone.Series (TimeZoneSeries)
+import           Fmt                                 ((+|), (|+))
+import           GHC.IO.Exception                    (IOException (IOError))
+import           GTFS                                (Seconds (..))
+import           Prometheus                          (MonadMonitor (doIO))
+import           Servant                             (Handler, ServerError,
+                                                      ServerT, err404, errBody,
+                                                      errHeaders, throwError)
+import           System.FilePath                     ((</>))
+import           System.IO                           (stderr)
+import           System.Process.Extra                (callProcess)
 
 type ServiceM  = LoggingT (ReaderT LoggingConfig Handler)
 type Service api = ServerT api ServiceM
@@ -77,3 +85,7 @@ secondsNow runningDay = do
 utcToSeconds :: UTCTime -> Day -> Seconds
 utcToSeconds time day =
   Seconds $ round $ nominalDiffTimeToSeconds $ diffUTCTime time (UTCTime day 0)
+
+getTzseries :: ServerConfig -> Text -> IO TimeZoneSeries
+getTzseries settings tzname = getTimeZoneSeriesFromOlsonFile
+        (serverConfigZoneinfoPath settings </> T.unpack tzname)