chore(logger): handling for previous session logs implemented (#250)

srtvprateek · web-flow · commit 3250637d9535 · 2023-07-20T17:16:24.000+05:30
* previous logs session header added

* search fix
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/DataModel.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/DataModel.kt
@@ -35,6 +35,11 @@ internal data class LogData(
     val timeStamp: Long = System.currentTimeMillis()
 ) : ListItem()
 
+@Keep
+internal data class LogPreviousSessionHeader(
+    val label: String = "header"
+) : ListItem()
+
 @Keep
 @JsonClass(generateAdapter = true)
 internal data class StackTrace(
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/LogsViewModel.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/LogsViewModel.kt
@@ -6,15 +6,18 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.pluto.plugins.logger.internal.persistence.LogDBHandler
+import com.pluto.plugins.logger.internal.persistence.LogEntity
 import com.pluto.utilities.extensions.asFormattedDate
+import com.pluto.utilities.list.ListItem
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 internal class LogsViewModel(application: Application) : AndroidViewModel(application) {
 
-    val logs: LiveData<List<LogData>>
+    private var rawLogs: List<LogEntity>? = null
+    val logs: LiveData<List<ListItem>>
         get() = _logs
-    private val _logs = MutableLiveData<List<LogData>>()
+    private val _logs = MutableLiveData<List<ListItem>>()
 
     val current: LiveData<LogData>
         get() = _current
@@ -24,9 +27,20 @@ internal class LogsViewModel(application: Application) : AndroidViewModel(applic
         get() = _serializedLogs
     private val _serializedLogs = MutableLiveData<String>()
 
-    fun fetchAll() {
+    fun fetch(search: String = "") {
         viewModelScope.launch(Dispatchers.IO) {
-            val list = LogDBHandler.fetchAll()?.map { it.data } ?: arrayListOf()
+            if (rawLogs == null) {
+                rawLogs = LogDBHandler.fetchAll()
+            }
+            val currentSessionLogs = (rawLogs ?: arrayListOf()).filter { it.sessionId == Session.id && it.data.isValidSearch(search) }.map { it.data }
+            val previousSessionLogs = (rawLogs ?: arrayListOf()).filter { it.sessionId != Session.id && it.data.isValidSearch(search) }.map { it.data }
+
+            val list = arrayListOf<ListItem>()
+            list.addAll(currentSessionLogs)
+            if (previousSessionLogs.isNotEmpty()) {
+                list.add(LogPreviousSessionHeader())
+                list.addAll(previousSessionLogs)
+            }
             _logs.postValue(list)
         }
     }
@@ -47,22 +61,24 @@ internal class LogsViewModel(application: Application) : AndroidViewModel(applic
             val text = StringBuilder()
             text.append("Pluto Log Trace")
             logs.value?.forEach {
-                text.append("\n----------\n")
-                text.append("${it.timeStamp.asFormattedDate(DATE_FORMAT)} ${it.level.label.uppercase()} | ${it.tag}: ${it.message}")
-                it.tr?.let { tr ->
-                    text.append("\n\tException: ${tr}\n")
-                    tr.stackTrace.take(MAX_STACK_TRACE_LINES).forEach { trace ->
-                        text.append("\t\t at $trace\n")
-                    }
-                    if (tr.stackTrace.size - MAX_STACK_TRACE_LINES > 0) {
-                        text.append("\t\t + ${tr.stackTrace.size - MAX_STACK_TRACE_LINES} more lines")
+                if (it is LogData) {
+                    text.append("\n----------\n")
+                    text.append("${it.timeStamp.asFormattedDate(DATE_FORMAT)} ${it.level.label.uppercase()} | ${it.tag}: ${it.message}")
+                    it.tr?.let { tr ->
+                        text.append("\n\tException: ${tr}\n")
+                        tr.stackTrace.take(MAX_STACK_TRACE_LINES).forEach { trace ->
+                            text.append("\t\t at $trace\n")
+                        }
+                        if (tr.stackTrace.size - MAX_STACK_TRACE_LINES > 0) {
+                            text.append("\t\t + ${tr.stackTrace.size - MAX_STACK_TRACE_LINES} more lines")
+                        }
                     }
-                }
-                it.eventAttributes?.let { attr ->
-                    if (attr.isNotEmpty()) {
-                        text.append("\n\tEvent Attributes (${attr.size}):")
-                        attr.forEach { entry ->
-                            text.append("\n\t\t${entry.key}: ${entry.value}")
+                    it.eventAttributes?.let { attr ->
+                        if (attr.isNotEmpty()) {
+                            text.append("\n\tEvent Attributes (${attr.size}):")
+                            attr.forEach { entry ->
+                                text.append("\n\t\t${entry.key}: ${entry.value}")
+                            }
                         }
                     }
                 }
@@ -76,3 +92,6 @@ internal class LogsViewModel(application: Application) : AndroidViewModel(applic
         const val DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"
     }
 }
+
+private fun LogData.isValidSearch(search: String): Boolean =
+    search.isEmpty() || tag.contains(search, true) || message.contains(search, true) || stackTrace.fileName.contains(search, true)
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/Session.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/Session.kt
@@ -1,5 +1,8 @@
 package com.pluto.plugins.logger.internal
 
+import java.util.UUID
+
 internal object Session {
+    val id: String = UUID.randomUUID().toString()
     var loggerSearchText: String? = null
 }
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/persistence/LogDBHandler.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/persistence/LogDBHandler.kt
@@ -28,20 +28,14 @@ internal object LogDBHandler {
 
     fun persistLog(level: Level, tag: String, message: String?, tr: Throwable?, ele: StackTrace) {
         coroutineScope.launch {
-            val logEntity = LogEntity(
-                timestamp = System.currentTimeMillis(),
-                data = LogData(level, tag, message ?: "", tr?.asExceptionData(), ele)
-            )
+            val logEntity = LogEntity(data = LogData(level, tag, message ?: "", tr?.asExceptionData(), ele))
             logDao?.save(logEntity) ?: run { pushToTempList(logEntity) }
         }
     }
 
     fun persistEvent(level: Level, tag: String, event: String, attr: HashMap<String, Any?>?, ele: StackTrace) {
         coroutineScope.launch {
-            val logEntity = LogEntity(
-                timestamp = System.currentTimeMillis(),
-                data = LogData(level, tag, event, null, ele, attr)
-            )
+            val logEntity = LogEntity(data = LogData(level, tag, event, null, ele, attr))
             logDao?.save(logEntity) ?: run { pushToTempList(logEntity) }
         }
     }
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/persistence/LogEntity.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/persistence/LogEntity.kt
@@ -6,7 +6,7 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.TypeConverters
 import com.pluto.plugins.logger.internal.LogData
-import com.pluto.utilities.list.ListItem
+import com.pluto.plugins.logger.internal.Session
 import com.squareup.moshi.JsonClass
 
 @Keep
@@ -17,8 +17,10 @@ internal data class LogEntity(
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "id")
     val id: Int? = null,
+    @ColumnInfo(name = "session_id")
+    val sessionId: String = Session.id,
     @ColumnInfo(name = "timestamp")
-    val timestamp: Long,
+    val timestamp: Long = System.currentTimeMillis(),
     @ColumnInfo(name = "data")
     val data: LogData,
-) : ListItem()
+)
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/persistence/database/PlutoDatabase.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/persistence/database/PlutoDatabase.kt
@@ -8,7 +8,7 @@ import com.pluto.plugins.logger.internal.persistence.LogEntity
     entities = [
         LogEntity::class,
     ],
-    version = 1,
+    version = 2,
     exportSchema = false
 )
 internal abstract class PlutoDatabase : RoomDatabase() {
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/ListFragment.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/ListFragment.kt
@@ -46,7 +46,7 @@ internal class ListFragment : Fragment(R.layout.pluto_logger___fragment_list) {
             viewLifecycleOwner.lifecycleScope.launchWhenResumed {
                 text?.toString()?.let {
                     Session.loggerSearchText = it
-                    logsAdapter.list = filteredLogs(it)
+                    viewModel.fetch(it)
                     if (it.isEmpty()) {
                         binding.logList.linearLayoutManager()?.scrollToPositionWithOffset(0, 0)
                     }
@@ -57,7 +57,7 @@ internal class ListFragment : Fragment(R.layout.pluto_logger___fragment_list) {
         viewModel.logs.removeObserver(logsObserver)
         viewModel.logs.observe(viewLifecycleOwner, logsObserver)
 
-        viewModel.fetchAll()
+        viewModel.fetch()
 
         viewModel.serializedLogs.removeObserver(serializedLogsObserver)
         viewModel.serializedLogs.observe(viewLifecycleOwner, serializedLogsObserver)
@@ -70,7 +70,7 @@ internal class ListFragment : Fragment(R.layout.pluto_logger___fragment_list) {
                 when (item.itemId) {
                     R.id.clear -> viewModel.deleteAll()
                     R.id.shareAll ->
-                        if (viewModel.logs.value?.size ?: 0 > 0) {
+                        if (!viewModel.logs.value.isNullOrEmpty()) {
                             viewModel.serializeLogs()
                         } else {
                             context?.toast("No logs to share")
@@ -80,30 +80,16 @@ internal class ListFragment : Fragment(R.layout.pluto_logger___fragment_list) {
         }
     }
 
-    @Synchronized
-    private fun filteredLogs(search: String): List<LogData> {
-        val list = arrayListOf<LogData>()
-            .apply {
-                viewModel.logs.value?.let { addAll(it) }
-            }
-            .filter { log ->
-                log.tag.contains(search, true) ||
-                    log.message.contains(search, true) ||
-                    log.stackTrace.fileName.contains(search, true)
-            }
+    private val logsObserver = Observer<List<ListItem>> {
+        logsAdapter.list = it
         binding.noItemText.text = getString(
-            if (search.isNotEmpty()) {
+            if (binding.search.text.toString().isNotEmpty()) {
                 R.string.pluto_logger___no_search_result
             } else {
                 R.string.pluto_logger___no_logs_text
             }
         )
-        binding.noItemText.visibility = if (list.isEmpty()) View.VISIBLE else View.GONE
-        return list
-    }
-
-    private val logsObserver = Observer<List<LogData>> {
-        logsAdapter.list = filteredLogs(binding.search.text.toString())
+        binding.noItemText.visibility = if (it.isEmpty()) View.VISIBLE else View.GONE
     }
 
     private val serializedLogsObserver = Observer<String> {
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/list/LogHeaderHolder.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/list/LogHeaderHolder.kt
@@ -0,0 +1,20 @@
+package com.pluto.plugins.logger.internal.ui.list
+
+import android.view.ViewGroup
+import com.pluto.plugins.logger.R
+import com.pluto.plugins.logger.databinding.PlutoLoggerListHeaderBinding
+import com.pluto.utilities.extensions.inflate
+import com.pluto.utilities.list.DiffAwareAdapter
+import com.pluto.utilities.list.DiffAwareHolder
+import com.pluto.utilities.list.ListItem
+
+internal class LogHeaderHolder(parent: ViewGroup, actionListener: DiffAwareAdapter.OnActionListener) :
+    DiffAwareHolder(parent.inflate(R.layout.pluto_logger___list_header), actionListener) {
+
+    private val binding = PlutoLoggerListHeaderBinding.bind(itemView)
+    private val logTag = binding.title
+
+    override fun onBind(item: ListItem) {
+        logTag.text = context.getString(R.string.pluto_logger___previous_log_header)
+    }
+}
diff --git a/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/list/LogsAdapter.kt b/pluto-plugins/plugins/logger/lib/src/main/java/com/pluto/plugins/logger/internal/ui/list/LogsAdapter.kt
@@ -2,6 +2,7 @@ package com.pluto.plugins.logger.internal.ui.list
 
 import android.view.ViewGroup
 import com.pluto.plugins.logger.internal.LogData
+import com.pluto.plugins.logger.internal.LogPreviousSessionHeader
 import com.pluto.utilities.list.BaseAdapter
 import com.pluto.utilities.list.DiffAwareHolder
 import com.pluto.utilities.list.ListItem
@@ -10,18 +11,21 @@ internal class LogsAdapter(private val listener: OnActionListener) : BaseAdapter
     override fun getItemViewType(item: ListItem): Int? {
         return when (item) {
             is LogData -> ITEM_TYPE_LOG
+            is LogPreviousSessionHeader -> ITEM_TYPE_HEADER
             else -> null
         }
     }
 
     override fun onViewHolderCreated(parent: ViewGroup, viewType: Int): DiffAwareHolder? {
         return when (viewType) {
             ITEM_TYPE_LOG -> LogItemHolder(parent, listener)
+            ITEM_TYPE_HEADER -> LogHeaderHolder(parent, listener)
             else -> null
         }
     }
 
     companion object {
         const val ITEM_TYPE_LOG = 1000
+        const val ITEM_TYPE_HEADER = 1001
     }
 }
diff --git a/pluto-plugins/plugins/logger/lib/src/main/res/layout/pluto_logger___list_header.xml b/pluto-plugins/plugins/logger/lib/src/main/res/layout/pluto_logger___list_header.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/pluto___dark_10">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/pluto___margin_xsmall"
+        android:layout_marginHorizontal="@dimen/pluto___margin_small"
+        android:fontFamily="@font/muli_semibold"
+        android:textColor="@color/pluto___text_dark_80"
+        android:textSize="@dimen/pluto___text_xsmall"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="log tag" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/pluto-plugins/plugins/logger/lib/src/main/res/values/strings.xml b/pluto-plugins/plugins/logger/lib/src/main/res/values/strings.xml
@@ -14,4 +14,5 @@
     <string name="pluto_logger___delete_console_logs">Clear logs</string>
     <string name="pluto_logger___close">Close Logger</string>
     <string name="pluto_logger___share_all">Share all logs</string>
+    <string name="pluto_logger___previous_log_header">Logs from previous sessions</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`package com.pluto.plugins.logger.internal`
`2`	`2`
	`3`	`+import java.util.UUID`
	`4`	`+`
`3`	`5`	`internal object Session {`
	`6`	`+ val id: String = UUID.randomUUID().toString()`
`4`	`7`	`var loggerSearchText: String? = null`
`5`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,20 +28,14 @@ internal object LogDBHandler {`
`28`	`28`
`29`	`29`	`fun persistLog(level: Level, tag: String, message: String?, tr: Throwable?, ele: StackTrace) {`
`30`	`30`	`coroutineScope.launch {`
`31`		`- val logEntity = LogEntity(`
`32`		`- timestamp = System.currentTimeMillis(),`
`33`		`- data = LogData(level, tag, message ?: "", tr?.asExceptionData(), ele)`
`34`		`- )`
	`31`	`+ val logEntity = LogEntity(data = LogData(level, tag, message ?: "", tr?.asExceptionData(), ele))`
`35`	`32`	`logDao?.save(logEntity) ?: run { pushToTempList(logEntity) }`
`36`	`33`	`}`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`fun persistEvent(level: Level, tag: String, event: String, attr: HashMap<String, Any?>?, ele: StackTrace) {`
`40`	`37`	`coroutineScope.launch {`
`41`		`- val logEntity = LogEntity(`
`42`		`- timestamp = System.currentTimeMillis(),`
`43`		`- data = LogData(level, tag, event, null, ele, attr)`
`44`		`- )`
	`38`	`+ val logEntity = LogEntity(data = LogData(level, tag, event, null, ele, attr))`
`45`	`39`	`logDao?.save(logEntity) ?: run { pushToTempList(logEntity) }`
`46`	`40`	`}`
`47`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import com.pluto.plugins.logger.internal.persistence.LogEntity`
`8`	`8`	`entities = [`
`9`	`9`	`LogEntity::class,`
`10`	`10`	`],`
`11`		`- version = 1,`
	`11`	`+ version = 2,`
`12`	`12`	`exportSchema = false`
`13`	`13`	`)`
`14`	`14`	`internal abstract class PlutoDatabase : RoomDatabase() {`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package com.pluto.plugins.logger.internal.ui.list`
`2`	`2`
`3`	`3`	`import android.view.ViewGroup`
`4`	`4`	`import com.pluto.plugins.logger.internal.LogData`
	`5`	`+import com.pluto.plugins.logger.internal.LogPreviousSessionHeader`
`5`	`6`	`import com.pluto.utilities.list.BaseAdapter`
`6`	`7`	`import com.pluto.utilities.list.DiffAwareHolder`
`7`	`8`	`import com.pluto.utilities.list.ListItem`
`@@ -10,18 +11,21 @@ internal class LogsAdapter(private val listener: OnActionListener) : BaseAdapter`
`10`	`11`	`override fun getItemViewType(item: ListItem): Int? {`
`11`	`12`	`return when (item) {`
`12`	`13`	`is LogData -> ITEM_TYPE_LOG`
	`14`	`+ is LogPreviousSessionHeader -> ITEM_TYPE_HEADER`
`13`	`15`	`else -> null`
`14`	`16`	`}`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`override fun onViewHolderCreated(parent: ViewGroup, viewType: Int): DiffAwareHolder? {`
`18`	`20`	`return when (viewType) {`
`19`	`21`	`ITEM_TYPE_LOG -> LogItemHolder(parent, listener)`
	`22`	`+ ITEM_TYPE_HEADER -> LogHeaderHolder(parent, listener)`
`20`	`23`	`else -> null`
`21`	`24`	`}`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`companion object {`
`25`	`28`	`const val ITEM_TYPE_LOG = 1000`
	`29`	`+ const val ITEM_TYPE_HEADER = 1001`
`26`	`30`	`}`
`27`	`31`	`}`