From f3962d32f3b88ddb66ea564dbf0c3189047410b7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Dec 2014 15:26:13 -0400 Subject: reformat --- Remote/Directory.hs | 52 ++++++++++++++++++++++++++-------------------------- Remote/External.hs | 52 ++++++++++++++++++++++++++-------------------------- Remote/Glacier.hs | 52 ++++++++++++++++++++++++++-------------------------- Remote/Hook.hs | 52 ++++++++++++++++++++++++++-------------------------- Remote/S3.hs | 52 ++++++++++++++++++++++++++-------------------------- Remote/Tahoe.hs | 50 +++++++++++++++++++++++++------------------------- Remote/Web.hs | 50 +++++++++++++++++++++++++------------------------- Remote/WebDAV.hs | 52 ++++++++++++++++++++++++++-------------------------- 8 files changed, 206 insertions(+), 206 deletions(-) diff --git a/Remote/Directory.hs b/Remote/Directory.hs index b798ff07c..66a3de49f 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -46,32 +46,32 @@ gen r u c gc = do (retrieve dir chunkconfig) (simplyPrepare $ remove dir) (simplyPrepare $ checkKey dir chunkconfig) - Remote { - uuid = u, - cost = cst, - name = Git.repoDescribe r, - storeKey = storeKeyDummy, - retrieveKeyFile = retreiveKeyFileDummy, - retrieveKeyFileCheap = retrieveCheap dir chunkconfig, - removeKey = removeKeyDummy, - checkPresent = checkPresentDummy, - checkPresentCheap = True, - whereisKey = Nothing, - remoteFsck = Nothing, - repairRepo = Nothing, - config = c, - repo = r, - gitconfig = gc, - localpath = Just dir, - readonly = False, - availability = LocallyAvailable, - remotetype = remote, - mkUnavailable = gen r u c $ - gc { remoteAnnexDirectory = Just "/dev/null" }, - getInfo = return [("directory", dir)], - claimUrl = Nothing, - checkUrl = Nothing - } + Remote + { uuid = u + , cost = cst + , name = Git.repoDescribe r + , storeKey = storeKeyDummy + , retrieveKeyFile = retreiveKeyFileDummy + , retrieveKeyFileCheap = retrieveCheap dir chunkconfig + , removeKey = removeKeyDummy + , checkPresent = checkPresentDummy + , checkPresentCheap = True + , whereisKey = Nothing + , remoteFsck = Nothing + , repairRepo = Nothing + , config = c + , repo = r + , gitconfig = gc + , localpath = Just dir + , readonly = False + , availability = LocallyAvailable + , remotetype = remote + , mkUnavailable = gen r u c $ + gc { remoteAnnexDirectory = Just "/dev/null" } + , getInfo = return [("directory", dir)] + , claimUrl = Nothing + , checkUrl = Nothing + } where dir = fromMaybe (error "missing directory") $ remoteAnnexDirectory gc diff --git a/Remote/External.hs b/Remote/External.hs index 47220c23c..dd8e793c7 100644 --- a/Remote/External.hs +++ b/Remote/External.hs @@ -48,32 +48,32 @@ gen r u c gc = do (simplyPrepare $ retrieve external) (simplyPrepare $ remove external) (simplyPrepare $ checkKey external) - Remote { - uuid = u, - cost = cst, - name = Git.repoDescribe r, - storeKey = storeKeyDummy, - retrieveKeyFile = retreiveKeyFileDummy, - retrieveKeyFileCheap = \_ _ -> return False, - removeKey = removeKeyDummy, - checkPresent = checkPresentDummy, - checkPresentCheap = False, - whereisKey = Nothing, - remoteFsck = Nothing, - repairRepo = Nothing, - config = c, - localpath = Nothing, - repo = r, - gitconfig = gc, - readonly = False, - availability = avail, - remotetype = remote, - mkUnavailable = gen r u c $ - gc { remoteAnnexExternalType = Just "!dne!" }, - getInfo = return [("externaltype", externaltype)], - claimUrl = Just (claimurl external), - checkUrl = Just (checkurl external) - } + Remote + { uuid = u + , cost = cst + , name = Git.repoDescribe r + , storeKey = storeKeyDummy + , retrieveKeyFile = retreiveKeyFileDummy + , retrieveKeyFileCheap = \_ _ -> return False + , removeKey = removeKeyDummy + , checkPresent = checkPresentDummy + , checkPresentCheap = False + , whereisKey = Nothing + , remoteFsck = Nothing + , repairRepo = Nothing + , config = c + , localpath = Nothing + , repo = r + , gitconfig = gc + , readonly = False + , availability = avail + , remotetype = remote + , mkUnavailable = gen r u c $ + gc { remoteAnnexExternalType = Just "!dne!" } + , getInfo = return [("externaltype", externaltype)] + , claimUrl = Just (claimurl external) + , checkUrl = Just (checkurl external) + } where externaltype = fromMaybe (error "missing externaltype") (remoteAnnexExternalType gc) diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index 80329b9a9..f24369d52 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -46,32 +46,32 @@ gen r u c gc = new <$> remoteCost gc veryExpensiveRemoteCost (simplyPrepare $ checkKey this) this where - this = Remote { - uuid = u, - cost = cst, - name = Git.repoDescribe r, - storeKey = storeKeyDummy, - retrieveKeyFile = retreiveKeyFileDummy, - retrieveKeyFileCheap = retrieveCheap this, - removeKey = removeKeyDummy, - checkPresent = checkPresentDummy, - checkPresentCheap = False, - whereisKey = Nothing, - remoteFsck = Nothing, - repairRepo = Nothing, - config = c, - repo = r, - gitconfig = gc, - localpath = Nothing, - readonly = False, - availability = GloballyAvailable, - remotetype = remote, - mkUnavailable = return Nothing, - getInfo = includeCredsInfo c (AWS.creds u) $ - [ ("glacier vault", getVault c) ], - claimUrl = Nothing, - checkUrl = Nothing - } + this = Remote + { uuid = u + , cost = cst + , name = Git.repoDescribe r + , storeKey = storeKeyDummy + , retrieveKeyFile = retreiveKeyFileDummy + , retrieveKeyFileCheap = retrieveCheap this + , removeKey = removeKeyDummy + , checkPresent = checkPresentDummy + , checkPresentCheap = False + , whereisKey = Nothing + , remoteFsck = Nothing + , repairRepo = Nothing + , config = c + , repo = r + , gitconfig = gc + , localpath = Nothing + , readonly = False + , availability = GloballyAvailable + , remotetype = remote + , mkUnavailable = return Nothing + , getInfo = includeCredsInfo c (AWS.creds u) $ + [ ("glacier vault", getVault c) ] + , claimUrl = Nothing + , checkUrl = Nothing + } specialcfg = (specialRemoteCfg c) -- Disabled until jobList gets support for chunks. { chunkConfig = NoChunks diff --git a/Remote/Hook.hs b/Remote/Hook.hs index d0b5f7932..5955e51c2 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -39,32 +39,32 @@ gen r u c gc = do (simplyPrepare $ retrieve hooktype) (simplyPrepare $ remove hooktype) (simplyPrepare $ checkKey r hooktype) - Remote { - uuid = u, - cost = cst, - name = Git.repoDescribe r, - storeKey = storeKeyDummy, - retrieveKeyFile = retreiveKeyFileDummy, - retrieveKeyFileCheap = retrieveCheap hooktype, - removeKey = removeKeyDummy, - checkPresent = checkPresentDummy, - checkPresentCheap = False, - whereisKey = Nothing, - remoteFsck = Nothing, - repairRepo = Nothing, - config = c, - localpath = Nothing, - repo = r, - gitconfig = gc, - readonly = False, - availability = GloballyAvailable, - remotetype = remote, - mkUnavailable = gen r u c $ - gc { remoteAnnexHookType = Just "!dne!" }, - getInfo = return [("hooktype", hooktype)], - claimUrl = Nothing, - checkUrl = Nothing - } + Remote + { uuid = u + , cost = cst + , name = Git.repoDescribe r + , storeKey = storeKeyDummy + , retrieveKeyFile = retreiveKeyFileDummy + , retrieveKeyFileCheap = retrieveCheap hooktype + , removeKey = removeKeyDummy + , checkPresent = checkPresentDummy + , checkPresentCheap = False + , whereisKey = Nothing + , remoteFsck = Nothing + , repairRepo = Nothing + , config = c + , localpath = Nothing + , repo = r + , gitconfig = gc + , readonly = False + , availability = GloballyAvailable + , remotetype = remote + , mkUnavailable = gen r u c $ + gc { remoteAnnexHookType = Just "!dne!" } + , getInfo = return [("hooktype", hooktype)] + , claimUrl = Nothing + , checkUrl = Nothing + } where hooktype = fromMaybe (error "missing hooktype") $ remoteAnnexHookType gc diff --git a/Remote/S3.hs b/Remote/S3.hs index e0d441292..f2ee8842d 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -65,37 +65,37 @@ gen r u c gc = do (prepareS3 this info $ checkKey this) this where - this = Remote { - uuid = u, - cost = cst, - name = Git.repoDescribe r, - storeKey = storeKeyDummy, - retrieveKeyFile = retreiveKeyFileDummy, - retrieveKeyFileCheap = retrieveCheap, - removeKey = removeKeyDummy, - checkPresent = checkPresentDummy, - checkPresentCheap = False, - whereisKey = Nothing, - remoteFsck = Nothing, - repairRepo = Nothing, - config = c, - repo = r, - gitconfig = gc, - localpath = Nothing, - readonly = False, - availability = GloballyAvailable, - remotetype = remote, - mkUnavailable = gen r u (M.insert "host" "!dne!" c) gc, - getInfo = includeCredsInfo c (AWS.creds u) $ catMaybes + this = Remote + { uuid = u + , cost = cst + , name = Git.repoDescribe r + , storeKey = storeKeyDummy + , retrieveKeyFile = retreiveKeyFileDummy + , retrieveKeyFileCheap = retrieveCheap + , removeKey = removeKeyDummy + , checkPresent = checkPresentDummy + , checkPresentCheap = False + , whereisKey = Nothing + , remoteFsck = Nothing + , repairRepo = Nothing + , config = c + , repo = r + , gitconfig = gc + , localpath = Nothing + , readonly = False + , availability = GloballyAvailable + , remotetype = remote + , mkUnavailable = gen r u (M.insert "host" "!dne!" c) gc + , getInfo = includeCredsInfo c (AWS.creds u) $ catMaybes [ Just ("bucket", fromMaybe "unknown" (getBucketName c)) , if configIA c then Just ("internet archive item", iaItemUrl $ fromMaybe "unknown" $ getBucketName c) else Nothing , Just ("partsize", maybe "unlimited" (roughSize storageUnits False) (getPartSize c)) - ], - claimUrl = Nothing, - checkUrl = Nothing - } + ] + , claimUrl = Nothing + , checkUrl = Nothing + } s3Setup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID) s3Setup mu mcreds c = do diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs index ac7088bea..27bb12884 100644 --- a/Remote/Tahoe.hs +++ b/Remote/Tahoe.hs @@ -64,31 +64,31 @@ gen r u c gc = do hdl <- liftIO $ TahoeHandle <$> maybe (defaultTahoeConfigDir u) return (remoteAnnexTahoe gc) <*> newEmptyTMVarIO - return $ Just $ Remote { - uuid = u, - cost = cst, - name = Git.repoDescribe r, - storeKey = store u hdl, - retrieveKeyFile = retrieve u hdl, - retrieveKeyFileCheap = \_ _ -> return False, - removeKey = remove, - checkPresent = checkKey u hdl, - checkPresentCheap = False, - whereisKey = Nothing, - remoteFsck = Nothing, - repairRepo = Nothing, - config = c, - repo = r, - gitconfig = gc, - localpath = Nothing, - readonly = False, - availability = GloballyAvailable, - remotetype = remote, - mkUnavailable = return Nothing, - getInfo = return [], - claimUrl = Nothing, - checkUrl = Nothing - } + return $ Just $ Remote + { uuid = u + , cost = cst + , name = Git.repoDescribe r + , storeKey = store u hdl + , retrieveKeyFile = retrieve u hdl + , retrieveKeyFileCheap = \_ _ -> return False + , removeKey = remove + , checkPresent = checkKey u hdl + , checkPresentCheap = False + , whereisKey = Nothing + , remoteFsck = Nothing + , repairRepo = Nothing + , config = c + , repo = r + , gitconfig = gc + , localpath = Nothing + , readonly = False + , availability = GloballyAvailable + , remotetype = remote + , mkUnavailable = return Nothing + , getInfo = return [] + , claimUrl = Nothing + , checkUrl = Nothing + } tahoeSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID) tahoeSetup mu _ c = do diff --git a/Remote/Web.hs b/Remote/Web.hs index 639eb7e3b..7d6cd2938 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -42,31 +42,31 @@ list = do gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote) gen r _ c gc = - return $ Just Remote { - uuid = webUUID, - cost = expensiveRemoteCost, - name = Git.repoDescribe r, - storeKey = uploadKey, - retrieveKeyFile = downloadKey, - retrieveKeyFileCheap = downloadKeyCheap, - removeKey = dropKey, - checkPresent = checkKey, - checkPresentCheap = False, - whereisKey = Just getWebUrls, - remoteFsck = Nothing, - repairRepo = Nothing, - config = c, - gitconfig = gc, - localpath = Nothing, - repo = r, - readonly = True, - availability = GloballyAvailable, - remotetype = remote, - mkUnavailable = return Nothing, - getInfo = return [], - claimUrl = Nothing, -- implicitly claims all urls - checkUrl = Nothing - } + return $ Just Remote + { uuid = webUUID + , cost = expensiveRemoteCost + , name = Git.repoDescribe r + , storeKey = uploadKey + , retrieveKeyFile = downloadKey + , retrieveKeyFileCheap = downloadKeyCheap + , removeKey = dropKey + , checkPresent = checkKey + , checkPresentCheap = False + , whereisKey = Just getWebUrls + , remoteFsck = Nothing + , repairRepo = Nothing + , config = c + , gitconfig = gc + , localpath = Nothing + , repo = r + , readonly = True + , availability = GloballyAvailable + , remotetype = remote + , mkUnavailable = return Nothing + , getInfo = return [] + , claimUrl = Nothing -- implicitly claims all urls + , checkUrl = Nothing + } downloadKey :: Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool downloadKey key _file dest _p = get =<< getWebUrls key diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 27a87a89c..ae1e4b972 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -51,32 +51,32 @@ gen r u c gc = new <$> remoteCost gc expensiveRemoteCost (prepareDAV this $ checkKey this chunkconfig) this where - this = Remote { - uuid = u, - cost = cst, - name = Git.repoDescribe r, - storeKey = storeKeyDummy, - retrieveKeyFile = retreiveKeyFileDummy, - retrieveKeyFileCheap = retrieveCheap, - removeKey = removeKeyDummy, - checkPresent = checkPresentDummy, - checkPresentCheap = False, - whereisKey = Nothing, - remoteFsck = Nothing, - repairRepo = Nothing, - config = c, - repo = r, - gitconfig = gc, - localpath = Nothing, - readonly = False, - availability = GloballyAvailable, - remotetype = remote, - mkUnavailable = gen r u (M.insert "url" "http://!dne!/" c) gc, - getInfo = includeCredsInfo c (davCreds u) $ - [("url", fromMaybe "unknown" (M.lookup "url" c))], - claimUrl = Nothing, - checkUrl = Nothing - } + this = Remote + { uuid = u + , cost = cst + , name = Git.repoDescribe r + , storeKey = storeKeyDummy + , retrieveKeyFile = retreiveKeyFileDummy + , retrieveKeyFileCheap = retrieveCheap + , removeKey = removeKeyDummy + , checkPresent = checkPresentDummy + , checkPresentCheap = False + , whereisKey = Nothing + , remoteFsck = Nothing + , repairRepo = Nothing + , config = c + , repo = r + , gitconfig = gc + , localpath = Nothing + , readonly = False + , availability = GloballyAvailable + , remotetype = remote + , mkUnavailable = gen r u (M.insert "url" "http://!dne!/" c) gc + , getInfo = includeCredsInfo c (davCreds u) $ + [("url", fromMaybe "unknown" (M.lookup "url" c))] + , claimUrl = Nothing + , checkUrl = Nothing + } chunkconfig = getChunkConfig c webdavSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID) -- cgit v1.2.3