refactor parser location

ghidriff/__init__.py

@@ -6,8 +6,8 @@
 from .version_tracking_diff import VersionTrackingDiff
 from .simple_diff import SimpleDiff
 from .structural_graph_diff import StructualGraphDiff
-from .__main__ import get_parser, get_engine_classes
+from .parser import get_parser,get_engine_classes
 
 __all__ = [
-    "GhidraDiffEngine", "SimpleDiff", "StructualGraphDiff", "VersionTrackingDiff", "get_parser", "get_engine_classes"
+    "GhidraDiffEngine", "SimpleDiff", "StructualGraphDiff", "VersionTrackingDiff", "get_parser","get_engine_classes"
 ]

ghidriff/__main__.py

@@ -1,50 +1,16 @@
-import argparse
+from argparse import ArgumentParser
 from pathlib import Path
 import json
-import inspect
 
-import ghidriff
 from ghidriff import GhidraDiffEngine
-
-
-def get_engine_classes() -> dict:
-    engines = {}
-
-    for name, klass in inspect.getmembers(ghidriff, inspect.isclass):
-        if name.endswith('Diff'):
-            engines[name] = klass
-
-    return engines
-
-def get_parser() -> argparse.ArgumentParser:
-    """
-    Build main ghidriff parser
-    """
-
-    parser = argparse.ArgumentParser(description='ghidriff - A Command Line Ghidra Binary Diffing Engine',
-                                formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-
-    parser.add_argument('old', nargs=1, help="Path to old version of binary '/somewhere/bin.old'")
-    parser.add_argument('new', action='append', nargs='+',
-                        help="Path to new version of binary '/somewhere/bin.new'. (For multiple new binaries add oldest to newest)")
-
-    # setup Engine class options
-    engines = get_engine_classes()
-    parser.add_argument('--engine', help='The diff implementation to use.',
-                        default='VersionTrackingDiff', choices=engines.keys())
-
-    parser.add_argument('-o', '--output-path', help='Output path for resulting diffs', default='ghidriffs')
-    parser.add_argument('--summary', help='Add a summary diff if more than two bins are provided', default=False)
-
-    return parser
-
+from .parser import get_parser,get_engine_classes
 
 def main():
     """
     ghidriff - GhidraDiffEngine module main function
     """
 
-    parser = get_parser()
+    parser : ArgumentParser = get_parser()
 
     GhidraDiffEngine.add_ghidra_args_to_parser(parser)
 

ghidriff/parser.py

@@ -0,0 +1,35 @@
+import inspect
+import argparse
+import ghidriff
+
+
+def get_engine_classes() -> dict:
+    engines = {}
+
+    for name, klass in inspect.getmembers(ghidriff, inspect.isclass):
+        if name.endswith('Diff'):
+            engines[name] = klass
+
+    return engines
+
+def get_parser() -> argparse.ArgumentParser:
+    """
+    Build main ghidriff parser
+    """
+
+    parser = argparse.ArgumentParser(description='ghidriff - A Command Line Ghidra Binary Diffing Engine',
+                                formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+    parser.add_argument('old', nargs=1, help="Path to old version of binary '/somewhere/bin.old'")
+    parser.add_argument('new', action='append', nargs='+',
+                        help="Path to new version of binary '/somewhere/bin.new'. (For multiple new binaries add oldest to newest)")
+
+    # setup Engine class options
+    engines = get_engine_classes()
+    parser.add_argument('--engine', help='The diff implementation to use.',
+                        default='VersionTrackingDiff', choices=engines.keys())
+
+    parser.add_argument('-o', '--output-path', help='Output path for resulting diffs', default='ghidriffs')
+    parser.add_argument('--summary', help='Add a summary diff if more than two bins are provided', default=False)
+
+    return parser