cleanup

Assistant/Threads/TransferScanner.hs

@@ -65,35 +65,25 @@ transferScannerThread st dstatus scanremotes transferqueue = thread $ do
 {- This is a cheap scan for failed transfers involving a remote. -}
 failedTransferScan :: ThreadState -> DaemonStatusHandle -> TransferQueue -> Remote -> IO ()
 failedTransferScan st dstatus transferqueue r = do
-	ts <- runThreadState st $ 
-		getFailedTransfers $ Remote.uuid r
-	go ts
+	failed <- runThreadState st $ getFailedTransfers (Remote.uuid r)
+	runThreadState st $ mapM_ removeFailedTransfer $ map fst failed
+	mapM_ retry failed
 	where
-		go [] = noop
-		go ((t, info):ts)
+		retry (t, info)
 			| transferDirection t == Download = do
 				{- Check if the remote still has the key.
 				 - If not, relies on the expensiveScan to
 				 - get it queued from some other remote. -}
-				ifM (runThreadState st $ remoteHas r $ transferKey t)
-					( requeue t info
-					, dequeue t
-					)
-				go ts
+				whenM (runThreadState st $ remoteHas r $ transferKey t) $
+					requeue t info
 			| otherwise = do
 				{- The Transferrer checks when uploading
 				 - that the remote doesn't already have the
 				 - key, so it's not redundantly checked
 				 - here. -}
 				requeue t info
-				go ts
-
-		requeue t info = do
-			queueTransferWhenSmall
-				transferqueue dstatus (associatedFile info) t r
-			dequeue t
-		dequeue t = void $ runThreadState st $ inRepo $
-			liftIO . tryIO . removeFile . failedTransferFile t
+		requeue t info = queueTransferWhenSmall
+			transferqueue dstatus (associatedFile info) t r
 
 {- This is a expensive scan through the full git work tree, finding
  - files to download from or upload to any of the remotes.

Logs/Transfer.hs

@@ -10,6 +10,7 @@ module Logs.Transfer where
 import Common.Annex
 import Annex.Perms
 import Annex.Exception
+import Annex.UUID
 import qualified Git
 import Types.Remote
 import Types.Key
@@ -48,6 +49,9 @@ data TransferInfo = TransferInfo
 	}
 	deriving (Show, Eq, Ord)
 
+stubTransferInfo :: TransferInfo
+stubTransferInfo = TransferInfo Nothing Nothing Nothing Nothing Nothing Nothing False
+
 data Direction = Upload | Download
 	deriving (Eq, Ord, Read, Show)
 
@@ -164,6 +168,11 @@ getFailedTransfers u = catMaybes <$> (liftIO . getpairs =<< concat <$> findfiles
 			=<< mapM (fromRepo . failedTransferDir u)
 				[Download, Upload]
 
+removeFailedTransfer :: Transfer -> Annex ()
+removeFailedTransfer t = do
+	f <- fromRepo $ failedTransferFile t
+	liftIO $ void $ tryIO $ removeFile f
+
 {- The transfer information file to use for a given Transfer. -}
 transferFile :: Transfer -> Git.Repo -> FilePath
 transferFile (Transfer direction u key) r = transferDir direction r