summaryrefslogtreecommitdiff
path: root/Logs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-05 14:34:20 -0600
committerGravatar Joey Hess <joey@kitenet.net>2012-07-05 14:34:20 -0600
commit71b5ad8398c4d86d5e9b993e175b48f2c5f0861d (patch)
tree46bd1db5caa16256b948146ecd2d61057bed44fb /Logs
parente8df726d07657c82c012a02697282c2bc642e742 (diff)
wrote transfer thread
finally!
Diffstat (limited to 'Logs')
-rw-r--r--Logs/Transfer.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index f808cb6a4..12ab8ff11 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -22,7 +22,7 @@ import Data.Time.Clock
- of the transfer information file. -}
data Transfer = Transfer
{ transferDirection :: Direction
- , transferRemote :: UUID
+ , transferUUID :: UUID
, transferKey :: Key
}
deriving (Show, Eq, Ord)
@@ -37,6 +37,7 @@ data TransferInfo = TransferInfo
{ startedTime :: Maybe UTCTime
, transferPid :: Maybe ProcessID
, transferThread :: Maybe ThreadId
+ , transferRemote :: Maybe Remote
, bytesComplete :: Maybe Integer
, associatedFile :: Maybe FilePath
}
@@ -80,6 +81,7 @@ transfer t file a = do
<*> pure Nothing -- pid not stored in file, so omitted for speed
<*> pure Nothing -- threadid not stored in file, so omitted for speed
<*> pure Nothing -- not 0; transfer may be resuming
+ <*> pure Nothing
<*> pure file
bracketIO (prep tfile mode info) (cleanup tfile) a
where
@@ -170,6 +172,7 @@ readTransferInfo pid s =
<*> pure (Just pid)
<*> pure Nothing
<*> pure Nothing
+ <*> pure Nothing
<*> pure (if null filename then Nothing else Just filename)
_ -> Nothing
where