fixed error and action reporting

2 files changed, 21 insertions, 3 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 78fb40c..532acb8 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -10,6 +10,8 @@ module KeyRing
     , KikiResult(..)
     , KikiCondition(..)
     , KikiReportAction(..)
+    , errorString
+    , reportString
     , KeyRingRuntime(..)
     , InputFile(..)
     , FileType(..)
@@ -394,6 +396,22 @@ data KikiReportAction =
         | HostsDiff ByteString
  deriving Show
 
+uncamel :: String -> String
+uncamel str = unwords $ firstWord ++ (toLower .: otherWords) ++ args
+  where
+    (.:) = fmap . fmap
+    ( firstWord  ,
+      otherWords ) = splitAt 1 ws
+    ws             = camel >>= groupBy (\_ c -> isLower c)
+    ( camel, args) = splitAt 1 $ words str
+
+reportString :: KikiReportAction -> String
+reportString x = uncamel $ show x
+
+errorString :: KikiCondition a -> String
+errorString (KikiSuccess {}) = "success"
+errorString e = uncamel . show $ fmap (const ()) e
+
 data KikiResult a = KikiResult
     { kikiCondition :: KikiCondition a
     , kikiReport :: [ (FilePath, KikiReportAction) ]
diff --git a/kiki.hs b/kiki.hs
index cf3b453..9bfbd2d 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -750,10 +750,10 @@ main = do
                 shargs = mapMaybe (\(x:xs) -> (,xs) <$> Map.lookup x shspec) sargs
 
             forM_ shargs $ \(cmd,args) -> cmd args (rtKeyDB rt)
-      e -> print (void e)--(fmap (const ()) e)
+      e -> putStrLn $ errorString e
 
-    print report
-    return()
+    forM_ report $ \(fname,act) -> do
+        putStrLn $ fname ++ ": " ++ reportString act
  where
 
     doAutosign rt kd@(KeyData k ksigs umap submap) = ops