From 91ff25a8d208376e6caad4375b6a56ba8c577b83 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Sun, 1 Jan 2023 11:14:58 -0500 Subject: [PATCH] ENH don't use putstrln for printing packages --- bin/xmobar.hs | 8 ++++---- bin/xmonad.hs | 2 +- lib/Data/Internal/Dependency.hs | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/xmobar.hs b/bin/xmobar.hs index f15b839..e81af0d 100644 --- a/bin/xmobar.hs +++ b/bin/xmobar.hs @@ -66,10 +66,10 @@ evalConfig db = do printDeps :: FIO () printDeps = withDBus_ $ \db -> - mapM_ (liftIO . putStrLn . T.unpack) $ - sort $ - nub $ - fmap showFulfillment $ + mapM_ logInfo $ + fmap showFulfillment $ + sort $ + nub $ concatMap dumpFeature $ allFeatures db diff --git a/bin/xmonad.hs b/bin/xmonad.hs index ca7e33a..6af3f15 100644 --- a/bin/xmonad.hs +++ b/bin/xmonad.hs @@ -217,7 +217,7 @@ withXmobar = bracket startXmobar cleanup printDeps :: FIO () printDeps = withDBus_ $ \db -> do (i, f, d) <- allFeatures db - mapM_ (liftIO . putStrLn . T.unpack) $ + mapM_ logInfo $ fmap showFulfillment $ sort $ nub $ diff --git a/lib/Data/Internal/Dependency.hs b/lib/Data/Internal/Dependency.hs index e63b623..a28f84d 100644 --- a/lib/Data/Internal/Dependency.hs +++ b/lib/Data/Internal/Dependency.hs @@ -186,8 +186,9 @@ logMsg (FMsg fn n (Msg ll m)) = do -------------------------------------------------------------------------------- -- Package status -showFulfillment :: Fulfillment -> T.Text -showFulfillment (Package t n) = T.concat [T.pack $ show t, "\t", n] +showFulfillment :: Fulfillment -> Utf8Builder +showFulfillment (Package t n) = + displayShow t <> "\t" <> Utf8Builder (encodeUtf8Builder n) dumpFeature :: Feature a -> [Fulfillment] dumpFeature = either dumpSometimes dumpAlways