kemitix/thorp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UploadEventListener - reset bytesTransfered for each file (#145)

Browse source
This commit is contained in:
Paul Campbell 2019-08-04 20:12:16 +01:00 committed by GitHub
parent f40fe46d84
commit ec221d9f05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
domain/src/main/scala/net/kemitix/thorp/domain/UploadEventListener.scala
View file

@ -15,18 +15,20 @@ object UploadEventListener {
totalBytesSoFar: Long totalBytesSoFar: Long
) )
var bytesTransferred = 0L def apply(settings: Settings): UploadEvent => Unit =
uploadEvent => {
def listener(settings: Settings): UploadEvent => Unit = { var bytesTransferred = 0L
case e: RequestEvent => uploadEvent match {
bytesTransferred += e.transferred case e: RequestEvent =>
logRequestCycle( bytesTransferred += e.transferred
RequestCycle(settings.localFile, logRequestCycle(
bytesTransferred, RequestCycle(settings.localFile,
settings.index, bytesTransferred,
settings.syncTotals, settings.index,
settings.totalBytesSoFar)) settings.syncTotals,
case _ => () settings.totalBytesSoFar))
} case _ => ()
}
}
} }

3
storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Uploader.scala
View file

@ -77,8 +77,7 @@ trait Uploader {
listenerSettings => listenerSettings =>
new ProgressListener { new ProgressListener {
override def progressChanged(progressEvent: ProgressEvent): Unit = override def progressChanged(progressEvent: ProgressEvent): Unit =
UploadEventListener.listener(listenerSettings)( UploadEventListener(listenerSettings)(eventHandler(progressEvent))
eventHandler(progressEvent))
private def eventHandler: ProgressEvent => UploadEvent = private def eventHandler: ProgressEvent => UploadEvent =
progressEvent => { progressEvent => {