Improved parsing of bugreports by finding dumpstate file name from main_entry.txt

mvt/android/modules/bugreport/accessibility.py

@@ -33,12 +33,9 @@ class Accessibility(BugReportModule):
                 continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_patterns(["dumpstate-*.txt", "dumpState_*.log", "bugreport-*.txt"])
-        if not dumpstate_files:
-            return
-
-        content = self._get_file_content(dumpstate_files[0])
+        content = self._get_dumpstate_file()
         if not content:
+            self.log.error("Unable to find dumpstate file. Did you provide a valid bug report archive?")
             return
 
         lines = []

mvt/android/modules/bugreport/activities.py

@@ -36,12 +36,9 @@ class Activities(BugReportModule):
                     continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_patterns(["dumpstate-*.txt", "dumpState_*.log", "bugreport-*.txt"])
-        if not dumpstate_files:
-            return
-
-        content = self._get_file_content(dumpstate_files[0])
+        content = self._get_dumpstate_file()
         if not content:
+            self.log.error("Unable to find dumpstate file. Did you provide a valid bug report archive?")
             return
 
         lines = []

mvt/android/modules/bugreport/base.py

@@ -51,3 +51,20 @@ class BugReportModule(MVTModule):
         handle.close()
 
         return data
+
+    def _get_dumpstate_file(self):
+        main = self._get_files_by_pattern("main_entry.txt")
+        if main:
+            main_content = self._get_file_content(main[0])
+            try:
+                return self._get_file_content(main_content.decode().strip())
+            except KeyError:
+                return None
+        else:
+            dumpstate_logs = self._get_files_by_pattern("dumpState_*.log")
+            if not dumpstate_logs:
+                return None
+
+            return self._get_file_content(dumpstate_logs[0])
+
+        return None

mvt/android/modules/bugreport/battery_daily.py

@@ -41,12 +41,9 @@ class BatteryDaily(BugReportModule):
                 continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_patterns(["dumpstate-*.txt", "dumpState_*.log", "bugreport-*.txt"])
-        if not dumpstate_files:
-            return
-
-        content = self._get_file_content(dumpstate_files[0])
+        content = self._get_dumpstate_file()
         if not content:
+            self.log.error("Unable to find dumpstate file. Did you provide a valid bug report archive?")
             return
 
         lines = []

mvt/android/modules/bugreport/battery_history.py

@@ -33,12 +33,9 @@ class BatteryHistory(BugReportModule):
                 continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_patterns(["dumpstate-*.txt", "dumpState_*.log", "bugreport-*.txt"])
-        if not dumpstate_files:
-            return
-
-        content = self._get_file_content(dumpstate_files[0])
+        content = self._get_dumpstate_file()
         if not content:
+            self.log.error("Unable to find dumpstate file. Did you provide a valid bug report archive?")
             return
 
         lines = []

mvt/android/modules/bugreport/dbinfo.py

@@ -37,12 +37,9 @@ class DBInfo(BugReportModule):
                     continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_patterns(["dumpstate-*.txt", "dumpState_*.log", "bugreport-*.txt"])
-        if not dumpstate_files:
-            return
-
-        content = self._get_file_content(dumpstate_files[0])
+        content = self._get_dumpstate_file()
         if not content:
+            self.log.error("Unable to find dumpstate file. Did you provide a valid bug report archive?")
             return
 
         in_dbinfo = False

mvt/android/modules/bugreport/getprop.py

@@ -25,12 +25,9 @@ class Getprop(BugReportModule):
         self.results = {} if not results else results
 
     def run(self):
-        dumpstate_files = self._get_files_by_patterns(["dumpstate-*.txt", "dumpState_*.log", "bugreport-*.txt"])
-        if not dumpstate_files:
-            return
-
-        content = self._get_file_content(dumpstate_files[0])
+        content = self._get_dumpstate_file()
         if not content:
+            self.log.error("Unable to find dumpstate file. Did you provide a valid bug report archive?")
             return
 
         lines = []

mvt/android/modules/bugreport/packages.py

@@ -84,12 +84,9 @@ class Packages(BugReportModule):
         return results
 
     def run(self):
-        dumpstate_files = self._get_files_by_patterns(["dumpstate-*.txt", "dumpState_*.log", "bugreport-*.txt"])
-        if not dumpstate_files:
-            return
-
-        content = self._get_file_content(dumpstate_files[0])
+        content = self._get_dumpstate_file()
         if not content:
+            self.log.error("Unable to find dumpstate file. Did you provide a valid bug report archive?")
             return
 
         in_package = False

mvt/android/modules/bugreport/receivers.py

@@ -58,12 +58,9 @@ class Receivers(BugReportModule):
                 continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_patterns(["dumpstate-*.txt", "dumpState_*.log", "bugreport-*.txt"])
-        if not dumpstate_files:
-            return
-
-        content = self._get_file_content(dumpstate_files[0])
+        content = self._get_dumpstate_file()
         if not content:
+            self.log.error("Unable to find dumpstate file. Did you provide a valid bug report archive?")
             return
 
         in_receivers = False