Skip to content

fix: save all logs feature #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
F0x1d merged 1 commit into from
Feb 8, 2026
Merged

fix: save all logs feature #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .../impl/src/main/kotlin/com/f0x1d/logfox/feature/logging/impl/data/LoggingRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import kotlinx.coroutines.withTimeout
import timber.log.Timber
import java.io.BufferedReader
import javax.inject.Inject
import kotlin.time.Duration
import kotlin.time.Duration.Companion.seconds

internal class LoggingRepositoryImpl @Inject constructor(
Expand All @@ -42,6 +43,7 @@ internal class LoggingRepositoryImpl @Inject constructor(
terminal = terminal,
command = command,
startingId = startingId,
readLineTimeout = 10.seconds,
)
}.flowOn(ioDispatcher)

Expand All @@ -52,13 +54,15 @@ internal class LoggingRepositoryImpl @Inject constructor(
terminal = terminal,
command = command,
startingId = 0,
readLineTimeout = 1.seconds,
)
}.flowOn(ioDispatcher)

private suspend fun FlowCollector<LogLine>.emitLines(
terminal: Terminal,
command: Array<String>,
startingId: Long,
readLineTimeout: Duration,
) {
if (terminal.isSupported().not()) {
Timber.d("Terminal $terminal is not supported")
Expand All @@ -79,7 +83,7 @@ internal class LoggingRepositoryImpl @Inject constructor(

while (true) {
Timber.d("Started awaiting line")
val line = withTimeout(10.seconds) {
val line = withTimeout(readLineTimeout) {
reader.readLineCancellable()
}
Timber.d("Got line $line")
Expand Down
3 changes: 3 additions & 0 deletions ...src/main/kotlin/com/f0x1d/logfox/feature/recordings/impl/data/RecordingsRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import com.f0x1d.logfox.feature.terminals.api.base.Terminal
import com.f0x1d.logfox.feature.terminals.api.base.TerminalType
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.TimeoutCancellationException
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flowOn
Expand Down Expand Up @@ -82,6 +83,8 @@ internal class RecordingsRepositoryImpl @Inject constructor(
context.toast(Strings.error_saving_logs)
}
e.printStackTrace()
} catch (_: TimeoutCancellationException) {
// Collection of logs finished!
}

LogRecording(
Expand Down