Merge pull request #56 from RobLinux/dyldex_all-filter

Added filtering option for dyldex_all

Author: arandomdev

.gitignore

@@ -2,6 +2,7 @@ __pycache__
 .vscode/
 dist
 src/*.egg-info
+venv
 
 # Big files like the shared cache should be excluded from the repo
 binaries/

README.md

@@ -21,6 +21,9 @@ dyldex -e SpringBoard.framework/SpringBoard [dyld_shared_cache_path]
 # Extracting all frameworks/libraries from a shared cache
 dyldex_all [dyld_shared_cache_path]
 
+# Extracting all frameworks/libraries from a shared cache containing name
+dyldex_all -f <Filter Text> [dyld_shared_cache_path]
+
 # In any of the above examples, replace "dyldex" and "dyldex_all" with "kextex" and "kextex_all" respectively to extract images from a MH_FILESET kernelcache instead of a DSC
 
 ```

bin/dyldex_all

@@ -48,6 +48,7 @@ class _DyldExtractorArgs(argparse.Namespace):
 	output: pathlib.Path
 	jobs: int
 	verbosity: int
+	filter: str
 	pass
 
 
@@ -74,6 +75,11 @@ def _createArgParser() -> argparse.ArgumentParser:
 		type=int,
 		help="Increase verbosity, Option 1 is the default. | 0 = None | 1 = Critical Error and Warnings | 2 = 1 + Info | 3 = 2 + debug |"  # noqa
 	)
+	parser.add_argument(
+		"-f", "--filter",
+		type=str,
+		help="Extract libraries containing the filter in their name."
+	)
 
 	return parser
 
@@ -244,7 +250,11 @@ def _main() -> None:
 		# Create a job for each image
 		jobs: List[Tuple[str, multiprocessing.pool.AsyncResult]] = []
 		jobsComplete = 0
+		filterEnabled = args.filter is not None
 		for i, imagePath in enumerate(imagePaths):
+			if filterEnabled and args.filter not in imagePath:
+				continue
+
 			# The index should correspond with its index in the DSC
 			extractionArgs = (args.dyld_path, outputDir, i, imagePath, loggingLevel)
 			jobs.append((imagePath, pool.apply_async(_extractImage, extractionArgs)))

bin/kextex_all

@@ -49,6 +49,7 @@ class _DyldExtractorArgs(argparse.Namespace):
 	output: pathlib.Path
 	jobs: int
 	verbosity: int
+	filter: str
 	pass
 
 
@@ -75,6 +76,11 @@ def _createArgParser() -> argparse.ArgumentParser:
 		type=int,
 		help="Increase verbosity, Option 1 is the default. | 0 = None | 1 = Critical Error and Warnings | 2 = 1 + Info | 3 = 2 + debug |"  # noqa
 	)
+	parser.add_argument(
+		"-f", "--filter",
+		type=str,
+		help="Extract libraries containing the filter in their name."
+	)
 
 	return parser
 
@@ -218,7 +224,11 @@ def _main() -> None:
 		# Create a job for each image
 		jobs: List[Tuple[str, multiprocessing.pool.AsyncResult]] = []
 		jobsComplete = 0
+		filterEnabled = args.filter is not None
 		for i, imagePath in enumerate(imagePaths):
+			if filterEnabled and args.filter not in imagePath:
+				continue
+
 			# The index should correspond with its index in the DSC
 			extractionArgs = (args.kc_path, outputDir, i, imagePath, loggingLevel)
 			jobs.append((imagePath, pool.apply_async(_extractImage, extractionArgs)))