From 7f5d0b170099704d1a2016e2af1d9bfbde7ea1ad Mon Sep 17 00:00:00 2001
From: defanor <defanor@uberspace.net>
Date: Tue, 19 Dec 2017 02:43:21 +0300
Subject: Enable a user to specify a configuration file

This covers both command-line options and the "load config" (former
"reload config") command.
---
 Pancake/Configuration.hs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'Pancake/Configuration.hs')

diff --git a/Pancake/Configuration.hs b/Pancake/Configuration.hs
index ae42f65..772725e 100644
--- a/Pancake/Configuration.hs
+++ b/Pancake/Configuration.hs
@@ -116,11 +116,14 @@ instance Default Config where
         "-w \"\n-pancake-\nuri: %{url_effective}\ntype: %{content_type}\n\" "
 
 -- | Loads configuration from an XDG config directory.
-loadConfig :: MonadIO m => m Config
-loadConfig = liftIO $ do
-  dir <- getXdgDirectory XdgConfig "pancake"
-  createDirectoryIfMissing True dir
-  let configPath = dir </> "config.yaml"
+loadConfig :: MonadIO m => Maybe FilePath -> m Config
+loadConfig mp = liftIO $ do
+  configPath <- case mp of
+    Nothing -> do
+      dir <- getXdgDirectory XdgConfig "pancake"
+      createDirectoryIfMissing True dir
+      pure $ dir </> "config.yaml"
+    Just p -> pure p
   exists <- doesFileExist configPath
   if exists
     then do
-- 
cgit v1.2.3