first pass at using new keys
It compiles. It sorta works. Several subcommands are FIXME marked and broken, because things that used to accept separate --backend and --key params need to be changed to accept just a --key that encodes all the key info, now that there is metadata in keys.
This commit is contained in:
parent
675ee89749
commit
9d49fe2c17
20 changed files with 116 additions and 123 deletions
|
@ -11,6 +11,7 @@ import Control.Monad (when)
|
|||
import Control.Monad.State (liftIO)
|
||||
import qualified Data.Map as M
|
||||
import System.Directory
|
||||
import Data.Maybe
|
||||
|
||||
import Command
|
||||
import Types
|
||||
|
@ -19,6 +20,7 @@ import Locations
|
|||
import qualified Annex
|
||||
import qualified Command.Drop
|
||||
import Backend
|
||||
import Key
|
||||
|
||||
command :: [Command]
|
||||
command = [Command "dropunused" (paramRepeating paramNumber) seek
|
||||
|
@ -55,7 +57,6 @@ readUnusedLog = do
|
|||
return $ M.fromList $ map parse $ lines l
|
||||
else return $ M.empty
|
||||
where
|
||||
parse line = (head ws, tokey $ unwords $ tail ws)
|
||||
parse line = (head ws, fromJust $ readKey $ unwords $ tail ws)
|
||||
where
|
||||
ws = words line
|
||||
tokey s = read s :: Key
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue