Add selection dialog to choose whether to save full log or filtered log.

Implement Selection of non-adjacent rows in log table.

Author: Gegenbauer

resources/strings/default.json

@@ -257,6 +257,8 @@
     "logPath": "Log Path",
     "logSampleLabel": "Sample",
     "logTypeLabel": "Log Type",
+    "logTypeSelectContent": "Select the log types to save",
+    "logTypeSelectTitle": "Log Type Selection",
     "lowerFilterOrder": "Move to Previous Row",
     "maxPartsLabel": "Maximum Number of Splits",
     "menuAbout": "About",

resources/strings/src/main/resources/strings/en.json

@@ -255,6 +255,8 @@
     "logPath": "Log Path",
     "logSampleLabel": "Sample",
     "logTypeLabel": "Log Type",
+    "logTypeSelectContent": "Select the log types to save",
+    "logTypeSelectTitle": "Log Type Selection",
     "lowerFilterOrder": "Move to Previous Row",
     "maxPartsLabel": "Maximum Number of Splits",
     "menuAbout": "About",

resources/strings/src/main/resources/strings/ko.json

@@ -252,6 +252,8 @@
     "logPath": "로그 경로",
     "logSampleLabel": "샘플",
     "logTypeLabel": "로그 유형",
+    "logTypeSelectContent": "저장할 로그 유형을 선택하세요",
+    "logTypeSelectTitle": "로그 유형 선택",
     "lowerFilterOrder": "이전 행으로 이동",
     "maxPartsLabel": "최대 분할 수",
     "menuAbout": "소개",
@@ -338,7 +340,7 @@
     "tableColumnInfoHint": "이 테이블은 로그 테이블의 모든 열 정보를 정의합니다\n행 번호 n의 열은 로그 파서에 의해 파싱된 로그의 n번째 부분을 저장하므로 로그 파서와 함께 모든 열을 정의해야 하며, 열의 순서도 로그 파서의 결과와 일치해야 합니다.",
     "tableFilterInfo": "필터 정보",
     "tableLevelInfo": "로그 레벨 정보",
-    "tableLevelInfoHint": "이 테이블은 모든 로�� 레벨을 정의합니다\n정의된 로그 레벨의 행 번호가 작을수록 로그 레벨이 낮습니다.",
+    "tableLevelInfoHint": "이 표는 모든 로그 레벨을 정의합니다. 정의된 로그 레벨의 행 번호가 작을수록 로그 레벨이 낮습니다.",
     "targetPartIndexLabel": "대상 문자열 인덱스",
     "trimLeadingCharCountLabel": "제거할 앞부분 문자 수:",
     "trimLeadingCharLabel": "앞부분 문자:",

resources/strings/src/main/resources/strings/zh_cn.json

@@ -251,6 +251,8 @@
     "logPath": "日志路径",
     "logSampleLabel": "样本",
     "logTypeLabel": "日志类型",
+    "logTypeSelectContent": "选择需要保存的日志类型",
+    "logTypeSelectTitle": "日志类型选择",
     "lowerFilterOrder": "移动到上一行",
     "maxPartsLabel": "最大分割数",
     "menuAbout": "关于",

ui/log/src/main/kotlin/me/gegenbauer/catspy/log/datasource/DeviceLogProducer.kt

@@ -19,7 +19,6 @@ import me.gegenbauer.catspy.log.metadata.LogcatLogSupport
 import me.gegenbauer.catspy.log.ui.LogConfiguration
 import me.gegenbauer.catspy.platform.GlobalProperties
 import me.gegenbauer.catspy.platform.LOG_DIR
-import me.gegenbauer.catspy.platform.currentPlatform
 import me.gegenbauer.catspy.platform.filesDir
 import me.gegenbauer.catspy.task.CommandExecutorImpl
 import me.gegenbauer.catspy.task.CommandProcessBuilder

ui/log/src/main/kotlin/me/gegenbauer/catspy/log/datasource/LogFilterable.kt

@@ -5,9 +5,9 @@ import me.gegenbauer.catspy.log.filter.LogFilter
 interface LogFilterable {
     val logFilter: LogFilter
 
-    var fullTableSelectedRows: List<Int>
+    val fullTableSelectedRows: MutableSet<Int>
 
-    var filteredTableSelectedRows: List<Int>
+    val filteredTableSelectedRows: MutableSet<Int>
 
     fun updateFilter(filter: LogFilter)
 }

ui/log/src/main/kotlin/me/gegenbauer/catspy/log/datasource/LogViewModel.kt

@@ -40,6 +40,7 @@ import me.gegenbauer.catspy.view.panel.StatusPanel
 import me.gegenbauer.catspy.view.panel.Task
 import me.gegenbauer.catspy.view.panel.TaskHandle
 import java.io.File
