factor out Types.Transferrer

diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs
index ba2044e2fb42b382f044d64eee6c697d2772d7e0..d08b7f7ee1b63d0881fa9f4c1df8111e9dae2207 100644 (file)
--- a/Annex/Transfer.hs
+++ b/Annex/Transfer.hs
@@ -34,6 +34,7 @@ import Utility.Metered
 import Utility.ThreadScheduler
 import Annex.LockPool
 import Types.Key
+import Types.Transferrer
 import qualified Types.Remote as Remote
 import Types.Concurrency
 import Annex.Concurrent.Utility

diff --git a/Annex/TransferrerPool.hs b/Annex/TransferrerPool.hs
index 8e5894a59020ebc4435368c29fb129ee9106b555..81231b3f8a5c4b291c19f2223dac402fcf920e5b 100644 (file)
--- a/Annex/TransferrerPool.hs
+++ b/Annex/TransferrerPool.hs
@@ -12,10 +12,10 @@ module Annex.TransferrerPool where
 import Annex.Common
 import qualified Annex
 import Types.TransferrerPool
+import Types.Transferrer
 import Types.Transfer
 import Types.Key
 import qualified Types.Remote as Remote
-import Git.Types (RemoteName)
 import Types.StallDetection
 import Types.Messages
 import Messages.Serialized
@@ -33,17 +33,6 @@ import Text.Read (readMaybe)
 import Data.Time.Clock.POSIX
 import System.Log.Logger (debugM)
 
-data TransferRequest = TransferRequest TransferRequestLevel Direction (Either UUID RemoteName) KeyData AssociatedFile
-       deriving (Show, Read)
-
-data TransferRequestLevel = AnnexLevel | AssistantLevel
-       deriving (Show, Read)
-
-data TransferResponse
-       = TransferOutput SerializedOutput
-       | TransferResult Bool
-       deriving (Show, Read)
-
 {- Runs an action with a Transferrer from the pool. -}
 withTransferrer :: (Transferrer -> Annex a) -> Annex a
 withTransferrer a = do

diff --git a/Assistant/TransferSlots.hs b/Assistant/TransferSlots.hs
index ee3e17e280ee1c9b8e00f51d66d4e628e797fd84..fccef96f3012e8cbcd40b8758dcbcf7dcfd764e8 100644 (file)
--- a/Assistant/TransferSlots.hs
+++ b/Assistant/TransferSlots.hs
@@ -26,6 +26,7 @@ import Assistant.Commits
 import Assistant.Drop
 import Annex.Transfer (stallDetection)
 import Types.Transfer
+import Types.Transferrer
 import Logs.Transfer
 import Logs.Location
 import qualified Git

diff --git a/Command/Transferrer.hs b/Command/Transferrer.hs
index 0596c6c34e4fdc40928dd34690822c2ec65b43cb..88804ec0d6ae2026aff7edbf9e52f2d654673f5e 100644 (file)
--- a/Command/Transferrer.hs
+++ b/Command/Transferrer.hs
@@ -18,6 +18,7 @@ import qualified Database.Keys
 import Annex.BranchState
 import Types.Messages
 import Annex.TransferrerPool
+import Types.Transferrer
 
 import Text.Read (readMaybe)
 

diff --git a/Types/Transferrer.hs b/Types/Transferrer.hs
new file mode 100644 (file)
index 0000000..08e4822
--- /dev/null
+++ b/Types/Transferrer.hs
@@ -0,0 +1,24 @@
+{- protocol used by "git-annex transferrer"
+ -
+ - Copyright 2020 Joey Hess <id@joeyh.name>
+ -
+ - Licensed under the GNU AGPL version 3 or higher.
+ -}
+
+module Types.Transferrer where
+
+import Annex.Common
+import Types.Transfer
+import Types.Messages
+import Git.Types (RemoteName)
+
+data TransferRequest = TransferRequest TransferRequestLevel Direction (Either UUID RemoteName) KeyData AssociatedFile
+       deriving (Show, Read)
+
+data TransferRequestLevel = AnnexLevel | AssistantLevel
+       deriving (Show, Read)
+
+data TransferResponse
+       = TransferOutput SerializedOutput
+       | TransferResult Bool
+       deriving (Show, Read)

diff --git a/git-annex.cabal b/git-annex.cabal
index 0d209da99e8011409c07420fcba08d73bfc9522e..48a1ed5d5cb8cabc1453ab9b305cbd2302ae0a08 100644 (file)
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1028,6 +1028,7 @@ Executable git-annex
     Types.StoreRetrieve
     Types.Test
     Types.Transfer
+    Types.Transferrer
     Types.TransferrerPool
     Types.TrustLevel
     Types.UUID