Create System Properties bugreport section

Author: tibagni

src/main/java/com/tibagni/logviewer/ServiceLocator.kt

@@ -17,7 +17,8 @@ object ServiceLocator {
  BugReportRepositoryImpl(
  BugReportParserImpl(
  listOf(
- PropertiesSectionParser(),
+ BugreportInfoSectionParser(),
+ SystemPropertiesSectionParser(),
  ApplicationPackagesSectionParser(),
  SystemHiddenPackagesSectionParser(),
  CarrierConfigSectionParser(),

src/main/java/com/tibagni/logviewer/bugreport/parser/PropertiesSectionParser.kt renamed to src/main/java/com/tibagni/logviewer/bugreport/parser/BugreportInfoSectionParser.kt

@@ -1,9 +1,9 @@
 package com.tibagni.logviewer.bugreport.parser
 
 import com.tibagni.logviewer.bugreport.section.BugReportSection
-import com.tibagni.logviewer.bugreport.section.PropertiesSection
+import com.tibagni.logviewer.bugreport.section.BugreportInfoSection
 
-class PropertiesSectionParser : BugReportSectionParser {
+class BugreportInfoSectionParser : BugReportSectionParser {
  override val name = "BugreportInfo"
  companion object {
  private const val NOT_FOUND = "Not Found"
@@ -16,7 +16,7 @@ class PropertiesSectionParser : BugReportSectionParser {
  val kernel = parseBRProperty(bugReportText, "Kernel: ")
  val uptime = parseBRProperty(bugReportText, "Uptime: ")
 
- return PropertiesSection(build, buildFingerprint, bootloader, kernel, uptime)
+ return BugreportInfoSection(build, buildFingerprint, bootloader, kernel, uptime)
  }
 
  private fun parseBRProperty(text: String, prefix: String): String {

src/main/java/com/tibagni/logviewer/bugreport/parser/SystemPropertiesSectionParser.kt

@@ -0,0 +1,25 @@
+package com.tibagni.logviewer.bugreport.parser
+
+import com.tibagni.logviewer.bugreport.section.BugReportSection
+import com.tibagni.logviewer.bugreport.section.SystemPropertiesSection
+import com.tibagni.logviewer.stringView
+
+class SystemPropertiesSectionParser : BugReportSectionParser {
+
+ override val name = "SystemProperties"
+ override fun parse(bugreportPath: String, bugReportText: String): BugReportSection? {
+
+ val sysPropSectionStart = "\\n-+ SYSTEM PROPERTIES.* -+\\n"
+ val sysPropSectionEnd = "\\n-+ .*SYSTEM PROPERTIES.* -+\\n"
+ val sysPropStartMatch = sysPropSectionStart.toRegex().find(bugReportText) ?: return null
+ val sysPropEndMatch = sysPropSectionEnd.toRegex().find(bugReportText, sysPropStartMatch.range.last) ?: return null
+ val sysPropSection = bugReportText.stringView(sysPropStartMatch.range.first + 1, sysPropEndMatch.range.last)
+
+ return SystemPropertiesSection(sysPropSection.lines()
+ .filter { line -> line.matches(Regex("\\[.+]: ?\\[.+]")) }
+ .associate { line ->
+ val (key, value) = line.split(":").map { it.trim() }
+ key to value
+ })
+ }
+}

src/main/java/com/tibagni/logviewer/bugreport/section/PropertiesSection.kt renamed to src/main/java/com/tibagni/logviewer/bugreport/section/BugreportInfoSection.kt

@@ -1,9 +1,9 @@
 package com.tibagni.logviewer.bugreport.section
 
-data class PropertiesSection(
+data class BugreportInfoSection(
  val build: String,
  val fingerprint: String,
  val bootloader: String,
  val kernel: String,
  val uptime: String
-) : BugReportSection(SectionNames.PROPERTIES)
+) : BugReportSection(SectionNames.BUGREPORT_INFO)

src/main/java/com/tibagni/logviewer/bugreport/section/SectionNames.kt

@@ -1,7 +1,8 @@
 package com.tibagni.logviewer.bugreport.section
 
 object SectionNames {
- const val PROPERTIES = "Properties"
+ const val BUGREPORT_INFO = "Bugreport Info"
+ const val SYSTEM_PROPERTIES = "System Properties"
  const val PLAIN_TEXT = "Plain Text bugreport"
  const val APPLICATION_PKG = "Application Packages"
  const val SYSTEM_HIDDEN_PKG = "Hidden system packages"

src/main/java/com/tibagni/logviewer/bugreport/section/SystemPropertiesSection.kt

@@ -0,0 +1,4 @@
+package com.tibagni.logviewer.bugreport.section
+
+data class SystemPropertiesSection(val configs: Map<String, String>) :
+ BugReportSection(SectionNames.SYSTEM_PROPERTIES)

src/main/java/com/tibagni/logviewer/bugreport/section/ui/PropertiesSectionPanel.kt renamed to src/main/java/com/tibagni/logviewer/bugreport/section/ui/BugreportInfoSectionPanel.kt

@@ -1,13 +1,13 @@
 package com.tibagni.logviewer.bugreport.section.ui
 
-import com.tibagni.logviewer.bugreport.section.PropertiesSection
+import com.tibagni.logviewer.bugreport.section.BugreportInfoSection
 import com.tibagni.logviewer.util.layout.GBConstraintsBuilder
 import com.tibagni.logviewer.view.maxWidthOfColumn
 import java.awt.GridBagConstraints
 import javax.swing.JScrollPane
 import javax.swing.JTable
 
-class PropertiesSectionPanel(private val section: PropertiesSection) : SectionPanel(section.sectionName) {
+class BugreportInfoSectionPanel(private val section: BugreportInfoSection) : SectionPanel(section.sectionName) {
  init {
  buildUi()
  }

src/main/java/com/tibagni/logviewer/bugreport/section/ui/SectionPanelFactory.kt

@@ -5,12 +5,13 @@ import com.tibagni.logviewer.bugreport.section.*
 object SectionPanelFactory {
  fun createPanelFor(sectionName: String, section: BugReportSection): SectionPanel {
  return when (sectionName) {
- SectionNames.PROPERTIES -> PropertiesSectionPanel(section as PropertiesSection)
+ SectionNames.BUGREPORT_INFO -> BugreportInfoSectionPanel(section as BugreportInfoSection)
  SectionNames.PLAIN_TEXT -> PlainTextBugreportPanel(section as PlainTextSection)
  SectionNames.APPLICATION_PKG -> PackageSectionPanel(section as PackagesSection)
  SectionNames.SYSTEM_HIDDEN_PKG -> PackageSectionPanel(section as PackagesSection)
  SectionNames.CARRIER_CONFIG -> CarrierConfigSectionPanel(section as CarrierConfigSection)
  SectionNames.SUBSCRIPTIONS -> SubscriptionsSectionPanel(section as SubscriptionsSection)
+ SectionNames.SYSTEM_PROPERTIES -> SystemPropertiesSectionPanel(section as SystemPropertiesSection)
  else -> object : SectionPanel("Invalid Section") {}// Should never reach here
  }
  }

src/main/java/com/tibagni/logviewer/bugreport/section/ui/SystemPropertiesSectionPanel.kt

@@ -0,0 +1,52 @@
+package com.tibagni.logviewer.bugreport.section.ui
+
+import com.tibagni.logviewer.bugreport.section.SystemPropertiesSection
+import com.tibagni.logviewer.util.layout.GBConstraintsBuilder
+import java.awt.GridBagConstraints
+import javax.swing.*
+import javax.swing.table.DefaultTableModel
+
+class SystemPropertiesSectionPanel(private val section: SystemPropertiesSection) : SectionPanel(section.sectionName, true) {
+ private val headerTitles = arrayOf("Property", "Value")
+ private lateinit var tableModel: SysPropTableModel
+
+ init {
+ buildUi()
+ }
+
+ override fun onSearch(searchText: String) {
+ val filteredRows =
+ section.configs.filterKeys { it.contains(searchText) }.map { arrayOf(it.key, it.value) }
+ .toTypedArray()
+ tableModel.setDataVector(filteredRows, arrayOf("Property", "Value"))
+ }
+
+ private fun buildUi() {
+ val container = JPanel()
+ container.layout = BoxLayout(container, BoxLayout.Y_AXIS)
+
+ val rows = section.configs.entries.map { arrayOf(it.key, it.value) }.toTypedArray()
+
+ val table = JTable()
+ tableModel = SysPropTableModel(rows, headerTitles)
+ table.model = tableModel
+ table.tableHeader.resizingAllowed = true
+
+ container.add(table)
+
+ add(
+ JScrollPane(container).also { it.verticalScrollBar.unitIncrement = 16 },
+ GBConstraintsBuilder()
+ .withGridx(1)
+ .withGridy(2)
+ .withWeightx(1.0)
+ .withWeighty(1.0)
+ .withFill(GridBagConstraints.BOTH)
+ .build()
+ )
+ }
+}
+
+private class SysPropTableModel(data: Array<Array<String>>, cols: Array<String>) : DefaultTableModel(data, cols) {
+ override fun isCellEditable(row: Int, column: Int) = false
+}

src/test/java/com/tibagni/logviewer/bugreport/parser/PropertiesSectionParserTests.kt

@@ -1,12 +1,12 @@
 package com.tibagni.logviewer.bugreport.parser
 
-import com.tibagni.logviewer.bugreport.section.PropertiesSection
+import com.tibagni.logviewer.bugreport.section.BugreportInfoSection
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 
 class PropertiesSectionParserTests {
- private lateinit var propertiesSectionParser: PropertiesSectionParser
+ private lateinit var propertiesSectionParser: BugreportInfoSectionParser
 
  companion object {
  const val PROPERTIES = "========================================================\n" +
@@ -22,12 +22,12 @@ class PropertiesSectionParserTests {
 
  @Before
  fun setUp() {
- propertiesSectionParser = PropertiesSectionParser()
+ propertiesSectionParser = BugreportInfoSectionParser()
  }
 
  @Test
  fun testParseProperties() {
- val section = propertiesSectionParser.parse("", PROPERTIES) as PropertiesSection
+ val section = propertiesSectionParser.parse("", PROPERTIES) as BugreportInfoSection
 
  assertEquals("blabla-userdebug 11 AAA11.111 57ca8 test-keys", section.build)
  assertEquals("'bla/blabla/bla:11/AAA11.111/57ca8:userdebug/intcfg,test-keys'", section.fingerprint)
@@ -38,7 +38,7 @@ class PropertiesSectionParserTests {
 
  @Test
  fun testParsePropertiesMissingData() {
- val section = propertiesSectionParser.parse("", "INVALID") as PropertiesSection
+ val section = propertiesSectionParser.parse("", "INVALID") as BugreportInfoSection
 
  assertEquals("Not Found", section.build)
  assertEquals("Not Found", section.fingerprint)