From 0ddf8152ce1353bbbcd7c87c3f67063b4aed892b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 2 Aug 2014 15:34:09 -0400
Subject: specialize Preparer a bit, so resourcePrepare can be added

The forall a. in Preparer made resourcePrepare not seem to be usable, so
I specialized a to Bool. Which works for both Preparer Storer and
Preparer Retriever, but wouldn't let the Preparer be used for hasKey
as it currently stands.
---
 Remote/Directory.hs                 | 1 -
 Remote/Directory/LegacyChunked.hs   | 2 --
 Remote/Helper/ChunkedEncryptable.hs | 6 ++++++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'Remote')

diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index 37942a295..a87987529 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -6,7 +6,6 @@
  -}
 
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE Rank2Types #-}
 
 module Remote.Directory (remote) where
 
diff --git a/Remote/Directory/LegacyChunked.hs b/Remote/Directory/LegacyChunked.hs
index 312119f4e..5c200570c 100644
--- a/Remote/Directory/LegacyChunked.hs
+++ b/Remote/Directory/LegacyChunked.hs
@@ -7,8 +7,6 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE Rank2Types #-}
-
 module Remote.Directory.LegacyChunked where
 
 import qualified Data.ByteString.Lazy as L
diff --git a/Remote/Helper/ChunkedEncryptable.hs b/Remote/Helper/ChunkedEncryptable.hs
index 2a844212b..1267f5b59 100644
--- a/Remote/Helper/ChunkedEncryptable.hs
+++ b/Remote/Helper/ChunkedEncryptable.hs
@@ -14,6 +14,7 @@ module Remote.Helper.ChunkedEncryptable (
 	simplyPrepare,
 	ContentSource,
 	checkPrepare,
+	resourcePrepare,
 	fileStorer,
 	byteStorer,
 	fileRetriever,
@@ -49,6 +50,11 @@ checkPrepare checker helper k a = ifM (checker k)
 	, a Nothing
 	)
 
+-- Use to acquire a resource when preparing a helper.
+resourcePrepare :: (Key -> (r -> Annex Bool) -> Annex Bool) -> (r -> helper) -> Preparer helper
+resourcePrepare withr helper k a = withr k $ \r ->
+        a (Just (helper r))
+
 -- A Storer that expects to be provided with a file containing
 -- the content of the key to store.
 fileStorer :: (Key -> FilePath -> MeterUpdate -> Annex Bool) -> Storer
-- 
cgit v1.2.3