add variable processing support

.github/workflows/test.yml

@@ -14,18 +14,18 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Log in to the Container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@v2
         with:
           registry: ${{env.REGISTRY}}
           username: ${{secrets.PKG_REGISTRY_USERNAME}}
           password: ${{secrets.PKG_REGISTRY_RW_TOKEN}}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@v4
         with:
           images: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}
       - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true
@@ -74,7 +74,7 @@ jobs:
           name: test_inputs
           path: tests
       - name: Run pytest tests
-        run: python3 -m pytest $(pwd) -v --cov src/pyelf --cov-report=xml --verbose --cov-fail-under 90
+        run: python3 -m pytest $(pwd) -v --cov src/pyelf --cov-report=xml --verbose --cov-fail-under 80
       - name: Upload code coverage to Codecov
         uses: codecov/codecov-action@v2
         with:

.gitignore

@@ -12,3 +12,4 @@ tests/*.asm
 tests/*.bin
 tests/*.elf
 tests/*.map
+**/__pycache__/

VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

src/pyelf/cli.py → src/cli.py

@@ -5,14 +5,14 @@
 """
 
 import argparse
+import json
 
-from .pyelf import ElfFile
+from pyelf.parser import ElfFile
 
 
 def main():
     parser = argparse.ArgumentParser(prog='pya2l', description='python command line utility for elf-formatted files.')
     parser.add_argument('input_file', help='input file path')
-    parser.add_argument('output_file', type=argparse.FileType('wb'), help='output file path')
     parser.add_argument('-O',
                         dest='output_format',
                         metavar='output format',
@@ -24,9 +24,19 @@ def main():
     args = parser.parse_args()
 
     elf = ElfFile(args.input_file)
-
-    if args.output_format == 'binary':
-        args.output_file.write(elf.binary)
+    result = list()
+    for variable in elf.variables():
+        # result.append(variable.to_json())
+        try:
+            result.append(variable.to_json())
+        except RecursionError as e:
+            print(f'{variable.name} | {str(e)}')
+            continue
+    with open('output2.json', 'w') as fp:
+        json.dump(result, fp, indent=2, sort_keys=True)
+
+    # if args.output_format == 'binary':
+    #     args.output_file.write(elf.binary)
 
 
 if __name__ == '__main__':

src/pyelf/__init__.py

@@ -12,6 +12,7 @@
 __url__ = 'http://www.github.com/Sauci/pyelf'
 __description__ = ''
 __long_description__ = ''''''
+import os
+import sys
 
-from .cli import main
-from .pyelf import Address, ElfException, ElfFile, Symbol
+sys.path.append(os.path.dirname(__file__))