Merge pull request #71 from pafernanr/devel

FIX argutment showall

Author: pafernanr

README.md

@@ -17,8 +17,8 @@ Companion command `dynflowparser-export-tasks` helps to overcome `sosreport` fil
 
 #### Dependencies
 Required python libraries:
-- Jinja2>=3.1.3
-- python_dateutil>=2.8.2
+- Jinja2
+- pytz
 
 #### Installation
 ~~~

dynflowparser/__init__.py

@@ -160,8 +160,7 @@ def main(self):
                 self.conf.sos['timezone'],
                 ends)
             if (dfrom <= starts <= dto) or (dfrom <= ends <= dto):
-                # include only success tasks or all
-                if self.conf.unsuccess:
+                if not self.conf.args.showall:
                     if dline[headers.index('result')] != 'success':
                         self.conf.dynflowdata['includedUUID'].append(
                             dline[headers.index('external_id')]

dynflowparser/lib/configuration.py

@@ -15,7 +15,6 @@ def __init__(self):
             'actions': {'times': 0},
             'includedUUID': [],
             }
-        self.unsuccess = True
         self.writesql = True
         self.sos = {}
         self.dbfile = ""
@@ -27,6 +26,7 @@ def __init__(self):
         self.parser.add_argument(
             '-a',
             '--all',
+            dest='showall',
             help='Parse all. By default only unsuccess plans are parsed.',
             default=False,
             action='store_true'

dynflowparser/lib/outputhtml.py

@@ -32,10 +32,10 @@ def write(self):
 
     def write_tasks(self):
         self.util.debug("I", "write_tasks")
-        if self.conf.unsuccess:
-            where = " AND t.result != 'success'"
-        else:
+        if self.conf.args.showall:
             where = ""
+        else:
+            where = " AND t.result != 'success'"
 
         tmp = self.db.query("SELECT t.parent_task_id, t.id, t.external_id,"
                             + " t.label, t.state, t.result, t.started_at,"
@@ -84,7 +84,7 @@ def write_actions(self):
         sql = ("SELECT * FROM steps ORDER BY id")
         rows = self.db.query(sql)
         for r in rows:
-            if self.conf.unsuccess and r[8] == "success":
+            if not self.conf.args.showall and r[8] == "success":
                 continue
             r = list(r)
             r[12] = self.show_json(r[12])
@@ -115,7 +115,7 @@ def write_actions(self):
         self.pb.start_time = datetime.datetime.now()
         start_time = time.time()
         for r in rows:
-            if self.conf.unsuccess and r[8] == "success":
+            if not self.conf.args.showall and r[8] == "success":
                 continue
             r = list(r)
             r[5] = self.show_json(r[5])