changed kFiles to use StreamInfo as element type.

1 files changed, 21 insertions, 11 deletions

diff --git a/kiki.hs b/kiki.hs
index f5e3863..d9e12b6 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -808,22 +808,24 @@ sync bExport bImport bSecret cmdarg args_raw = do
     let keypairs = catMaybes keypairs0
         homespec = join . take 1 <$> Map.lookup "--homedir" margs
         passfd = fmap (FileDesc . read) passphrase_fd
-        reftyp = if bExport then MutableRef Nothing
-                                 else ConstRef
+        reftyp = if bExport then KF_All
+                            else KF_None
         pems = flip map keypairs 
                 $ \(usage,path,cmd) ->
                     let cmd' = mfilter (not . null) (Just cmd)
                     in if bExport
-                        then (ArgFile path, (MutableRef cmd', PEMFile usage)) 
+                        then (ArgFile path, StreamInfo { fill = KF_All
+                                                       , typ = PEMFile usage
+                                                       , initializer = cmd' })
                         else if isNothing cmd'
-                                then (ArgFile path, (ConstRef, PEMFile usage))
+                                then (ArgFile path, buildStreamInfo KF_None (PEMFile usage))
                                 else error "Unexpected PEM file initializer."
-        walts = map (\fname -> (ArgFile fname, (reftyp, WalletFile)))
+        walts = map (\fname -> (ArgFile fname, buildStreamInfo reftyp WalletFile))
                     wallets
-        rings = map (\fname -> (ArgFile fname, (reftyp, KeyRingFile passfd)))
+        rings = map (\fname -> (ArgFile fname, buildStreamInfo reftyp (KeyRingFile passfd)))
                     keyrings_
         hosts = maybe [] (map decorate) $ Map.lookup "--hosts" margs
-                    where decorate fname = (ArgFile fname, (reftyp, Hosts))
+                    where decorate fname = (ArgFile fname, buildStreamInfo reftyp Hosts)
         importStyle = maybe (\_ _ -> subkeysOnly)
                             (\f rt kd -> f rt kd >> importPublic)
                         $ mplus import_f importifauth_f
@@ -832,10 +834,15 @@ sync bExport bImport bSecret cmdarg args_raw = do
                               return $ \rt kd -> Just ()
                 importifauth_f = do Map.lookup "--import-if-authentic" margs
                                     return guardAuthentic
+        buildStreamInfo rtyp ftyp = StreamInfo { typ = ftyp, fill = rtyp }
         kikiOp = KeyRingOperation
             { kFiles = Map.fromList $
-                [ ( HomeSec, (if bSecret && bImport then MutableRef Nothing else ConstRef, KeyRingFile passfd) )
-                , ( HomePub, (if bImport then MutableRef Nothing else ConstRef, KeyRingFile Nothing) )
+                [ ( HomeSec, buildStreamInfo (if bSecret && bImport then KF_All
+                                                                    else KF_None)
+                                             (KeyRingFile passfd) )
+                , ( HomePub, buildStreamInfo (if bImport then KF_All
+                                                         else KF_None)
+                                             (KeyRingFile Nothing) )
                 ]
                 ++ rings
                 ++ if bSecret then pems else []
@@ -929,10 +936,13 @@ kiki "show" args = do
         rings = []
         hosts = []
         walts = []
+        streaminfo = StreamInfo { fill = KF_None
+                                , typ = KeyRingFile passfd
+                                }
         kikiOp = KeyRingOperation
             { kFiles = Map.fromList $
-                [ ( HomeSec, (ConstRef, KeyRingFile passfd)  )
-                , ( HomePub, (ConstRef, KeyRingFile Nothing) )
+                [ ( HomeSec, streaminfo )
+                , ( HomePub, streaminfo )
                 ]
                 ++ rings
                 ++ pems