From 508517de485e77196a8d8e33558f4185c50dea96 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 3 Aug 2016 12:37:12 -0400 Subject: get, move, copy, mirror: Added --failed switch which retries failed copies/moves Note that get --from foo --failed will get things that a previous get --from bar tried and failed to get, etc. I considered making --failed only retry transfers from the same remote, but it was easier, and seems more useful, to not have the same remote requirement. Noisy due to some refactoring into Types/ --- Logs/Transfer.hs | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'Logs') diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs index bd910cd55..3d62b6bb1 100644 --- a/Logs/Transfer.hs +++ b/Logs/Transfer.hs @@ -9,6 +9,7 @@ module Logs.Transfer where +import Types.Transfer import Annex.Common import Annex.Perms import qualified Git @@ -23,38 +24,6 @@ import Data.Time.Clock import Data.Time.Clock.POSIX import Control.Concurrent -{- Enough information to uniquely identify a transfer, used as the filename - - of the transfer information file. -} -data Transfer = Transfer - { transferDirection :: Direction - , transferUUID :: UUID - , transferKey :: Key - } - deriving (Eq, Ord, Read, Show) - -{- Information about a Transfer, stored in the transfer information file. - - - - Note that the associatedFile may not correspond to a file in the local - - git repository. It's some file, possibly relative to some directory, - - of some repository, that was acted on to initiate the transfer. - -} -data TransferInfo = TransferInfo - { startedTime :: Maybe POSIXTime - , transferPid :: Maybe PID - , transferTid :: Maybe ThreadId - , transferRemote :: Maybe Remote - , bytesComplete :: Maybe Integer - , associatedFile :: Maybe FilePath - , transferPaused :: Bool - } - deriving (Show, Eq, Ord) - -stubTransferInfo :: TransferInfo -stubTransferInfo = TransferInfo Nothing Nothing Nothing Nothing Nothing Nothing False - -data Direction = Upload | Download - deriving (Eq, Ord, Read, Show) - showLcDirection :: Direction -> String showLcDirection Upload = "upload" showLcDirection Download = "download" -- cgit v1.2.3