Supporting searching files by multiple patterns

mvt/android/modules/bugreport/accessibility.py

@@ -33,7 +33,7 @@ class Accessibility(BugReportModule):
                 continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_pattern("dumpstate-*")
+        dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"])
         if not dumpstate_files:
             return
 

mvt/android/modules/bugreport/activities.py

@@ -36,7 +36,7 @@ class Activities(BugReportModule):
                     continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_pattern("dumpstate-*")
+        dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"])
         if not dumpstate_files:
             return
 

mvt/android/modules/bugreport/base.py

@@ -35,6 +35,12 @@ class BugReportModule(MVTModule):
 
         return fnmatch.filter(file_names, pattern)
 
+    def _get_files_by_patterns(self, patterns):
+        for pattern in patterns:
+            matches = self._get_files_by_pattern(pattern)
+            if matches:
+                return matches
+
     def _get_file_content(self, file_path):
         if self.zip_archive:
             handle = self.zip_archive.open(file_path)

mvt/android/modules/bugreport/battery_daily.py

@@ -41,7 +41,7 @@ class BatteryDaily(BugReportModule):
                 continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_pattern("dumpstate-*")
+        dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"])
         if not dumpstate_files:
             return
 

mvt/android/modules/bugreport/battery_history.py

@@ -33,7 +33,7 @@ class BatteryHistory(BugReportModule):
                 continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_pattern("dumpstate-*")
+        dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"])
         if not dumpstate_files:
             return
 

mvt/android/modules/bugreport/dbinfo.py

@@ -37,7 +37,7 @@ class DBInfo(BugReportModule):
                     continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_pattern("dumpstate-*")
+        dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"])
         if not dumpstate_files:
             return
 

mvt/android/modules/bugreport/getprop.py

@@ -25,7 +25,7 @@ class Getprop(BugReportModule):
         self.results = {} if not results else results
 
     def run(self):
-        dumpstate_files = self._get_files_by_pattern("dumpstate-*")
+        dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"])
         if not dumpstate_files:
             return
 

mvt/android/modules/bugreport/packages.py

@@ -84,7 +84,7 @@ class Packages(BugReportModule):
         return results
 
     def run(self):
-        dumpstate_files = self._get_files_by_pattern("dumpstate-*")
+        dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"])
         if not dumpstate_files:
             return
 

mvt/android/modules/bugreport/receivers.py

@@ -58,7 +58,7 @@ class Receivers(BugReportModule):
                 continue
 
     def run(self):
-        dumpstate_files = self._get_files_by_pattern("dumpstate-*")
+        dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"])
         if not dumpstate_files:
             return