diff --git a/mvt/ios/modules/base.py b/mvt/ios/modules/base.py index 729baf8..201c284 100644 --- a/mvt/ios/modules/base.py +++ b/mvt/ios/modules/base.py @@ -107,7 +107,7 @@ class IOSExtraction(MVTModule): return None - def _find_fs_files_from_pattern(self, root_paths): + def _get_fs_files_from_pattern(self, root_paths): for root_path in root_paths: for found_path in glob.glob(os.path.join(self.base_folder, root_path)): if not os.path.exists(found_path): diff --git a/mvt/ios/modules/fs/version_history.py b/mvt/ios/modules/fs/version_history.py index a15448a..4b9f8a3 100644 --- a/mvt/ios/modules/fs/version_history.py +++ b/mvt/ios/modules/fs/version_history.py @@ -32,7 +32,7 @@ class IOSVersionHistory(IOSExtraction): } def run(self): - for found_path in self._find_fs_files_from_pattern(IOS_ANALYTICS_JOURNAL_PATHS): + for found_path in self._get_fs_files_from_pattern(IOS_ANALYTICS_JOURNAL_PATHS): with open(found_path, "r") as analytics_log: log_line = json.loads(analytics_log.readline().strip()) diff --git a/mvt/ios/modules/fs/webkit_base.py b/mvt/ios/modules/fs/webkit_base.py index fcdc087..e4bf6fa 100644 --- a/mvt/ios/modules/fs/webkit_base.py +++ b/mvt/ios/modules/fs/webkit_base.py @@ -23,7 +23,7 @@ class WebkitBase(IOSExtraction): self.detected.append(item) def _process_webkit_folder(self, root_paths): - for found_path in self._find_fs_files_from_pattern(root_paths): + for found_path in self._get_fs_files_from_pattern(root_paths): key = os.path.relpath(found_path, self.base_folder) for name in os.listdir(found_path): diff --git a/mvt/ios/modules/mixed/webkit_resource_load_statistics.py b/mvt/ios/modules/mixed/webkit_resource_load_statistics.py index 3b2f3eb..ca7a741 100644 --- a/mvt/ios/modules/mixed/webkit_resource_load_statistics.py +++ b/mvt/ios/modules/mixed/webkit_resource_load_statistics.py @@ -83,5 +83,5 @@ class WebkitResourceLoadStatistics(IOSExtraction): except Exception as e: self.log.info("Unable to search for WebKit observations.db: %s", e) elif self.is_fs_dump: - for db_path in self._find_fs_files_from_pattern(WEBKIT_RESOURCELOADSTATICS_ROOT_PATHS): + for db_path in self._get_fs_files_from_pattern(WEBKIT_RESOURCELOADSTATICS_ROOT_PATHS): self._process_observations_db(db_path=db_path, key=os.path.relpath(db_path, self.base_folder)) diff --git a/mvt/ios/modules/mixed/webkit_session_resource_log.py b/mvt/ios/modules/mixed/webkit_session_resource_log.py index 93df003..d19b681 100644 --- a/mvt/ios/modules/mixed/webkit_session_resource_log.py +++ b/mvt/ios/modules/mixed/webkit_session_resource_log.py @@ -117,7 +117,7 @@ class WebkitSessionResourceLog(IOSExtraction): self.results[self.file_path] = self._extract_browsing_stats(self.file_path) return - for log_file in self._find_fs_files_from_pattern(WEBKIT_RESOURCELOADSTATICS_ROOT_PATHS): + for log_file in self._get_fs_files_from_pattern(WEBKIT_RESOURCELOADSTATICS_ROOT_PATHS): self.log.info("Found Safari browsing session resource log at path: %s", log_file) key = os.path.relpath(log_file, self.base_folder) self.results[key] = self._extract_browsing_stats(log_file)