Skip to content

Commit e1665af

Browse files
committed
refactor(navigator): log when sending on the MoveSummaryChannel
1 parent e2431bc commit e1665af

6 files changed

Lines changed: 26 additions & 11 deletions

File tree

modules/navigator/src/main/kotlin/com/w2sv/navigator/MoveResultCollector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.w2sv.navigator
22

3-
import com.w2sv.navigator.di.MoveSummaryChannel
3+
import com.w2sv.navigator.postmove.MoveSummaryChannel
44
import com.w2sv.navigator.postmove.MoveSummaryListener
55
import javax.inject.Inject
66
import kotlinx.coroutines.flow.consumeAsFlow

modules/navigator/src/main/kotlin/com/w2sv/navigator/di/FileNavigatorModule.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.w2sv.navigator.di
33
import android.content.ContentResolver
44
import android.content.Context
55
import com.w2sv.navigator.FileNavigator
6-
import com.w2sv.navigator.postmove.MoveOperationSummary
6+
import com.w2sv.navigator.postmove.MoveSummaryChannel
77
import dagger.Module
88
import dagger.Provides
99
import dagger.hilt.InstallIn
@@ -13,8 +13,6 @@ import javax.inject.Singleton
1313
import kotlinx.coroutines.channels.Channel
1414
import kotlinx.coroutines.flow.StateFlow
1515

16-
internal typealias MoveSummaryChannel = Channel<MoveOperationSummary>
17-
1816
@InstallIn(SingletonComponent::class)
1917
@Module
2018
internal object FileNavigatorModule {

modules/navigator/src/main/kotlin/com/w2sv/navigator/moving/BatchMoveService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import android.os.Parcelable
66
import com.w2sv.androidutils.content.getParcelableCompat
77
import com.w2sv.androidutils.content.intent
88
import com.w2sv.common.logging.LoggingUnboundService
9-
import com.w2sv.navigator.di.MoveSummaryChannel
9+
import com.w2sv.navigator.postmove.MoveSummaryChannel
1010
import com.w2sv.navigator.domain.moving.MoveDestination
1111
import com.w2sv.navigator.domain.moving.MoveOperation
1212
import com.w2sv.navigator.postmove.MoveOperationSummary

modules/navigator/src/main/kotlin/com/w2sv/navigator/moving/FileMover.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ package com.w2sv.navigator.moving
22

33
import android.content.Context
44
import com.w2sv.common.di.ApplicationIoScope
5-
import com.w2sv.navigator.di.MoveSummaryChannel
65
import com.w2sv.navigator.domain.moving.MoveOperation
76
import com.w2sv.navigator.postmove.MoveOperationSummary
8-
import javax.inject.Inject
7+
import com.w2sv.navigator.postmove.MoveSummaryChannel
8+
import com.w2sv.navigator.postmove.loggingTrySend
99
import kotlinx.coroutines.CoroutineScope
1010
import kotlinx.coroutines.launch
11+
import javax.inject.Inject
1112

1213
internal class FileMover @Inject constructor(
1314
private val moveSummaryChannel: MoveSummaryChannel,
@@ -16,7 +17,7 @@ internal class FileMover @Inject constructor(
1617
operator fun invoke(operation: MoveOperation, context: Context) {
1718
scope.launch {
1819
operation.file.moveTo(destination = operation.destination, context = context) { result ->
19-
moveSummaryChannel.trySend(MoveOperationSummary(result, operation))
20+
moveSummaryChannel.loggingTrySend(MoveOperationSummary(result, operation))
2021
}
2122
}
2223
}
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.w2sv.navigator.moving.activity
22

33
import android.app.Activity
4-
import com.w2sv.navigator.di.MoveSummaryChannel
5-
import com.w2sv.navigator.postmove.MoveOperationSummary
64
import com.w2sv.navigator.domain.moving.MoveResult
5+
import com.w2sv.navigator.postmove.MoveOperationSummary
6+
import com.w2sv.navigator.postmove.MoveSummaryChannel
7+
import com.w2sv.navigator.postmove.loggingTrySend
78
import javax.inject.Inject
89

910
class MoveActivityFinisher @Inject constructor(private val moveSummaryChannel: MoveSummaryChannel) {
1011

1112
fun finishOnError(activity: Activity, error: MoveResult) {
12-
moveSummaryChannel.trySend(MoveOperationSummary(error))
13+
moveSummaryChannel.loggingTrySend(MoveOperationSummary(error))
1314
activity.finishAndRemoveTask()
1415
}
1516
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.w2sv.navigator.postmove
2+
3+
import kotlinx.coroutines.channels.Channel
4+
import kotlinx.coroutines.channels.onFailure
5+
import slimber.log.e
6+
import slimber.log.i
7+
8+
internal typealias MoveSummaryChannel = Channel<MoveOperationSummary>
9+
10+
fun MoveSummaryChannel.loggingTrySend(operationSummary: MoveOperationSummary) {
11+
i { "Try sending $operationSummary via MoveSummaryChannel" }
12+
trySend(operationSummary).onFailure { error ->
13+
e { "Failed to send summary: $error" }
14+
}
15+
}

0 commit comments

Comments
 (0)