From 4e88f7e9af6a776347649047f2473e470a729ed9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Dec 2014 14:09:57 -0400 Subject: Revert "let url claims optionally include a suggested filename" This reverts commit bc0bf97b20c48e1d1a35d25e2e76a311c102438c. Putting filename in the claim was a bad idea. --- Remote.hs | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Remote.hs') diff --git a/Remote.hs b/Remote.hs index dd682493c..65e725338 100644 --- a/Remote.hs +++ b/Remote.hs @@ -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 -- cgit v1.2.3