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. --- Types/Remote.hs | 3 +-- Types/URLClaim.hs | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 Types/URLClaim.hs (limited to 'Types') diff --git a/Types/Remote.hs b/Types/Remote.hs index bb56bb01d..baa857906 100644 --- a/Types/Remote.hs +++ b/Types/Remote.hs @@ -25,7 +25,6 @@ import Types.UUID import Types.GitConfig import Types.Availability import Types.Creds -import Types.URLClaim import Config.Cost import Utility.Metered import Git.Types @@ -104,7 +103,7 @@ data RemoteA a = Remote { -- Information about the remote, for git annex info to display. getInfo :: a [(String, String)], -- Some remotes can download from an url (or uri). - claimUrl :: Maybe (URLString -> a (Maybe URLClaim)), + claimUrl :: Maybe (URLString -> a Bool), -- Checks that the url is accessible, and gets the size of its -- content. Returns Nothing if the url is accessible, but -- its size cannot be determined inexpensively. diff --git a/Types/URLClaim.hs b/Types/URLClaim.hs deleted file mode 100644 index f14333111..000000000 --- a/Types/URLClaim.hs +++ /dev/null @@ -1,11 +0,0 @@ -{- git-annex url claiming - - - - Copyright 2014 Joey Hess - - - - Licensed under the GNU GPL version 3 or higher. - -} - -module Types.URLClaim where - -data URLClaim = URLClaimed | URLClaimedAs FilePath - deriving (Eq) -- cgit v1.2.3