chg: add list all

.vscode/launch.json

@@ -38,11 +38,11 @@
             "cwd": "${workspaceFolder}/"
         },
         {
-            "name": "Python Debugger: parsing.py list parsers",
+            "name": "Python Debugger: parsing.py list all",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/parsing.py",
-            "args": "list parsers",
+            "args": "list all",
             "cwd": "${workspaceFolder}/"
         },
         {

analyse.py

@@ -6,7 +6,7 @@
 """sysdiagnose analyse.
 
 Usage:
-  analyse.py list (cases|analysers)
+  analyse.py list (cases|analysers|all)
   analyse.py analyse <analyser> <case_number>
   analyse.py allanalysers <case_number>
   analyse.py (-h | --help)
@@ -34,6 +34,7 @@ def list_analysers(folder):
     """
         List available analysers
     """
+    prev_folder = os.getcwd()
     os.chdir(folder)
     modules = glob.glob(os.path.join(os.path.dirname('.'), "*.py"))
     lines = []
@@ -52,6 +53,7 @@ def list_analysers(folder):
     headers = ['Analyser Name', 'Analyser Description']
 
     print(tabulate(lines, headers=headers))
+    os.chdir(prev_folder)
 
 
 def analyse(analyser, caseid):
@@ -73,6 +75,7 @@ def analyse(analyser, caseid):
 
 
 def allanalysers(caseid):
+    prev_folder = os.getcwd()
     os.chdir(config.analysers_folder)
     modules = glob.glob(os.path.join(os.path.dirname('.'), "*.py"))
     os.chdir('..')
@@ -84,6 +87,7 @@ def allanalysers(caseid):
             analyse(analyser[:-3], caseid)
         except:     # noqa: E722
             continue
+    os.chdir(prev_folder)
     return 0
 
 # --------------------------------------------------------------------------- #
@@ -99,9 +103,13 @@ def main():
 
     arguments = docopt(__doc__, version=version_string)
     if arguments['list'] and arguments['cases']:
-        parsing.list_cases(config.cases_file)
+        parsing.list_cases()
     elif arguments['list'] and arguments['analysers']:
         list_analysers(config.analysers_folder)
+    elif arguments['list']:
+        list_analysers(config.analysers_folder)
+        print("\n")
+        parsing.list_cases()
     elif arguments['analyse']:
         if arguments['<case_number>'].isdigit():
             analyse(arguments['<analyser>'], arguments['<case_number>'])

initialise.py

@@ -93,6 +93,7 @@ def init(sysdiagnose_file, force=False):
     # extract sysdiagnose files
     if config.debug:
         print(f"cd'ing to {new_folder}")
+    prev_folder = os.getcwd()
     os.chdir(new_folder)
     try:
         tf.extractall()
@@ -142,6 +143,7 @@ def init(sysdiagnose_file, force=False):
 
     print("Sysdiagnose file has been processed")
     print(f"New case ID: {str(new_case['case_id'])}")
+    os.chdir(prev_folder)
 
 
 """

parsing.py

@@ -8,7 +8,7 @@
 """sysdiagnose parse.
 
 Usage:
-  parsing.py list (cases|parsers)
+  parsing.py list (cases|parsers|all)
   parsing.py parse <parser> <case_number>
   parsing.py allparsers <case_number>
   parsing.py (-h | --help)
@@ -35,7 +35,7 @@
 """
 
 
-def list_cases(case_file):
+def list_cases():
     try:
         with open(config.cases_file, 'r') as f:
             cases = json.load(f)
@@ -59,6 +59,7 @@ def list_cases(case_file):
 
 
 def list_parsers(folder):
+    prev_folder = os.getcwd()
     os.chdir(folder)
     modules = glob.glob(os.path.join(os.path.dirname('.'), "*.py"))
     lines = []
@@ -77,6 +78,7 @@ def list_parsers(folder):
     headers = ['Parser Name', 'Parser Description']
 
     print(tabulate(lines, headers=headers))
+    os.chdir(prev_folder)
 
 
 """
@@ -146,6 +148,7 @@ def parse_all(case_id):
     # get list of working parsers
     # for each parser, run and save which is working
     # display list of successful parses
+    prev_folder = os.getcwd()
     os.chdir(config.parsers_folder)
     modules = glob.glob(os.path.join(os.path.dirname('.'), "*.py"))
     os.chdir('..')
@@ -160,6 +163,7 @@ def parse_all(case_id):
             print(f"Error: Problem while executing module {parser[:-3]}. Reason: {str(e)}", file=sys.stderr)
             print(traceback.format_exc(), file=sys.stderr)
             continue
+    os.chdir(prev_folder)
     return 0
 
 
@@ -179,9 +183,13 @@ def main():
     # print(arguments, file=sys.stderr)
 
     if arguments['list'] and arguments['cases']:
-        list_cases(config.cases_file)
+        list_cases()
     elif arguments['list'] and arguments['parsers']:
         list_parsers(config.parsers_folder)
+    elif arguments['list']:
+        list_parsers(config.parsers_folder)
+        print("\n")
+        list_cases()
     elif arguments['parse']:
         if arguments['<case_number>'].isdigit():
             parse(arguments['<parser>'], arguments['<case_number>'])