1 files changed, 36 insertions, 2 deletions

diff --git a/lib/Types.hs b/lib/Types.hs
index 686614e..dd519de 100644
--- a/lib/Types.hs
+++ b/lib/Types.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE DeriveFunctor #-}
 module Types where
 
+import           Data.Char (isLower,toLower)
+import           Data.List (groupBy)
 import           Data.Map as Map (Map)
 import qualified Data.Map as Map
 import           Data.OpenPGP
@@ -113,7 +115,7 @@ data PassphraseSpec = PassphraseSpec
     -- ^ The passphrase will be read from this file or file descriptor.
     }
     -- | Use this to carry pasphrases from a previous run.
-    | PassphraseMemoizer PacketTranscoder
+    | PassphraseMemoizer { passSpecTranscoder :: PacketTranscoder }
     | PassphraseAgent
 
 instance Show PassphraseSpec where
@@ -125,7 +127,24 @@ instance Eq PassphraseSpec where
     _ == _
         = False
 
-
+-- Ord instance for PassphraseSpec generally orders by generality with the most
+-- general being greatest and the least general being least.  The one exception
+-- is the 'PassphraseMemoizer' which is considered least of all even though it
+-- is very general.  This is so an existing memoizer will be tried first, and
+-- if there is none, one will be created that tries the others in order of
+-- increasing generality.  Key-specialization is considered less general than
+-- file-specialization.
+instance Ord PassphraseSpec where
+    compare (PassphraseMemoizer _) (PassphraseMemoizer _) = EQ
+    compare PassphraseAgent PassphraseAgent               = EQ
+    compare (PassphraseMemoizer _) _                      = LT
+    compare (PassphraseSpec a b c) (PassphraseSpec d e f)
+        | fmap (const ()) a == fmap (const ()) d
+          && fmap (const ()) b == fmap (const ()) e       = compare (a,b,c) (d,e,f)
+    compare (PassphraseSpec (Just _) (Just _) _)  _       = LT
+    compare (PassphraseSpec Nothing (Just _) _) _         = LT
+    compare (PassphraseSpec (Just _) _  _) _              = LT
+    compare PassphraseAgent _                             = GT
 
 data Transform =
         Autosign
@@ -253,6 +272,21 @@ instance Applicative KikiCondition where
                             Left err -> err
             Left err -> err
 
+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
+
+errorString :: KikiCondition a -> String
+errorString (KikiSuccess {}) = "success"
+errorString e = uncamel . show $ fmap (const ()) e
+
+
+
 data InputFileContext = InputFileContext
     { homesecPath :: FilePath
     , homepubPath :: FilePath