1 files changed, 16 insertions, 4 deletions
diff --git a/lib/Server/Util.hs b/lib/Server/Util.hs
index 290b9c5..b519a86 100644
--- a/lib/Server/Util.hs
+++ b/lib/Server/Util.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE BlockArguments  #-}
 {-# LANGUAGE RecordWildCards #-}
 -- | mostly the monad the service runs in
-module Server.Util (Service, ServiceM, runService, sendErrorMsg, secondsNow, utcToSeconds, runLogging, getTzseries) where
+module Server.Util (Service, ServiceM, runService, sendErrorMsg, secondsNow, utcToSeconds, runLogging, getTzseries, serveDirectoryFileServer) where
 
 import           Config                              (LoggingConfig (..),
                                                       ServerConfig (..))
@@ -27,14 +27,18 @@ import           Data.Time                           (Day, UTCTime (..),
 import           Data.Time.LocalTime.TimeZone.Olson  (getTimeZoneSeriesFromOlsonFile)
 import           Data.Time.LocalTime.TimeZone.Series (TimeZoneSeries)
 import           Fmt                                 ((+|), (|+))
+import           GHC.IO                              (unsafePerformIO)
 import           GHC.IO.Exception                    (IOException (IOError))
 import           GTFS                                (Seconds (..))
 import           Prometheus                          (MonadMonitor (doIO))
+import qualified Servant
 import           Servant                             (Handler, ServerError,
                                                       ServerT, err404, errBody,
                                                       errHeaders, throwError)
-import           System.FilePath                     ((</>))
 import           System.IO                           (stderr)
+import           System.OsPath                       (OsPath, decodeFS,
+                                                      decodeUtf, encodeUtf,
+                                                      (</>))
 import           System.Process.Extra                (callProcess)
 
 type ServiceM  = LoggingT (ReaderT LoggingConfig Handler)
@@ -87,5 +91,13 @@ 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)
+getTzseries settings tzname = do
+  suffix <- encodeUtf (T.unpack tzname)
+  -- TODO: submit a patch to timezone-olson making it accept OsPath
+  legacyPath <- decodeFS (serverConfigZoneinfoPath settings </> suffix)
+  getTimeZoneSeriesFromOlsonFile legacyPath
+
+-- TODO: patch servant / wai to use OsPath?
+serveDirectoryFileServer :: OsPath -> ServerT Servant.Raw m
+serveDirectoryFileServer =
+  Servant.serveDirectoryFileServer . unsafePerformIO . decodeUtf