From 2769f225c1cf55fdf489e13e11eb8529af521c54 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Tue, 18 Feb 2020 18:21:54 +0100
Subject: [PATCH] Add date block from cli (POC for push blocks)
---
src/QBar/Cli.hs | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/QBar/Cli.hs b/src/QBar/Cli.hs
index 1d6c7e2..779610e 100644
--- a/src/QBar/Cli.hs
+++ b/src/QBar/Cli.hs
@@ -2,6 +2,7 @@
module QBar.Cli where
+import QBar.Blocks
import QBar.Blocks.Pipe
import QBar.ControlSocket
import QBar.Core
@@ -55,9 +56,14 @@ pipeBlockParser = do
barConfigurationParser :: Parser (BarIO ())
barConfigurationParser = do
- blocks <- many $ hsubparser (
- command "default" (info (pure defaultBarConfig) (progDesc "Load default set of blocks."))
- )
+ blocks <- many blockParser
pure $ case blocks of
+ -- Load default config if no blocks are selected on the command line
[] -> defaultBarConfig
l -> sequence_ l
+
+blockParser :: Parser (BarIO ())
+blockParser = hsubparser (
+ command "default" (info (pure defaultBarConfig) (progDesc "Load default set of blocks.")) <>
+ command "date" (info (pure $ addBlock dateBlock) (progDesc "Load the date and time block."))
+ )
--
GitLab