diff options
author | Joey Hess <joeyh@joeyh.name> | 2014-12-11 14:09:57 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2014-12-11 14:09:57 -0400 |
commit | 4e88f7e9af6a776347649047f2473e470a729ed9 (patch) | |
tree | baa24cac409b25155aed0bcb7e006028ab743dc4 /Remote.hs | |
parent | 9949e46e150be17320c22a096ead5ffd0fb5a8a6 (diff) |
Revert "let url claims optionally include a suggested filename"
This reverts commit bc0bf97b20c48e1d1a35d25e2e76a311c102438c.
Putting filename in the claim was a bad idea.
Diffstat (limited to 'Remote.hs')
-rw-r--r-- | Remote.hs | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -46,6 +46,7 @@ module Remote ( logStatus, checkAvailable, isXMPPRemote, + claimingUrl, ) where import qualified Data.Map as M @@ -60,6 +61,7 @@ import Annex.UUID import Logs.UUID import Logs.Trust import Logs.Location hiding (logStatus) +import Logs.Web import Remote.List import Config import Git.Types (RemoteName) @@ -318,3 +320,12 @@ hasKey r k = either (Left . show) Right <$> tryNonAsync (checkPresent r k) hasKeyCheap :: Remote -> Bool hasKeyCheap = checkPresentCheap + +{- The web special remote claims urls by default. -} +claimingUrl :: URLString -> Annex Remote +claimingUrl url = do + rs <- remoteList + let web = Prelude.head $ filter (\r -> uuid r == webUUID) rs + fromMaybe web <$> firstM checkclaim rs + where + checkclaim = maybe (pure False) (flip id url) . claimUrl |