Skip to content

fix(logger): empty state for log filters handled properly #351

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
srtvprateek merged 1 commit into from
Mar 4, 2025
+22 −18
Merged

fix(logger): empty state for log filters handled properly #351

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
40 changes: 22 additions & 18 deletions ...ugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/LogsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,13 @@ internal class LogsViewModel(application: Application) : AndroidViewModel(applic
}
val currentSessionLogs =
(rawLogs ?: arrayListOf())
.asSequence()
.filter { it.sessionId == Session.id }
.filter { pastTimeFilter(it.timestamp, logTimeStamp) }
.filter { logType.map { type -> type.type }.contains(it.data.tag) }
.filter { it.data.isValidSearch(search) }
.map { it.data }
.toList()
.applyUserFilter(search, logType, logTimeStamp)

val previousSessionLogs = if (!logTimeStamp.isSessionFilter) {
(rawLogs ?: arrayListOf())
.asSequence()
.filter { it.sessionId != Session.id }
.filter { it.data.isValidSearch(search) }
.filter { pastTimeFilter(it.timestamp, logTimeStamp) }
.map { it.data }
.toList()
.applyUserFilter(search, logType, logTimeStamp)
} else {
emptyList()
}
Expand All @@ -69,13 +60,6 @@ internal class LogsViewModel(application: Application) : AndroidViewModel(applic
}
}

private fun pastTimeFilter(logTime: Long, log: LogTimeStamp): Boolean {
if (log.timeStamp == 0 || log.isSessionFilter) {
return true
}
return logTime >= System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(log.timeStamp.toLong())
}

fun deleteAll() {
viewModelScope.launch(Dispatchers.IO) {
LogDBHandler.flush()
Expand Down Expand Up @@ -124,6 +108,26 @@ internal class LogsViewModel(application: Application) : AndroidViewModel(applic
}
}

private fun List<LogEntity>.applyUserFilter(
search: String,
logType: List<LogType>,
logTimeStamp: LogTimeStamp
): List<LogData> {
return this.asSequence()
.filter { pastTimeFilter(it.timestamp, logTimeStamp) }
.filter { logType.isEmpty() || logType.any { type -> type.type == it.data.tag } }
.filter { it.data.isValidSearch(search) }
.map { it.data }
.toList()
}

private fun pastTimeFilter(logTime: Long, log: LogTimeStamp): Boolean {
if (log.timeStamp == 0 || log.isSessionFilter) {
return true
}
return logTime >= System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(log.timeStamp.toLong())
}

private fun LogData.isValidSearch(search: String): Boolean {
return search.isEmpty() ||
message.contains(search, true) ||
Expand Down