more Wall cleaning

This commit is contained in:
Joey Hess 2010-10-31 16:00:32 -04:00
parent b2c28c1ac0
commit cf4c926f2e
8 changed files with 23 additions and 32 deletions

View file

@ -15,25 +15,18 @@
module Backend.File (backend) where
import Control.Monad.State
import System.IO
import System.Cmd
import System.Cmd.Utils
import Control.Exception
import System.Directory
import List
import Maybe
import TypeInternals
import LocationLog
import Locations
import qualified Remotes
import qualified GitRepo as Git
import Utility
import Core
import qualified Annex
import UUID
import qualified Backend
backend :: Backend
backend = Backend {
name = mustProvide,
getKey = mustProvide,
@ -43,11 +36,12 @@ backend = Backend {
hasKey = checkKeyFile
}
mustProvide :: a
mustProvide = error "must provide this field"
{- Storing a key is a no-op. -}
dummyStore :: FilePath -> Key -> Annex (Bool)
dummyStore file key = return True
dummyStore _ _ = return True
{- Just check if the .git/annex/ file for the key exists. -}
checkKeyFile :: Key -> Annex Bool
@ -146,7 +140,8 @@ showLocations key = do
if (null uuidsf)
then showLongNote $ "No other repository is known to contain the file."
else showLongNote $ "Try making some of these repositories available:\n" ++ ppuuids
showTriedRemotes :: [Git.Repo] -> Annex ()
showTriedRemotes [] = return ()
showTriedRemotes remotes =
showLongNote $ "I was unable to access these remotes: " ++

View file

@ -15,6 +15,7 @@ import System.IO
import qualified Backend.File
import TypeInternals
backend :: Backend
backend = Backend.File.backend {
name = "SHA1",
getKey = keyValue

View file

@ -9,14 +9,12 @@ module Backend.URL (backend) where
import Control.Monad.State (liftIO)
import Data.String.Utils
import System.Cmd
import System.Cmd.Utils
import System.Exit
import TypeInternals
import Core
import Utility
backend :: Backend
backend = Backend {
name = "URL",
getKey = keyValue,
@ -28,15 +26,15 @@ backend = Backend {
-- cannot generate url from filename
keyValue :: FilePath -> Annex (Maybe Key)
keyValue file = return Nothing
keyValue _ = return Nothing
-- cannot change url contents
dummyStore :: FilePath -> Key -> Annex Bool
dummyStore file url = return False
dummyStore _ _ = return False
-- allow keys to be removed; presumably they can always be downloaded again
dummyOk :: Key -> Annex Bool
dummyOk url = return True
dummyOk _ = return True
downloadUrl :: Key -> FilePath -> Annex Bool
downloadUrl key file = do

View file

@ -10,12 +10,11 @@ module Backend.WORM (backend) where
import Control.Monad.State
import System.FilePath
import System.Posix.Files
import qualified Data.ByteString.Lazy.Char8 as B
import qualified Backend.File
import TypeInternals
import Utility
backend :: Backend
backend = Backend.File.backend {
name = "WORM",
getKey = keyValue