fromkey, and url backend download work now

This commit is contained in:
Joey Hess 2011-03-15 22:28:18 -04:00
parent 27472710c7
commit da504f647f
2 changed files with 11 additions and 14 deletions

View file

@ -8,12 +8,12 @@
module Backend.URL (backends) where
import Control.Monad.State (liftIO)
import Data.String.Utils
import Types
import BackendClass
import Utility
import Messages
import Key
backends :: [Backend Annex]
backends = [backend]
@ -52,8 +52,8 @@ dummyOk _ = return True
downloadUrl :: Key -> FilePath -> Annex Bool
downloadUrl key file = do
showNote "downloading"
showNote $ "downloading"
showProgress -- make way for curl progress bar
liftIO $ boolSystem "curl" [Params "-# -o", File file, File url]
where
url = join ":" $ drop 1 $ split ":" $ show key
url = keyName key

View file

@ -17,7 +17,6 @@ import Data.List
import Types
import qualified Backend
import qualified BackendClass
import Messages
import qualified Annex
import qualified GitRepo as Git
@ -230,20 +229,18 @@ paramName = "NAME"
paramNothing :: String
paramNothing = ""
{- The Key specified by the --key and --backend parameters. -}
{- The Key specified by the --key parameter. -}
cmdlineKey :: Annex Key
cmdlineKey = do
k <- Annex.getState Annex.defaultkey
backends <- Backend.list
return $ stubKey {
keyName = kname k,
keyBackendName = BackendClass.name $ head backends
}
case k of
Nothing -> nokey
Just "" -> nokey
Just kstring -> case readKey kstring of
Nothing -> error "bad key"
Just key -> return key
where
kname Nothing = badkey
kname (Just "") = badkey
kname (Just n) = n
badkey = error "please specify the key with --key"
nokey = error "please specify the key with --key"
{- Given an original list of files, and an expanded list derived from it,
- ensures that the original list's ordering is preserved.