Merge ~pieq/bugit/+git/qabro:fix-1883860-series-argument into bugit:master

[Pierre Equoy]

See commit message for more info.

To test, one can build the snap using `snapcraft` command, install it with `--devmode` argument, and test:

$ qabro -h
usage: test.py [-h] [--fwts] [-a ASSIGNEE] [-p PROJECT] [-s SERIES] [-t TAGS]

optional arguments:
  -h, --help show this help message and exit
  --fwts Automatically files an issue in Launchpad for the firmware team
  -a ASSIGNEE, --assignee ASSIGNEE
                        Assignee
  -p PROJECT, --project PROJECT
                        Project name
  -s SERIES, --series SERIES
                        Series
  -t TAGS, --tags TAGS Tags (such as Platform tag) separated by spaces

Examples: `qabro --fwts -p somerville -t platform-tag-3` will automatically open a Launchpad issue in the somerville project for the FWTS team.`qabro -p myproject -s myseries -t "a b c"` will start a bug report for the myproject project under the myseries series with tags a, b and c.

$ qabro -s my-series

should pre-fill the Series text field with `my-series`.

[Jonathan Cave (jocave)]

Very minor usability point not entirely related to this MR! Otherwise looks good to me.

review: Approve

[Pierre Equoy (pieq)]

Good point, joc, I updated the commit to reflect this.

[Jonathan Cave (jocave)]

Nice, still +1

diff --git a/qabro/__init__.py b/qabro/__init__.py
index ce717ad..832e3a7 100644
--- a/qabro/__init__.py
+++ b/qabro/__init__.py
@@ -36,15 +36,19 @@ def main():
         raise ValueError('Invalid log level: %s' % loglevel)
     logging.basicConfig(filename=logfile, format=logformat, level=numeric_level)
 
-    epilog = ("Example: `qabro --fwts -p somerville -t platform-tag-3` will "
+    epilog = ("Examples: `qabro --fwts -p somerville -t platform-tag-3` will "
               "automatically open a Launchpad issue in the somerville project "
-              "for the FWTS team.")
+              "for the FWTS team."
+              "`qabro -p myproject -s myseries -t \"a b c\"` will start a bug "
+              "report for the myproject project under the myseries series "
+              "with tags a, b and c.")
     parser = argparse.ArgumentParser(epilog=epilog, argument_default='')
     parser.add_argument("--fwts", help=("Automatically files an issue in "
                                         "Launchpad for the firmware team"),
                         action="store_true")
-    parser.add_argument("-a", "--assignee", help="Assignee")
+    parser.add_argument("-a", "--assignee", help="Assignee e.g. your Launchpad ID")
     parser.add_argument("-p", "--project", help="Project name")
+    parser.add_argument("-s", "--series", help="Series e.g. focal")
     parser.add_argument("-t", "--tags",
                         help="Tags (such as Platform tag) separated by spaces")
     args = parser.parse_args()
@@ -55,11 +59,16 @@ def main():
             sys.exit("You must specify a platform tag, e.g. -t platform-tag-3")
         auto_submit_fwts_report(args.project, args.tags)
     else:
-        start_ui(assignee=args.assignee, project=args.project, tags=args.tags)
+        start_ui(assignee=args.assignee,
+                 project=args.project,
+                 series=args.series,
+                 tags=args.tags)
 
 
-def start_ui(assignee='', project='', tags=''):
-    ui = ReportScreen(assignee=assignee.lower(), project=project.lower(),
+def start_ui(assignee='', project='', series='', tags=''):
+    ui = ReportScreen(assignee=assignee.lower(),
+                      project=project.lower(),
+                      series=series.lower(),
                       tags=tags.lower())
     ui.run()
     ba = BugAssistant(ui.report())
diff --git a/qabro/ui.py b/qabro/ui.py
index 1a78c20..f83c516 100644
--- a/qabro/ui.py
+++ b/qabro/ui.py
@@ -44,7 +44,7 @@ class ReportScreen:
             elif d["category"] == "vendors":
                 tags["vendors"] = d["tags"]
 
-    def __init__(self, project='', tags='', assignee=''):
+    def __init__(self, assignee='', project='', series='', tags=''):
         # Adding standard info (CPU, BIOS, GPU, etc.)  to the description
         std_info = AttachmentAssistant.get_standard_info()
         std_info_str = '\n'.join(['{}: {}'.format(elt, std_info[elt]) for elt in std_info])
@@ -55,7 +55,7 @@ class ReportScreen:
                                                      multiline=True),
                                           "Description (including steps to reproduce)")
         self._project = urwid.LineBox(urwid.Edit(edit_text=project), 'Project')
-        self._series = urwid.LineBox(urwid.Edit(), 'Series')
+        self._series = urwid.LineBox(urwid.Edit(edit_text=series), 'Series')
         self._status = []
         for s in self.statuses:
             rb = urwid.RadioButton(self._status, s, 'first True', None)