+import java.util.HashSet
 import java.util.Objects
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
@@ -60,9 +61,9 @@ class LogViewModel(
     override val logFilter: LogFilter
         get() = logConf.getCurrentFilter()
 
-    override var fullTableSelectedRows: List<Int> = emptyList()
+    override val fullTableSelectedRows: MutableSet<Int> = HashSet()
 
-    override var filteredTableSelectedRows: List<Int> = emptyList()
+    override val filteredTableSelectedRows: MutableSet<Int> = HashSet()
 
     override val tempLogFile: File
         get() = produceLogTask.logProducer.tempFile
@@ -138,9 +139,10 @@ class LogViewModel(
     /**
      * save full log to file
      */
-    suspend fun saveLog(targetFile: File): Result<File?> {
+    suspend fun saveLog(targetFile: File, isFilteredLog: Boolean): Result<File?> {
         return withContext(Dispatchers.GIO) {
-            val logs = fullLogRepo.readLogItems { it.toList() }
+            val repo = if (isFilteredLog) filteredLogRepo else fullLogRepo
+            val logs = repo.readLogItems { it.toList() }
             Log.d(TAG, "[saveLog] targetLogFile=${targetFile.absolutePath}, logSize=${logs.size}")
             val taskName = STRINGS.ui.exportFileTaskTitle.get(targetFile.absolutePath)
             val task = Task(taskName, object : TaskHandle {

ui/log/src/main/kotlin/me/gegenbauer/catspy/log/ui/tab/BaseLogMainPanel.kt

@@ -46,6 +46,7 @@ import me.gegenbauer.catspy.utils.event.EventManager
 import me.gegenbauer.catspy.utils.ui.Key
 import me.gegenbauer.catspy.utils.ui.findFrameFromParent
 import me.gegenbauer.catspy.utils.ui.registerStroke
+import me.gegenbauer.catspy.utils.ui.showMultiOptionsDialog
 import me.gegenbauer.catspy.view.button.IconBarButton
 import me.gegenbauer.catspy.view.dialog.FileSaveHandler
 import me.gegenbauer.catspy.view.panel.StatusBar
@@ -165,8 +166,6 @@ abstract class BaseLogMainPanel : BaseTabPanel() {
         logToolBar.isVisible = logConf.isPreviewMode.not()
         logConf.getFavoriteFilterPanel().isVisible = logConf.isPreviewMode.not()
 
-        saveBtn.isVisible = false
-
         topPanel.border = BorderFactory.createEmptyBorder(4, 6, 4, 0)
         topPanel.layout = VerticalFlexibleWidthLayout(4)
         topPanel.add(logToolBar)
@@ -534,13 +533,34 @@ abstract class BaseLogMainPanel : BaseTabPanel() {
     }
 
     private fun saveLog() {
+        val logType = showLogTypeSelectDialog()
+        if (logType <= 0) {
+            return
+        }
+        val isFilteredLog = logType == LOG_TYPE_FILTERED
         FileSaveHandler.Builder(this)
-            .onFileSpecified(logViewModel::saveLog)
+            .onFileSpecified { logViewModel.saveLog(it, isFilteredLog) }
             .setDefaultName(logStatus.path.fileName)
             .build()
             .show()
     }
 
+    private fun showLogTypeSelectDialog(): Int {
+        val actions = listOf(
+            STRINGS.ui.fullLog to { LOG_TYPE_FULL },
+            STRINGS.ui.filteredLog to { LOG_TYPE_FILTERED }
+        )
+        val res = showMultiOptionsDialog(
+            findFrameFromParent(),
+            STRINGS.ui.logTypeSelectTitle,
+            STRINGS.ui.logTypeSelectContent,
+            actions,
+            1,
+            JOptionPane.QUESTION_MESSAGE
+        )
+        return res
+    }
+
     private fun showLogPanelInWindow() {
         splitLogPane.detachFullLogPanel()
         val logTableDialog = LogTableDialog(splitLogPane.fullLogPanel) {
@@ -657,4 +677,11 @@ abstract class BaseLogMainPanel : BaseTabPanel() {
             ui.logMainBinding.pauseAll.updateValue(false)
         }
     }
+
+    companion object {
+        private const val tag = "BaseLogMainPanel"
+        private const val LOG_TYPE_NONE = 0
+        private const val LOG_TYPE_FULL = 1
+        private const val LOG_TYPE_FILTERED = 2
+    }
 }

ui/log/src/main/kotlin/me/gegenbauer/catspy/log/ui/tab/DeviceLogMainPanel.kt

@@ -80,7 +80,6 @@ class DeviceLogMainPanel : BaseLogMainPanel(), LogMetadataChangeListener {
 
         splitLogWithStatefulPanel.hideEmptyContent()
         deviceCombo.isVisible = true
-        saveBtn.isVisible = true
         logConf.getLogBufferSelectPanel().isVisible = logConf.isPreviewMode.not()
     }
 

ui/log/src/main/kotlin/me/gegenbauer/catspy/log/ui/table/FilteredLogPanel.kt

@@ -90,6 +90,10 @@ class FilteredLogPanel(
         if (selectedLogNum != baseSelectedLogNum) {
             val targetRow = basePanel.tableModel.getRowIndexInAllPages(selectedLogNum)
             basePanel.goToRowIndex(targetRow)
+            val targetSelectRow = basePanel.tableModel.getRowIndexInCurrentPage(selectedLogNum)
+            basePanel.tableModel.selectedLogRows.clear()
+            basePanel.tableModel.selectedLogRows.add(targetSelectRow)
+            basePanel.table.repaint()
 
             if (table.isLastRowSelected()) {
                 setGoToLast(true)