Merge ~pieq/bugit/+git/qabro:master into bugit:master

[Pierre Equoy]

[Pierre Equoy (pieq)]

Self-approve

review: Approve

diff --git a/qabro/__init__.py b/qabro/__init__.py
index ad140a0..fd63106 100644
--- a/qabro/__init__.py
+++ b/qabro/__init__.py
@@ -1,6 +1,6 @@
 #!usr/bin/env python
 
-import os, sys
+import logging, os, sys
 from time import sleep
 
 from bug_assistant import BugAssistant
@@ -8,6 +8,10 @@ from ui import ReportScreen
 
 def main():
     if os.getenv('SUDO_USER'):
+        logging.basicConfig(filename='qabro.log',
+                            format='%(asctime)s - %(levelname)s - %(message)s',
+                            level=logging.ERROR
+                           )
         start_ui()
     else:
         sys.exit("Please run this tool using sudo!")
@@ -20,9 +24,18 @@ def start_ui():
         try: 
             result = ba.file_bug()
         except Exception as exc:
-            ui.message.set_text([('error', "Error: "), exc.message])
+            logging.error(exc)
+            error_msg = ''
+            if hasattr(exc, 'content'):
+                error_msg = exc.content
+            else:
+                error_msg = exc.message
+            ui.message.set_text([('error', "Error: "), error_msg])
             ui.run()
             ba.update(ui.report())
         else:
             print(result)
             break
+
+if __name__ == '__main__':
+    main()
diff --git a/qabro/__version__.py b/qabro/__version__.py
 new file mode 100644
index 0000000..e83815e
--- /dev/null
+++ b/qabro/__version__.py
@@ -0,0 +1,6 @@
+__title__ = 'qabro'
+__version__ = '0.4'
+__description__ = 'Report bug information with attachments in Launchpad'
+__author__ = 'Pierre Equoy'
+__author_email__ = '[e-mail]'
+__url__ = 'https://launchpad.net/qabro'
diff --git a/qabro/ui.py b/qabro/ui.py
index 80d0477..cdf2ec5 100644
--- a/qabro/ui.py
+++ b/qabro/ui.py
@@ -5,6 +5,7 @@ import sys
 import urwid
 
 from bug_assistant import BugReport
+from __version__ import __version__ as qversion, __title__ as qtitle
 
 class ReportScreen:
     palette = [
@@ -18,18 +19,37 @@ class ReportScreen:
         ]
 
     footer_text = [
-        "Bug Report    ",
+        qtitle + ' v' + qversion + '    ',
         ('key', "Alt-Enter"), " Submit  ",
         ('key', "Esc"), " Quit",
     ]
 
-    statuses = ('New', 'Incomplete', 'Opinion', 'Confirmed')
+    statuses = ('New', 'Confirmed')
     importances = ('Undecided',
                    'Wishlist',
                    'Low',
                    'Medium',
                    'High',
                    'Critical')
+    bug_types = { "Audio": "hwe-audio",
+                  "Bluetooth": "hwe-bluetooth",
+                  "Camera": "oem-camera",
+                  "External storage": "oem-storage",
+                  "Touchpad": "hwe-touchpad",
+                  "Touchscreen": "oem-touchscreen",
+                  "Install": "hwe-installer",
+                  "Media Card": "hwe-media",
+                  "Networking (ethernet)": "hwe-networking-ethernet",
+                  "Networking (wifi)": "hwe-networking-wifi",
+                  "Networking (modem)": "hwe-networking-modem",
+                  "Power management": "hwe-suspend-resume",
+                  "Checkbox": "checkbox test-case",
+                  "Video": "hwe-graphics",
+                  "Hotkeys": "hwe-hotkeys",
+                  "Firmware": "hwe-firmware",
+                  "Missing driver": "hwe-needs-driver",
+                  "Performance": "oem-performance",
+                  "Other problem": "oem-other"}
 
     default_description = ("Summary:\n\n"
                            "Steps to reproduce:\n\n"
@@ -51,12 +71,14 @@ class ReportScreen:
         self._importance = []
         for i in self.importances:
             rb = urwid.RadioButton(self._importance, i, 'first True', None)
-        self._assignee = urwid.LineBox(urwid.Edit(), 'Assigned To')
+        self._bug_type = []
+        for i in sorted(self.bug_types):
+            rb = urwid.RadioButton(self._bug_type, i, state=False, on_state_change=self.add_tag)
+        self._assignee = urwid.LineBox(urwid.Edit(), 'Assigned To (Launchpad ID)')
         self._tags = urwid.LineBox(urwid.Edit(), 'Tags')
-        self.cb_checkbox = urwid.CheckBox('Attach most recent Checkbox session (if any)')
-        self._options = urwid.LineBox(self.cb_checkbox, 'Options')
         status_list = urwid.LineBox(urwid.Pile(self._status), 'Status')
         importance_list = urwid.LineBox(urwid.Pile(self._importance), 'Importance')
+        bug_types_list = urwid.LineBox(urwid.Pile(self._bug_type), 'Bug Type')
         self.message = urwid.Text('')
         self.footer = urwid.AttrMap(urwid.Text(self.footer_text), 'foot')
         self.pile = urwid.Pile([self.message,
@@ -68,13 +90,28 @@ class ReportScreen:
                                 importance_list, 
                                 self._assignee, 
                                 self._tags,
-                                self._options])
+                                bug_types_list])
         self.view = urwid.Frame(urwid.Filler(self.pile, 'top'), footer=self.footer)
 
+    def add_tag(self, rb, state):
+        if state:
+            # for the selected radio button
+            tag = self.bug_types[rb.label]
+            self._tags.base_widget.edit_text += ' ' + tag
+        else:
+            # for the previously selected radio button
+            tag = self.bug_types[rb.label]
+            self._tags.base_widget.edit_text = self._tags.base_widget.edit_text.replace(tag, '')
+        # clean up the list of tags to remove unwanted white spaces
+        self._tags.base_widget.edit_text = " ".join(self._tags.base_widget.edit_text.split())
+
     def run(self):
         """Run the urwid MainLoop."""
-        self.loop = urwid.MainLoop(
-            self.view, self.palette, unhandled_input=self.unhandled_input)
+        self.loop = urwid.MainLoop(self.view,
+                                   self.palette,
+                                   handle_mouse=False,
+                                   unhandled_input=self.unhandled_input
+                                  )
         self.loop.run()
 
     def unhandled_input(self, key):
@@ -83,15 +120,20 @@ class ReportScreen:
                 sys.exit(0)
             if key == 'meta enter':
                 raise urwid.ExitMainLoop()
+            if key == 'page down':
+                self.loop.process_input(['down' for _ in range(5)])
+            if key == 'page up':
+                self.loop.process_input(['up' for _ in range(5)])
 
     def report(self):
-        options = {'include_checkbox_session': self.cb_checkbox.state}
+        tags = self._tags.base_widget.text
+        options = {'include_checkbox_session': 'checkbox' in tags}
         return BugReport(title=self._title.base_widget.text,
                          description=self._description.base_widget.text,
                          project=self._project.base_widget.text,
                          series=self._series.base_widget.text,
                          assignee=self._assignee.base_widget.text,
-                         tags=self._tags.base_widget.text,
+                         tags=tags,
                          status=[rb.label for rb in self._status if rb.state][0],
                          importance=[rb.label for rb in self._importance if rb.state][0],
                          options=options
diff --git a/setup.py b/setup.py
index 865cee9..db9e1e5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,23 +1,30 @@
 #!/usr/bin/env python
-
+import os
+from codecs import open
 from setuptools import setup
 
-package_name = 'qabro'
+packages = ['qabro']
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+about = {}
+with open(os.path.join(here, 'qabro', '__version__.py'), 'r', 'utf-8') as f:
+    exec(f.read(), about)
 
 setup(
-    name=package_name,
-    version='0.2',
-    description="Report bug information with attachments in Launchpad",
+    name=about['__title__'],
+    version=about['__version__'],
+    description=about['__description__'],
     long_description="""
 qabro is a tool to report bugs against Launchpad projects and
 automatically attach relevent information to them (log files).
 """,
-    packages=[package_name],
+    packages=packages,
     entry_points={
         'console_scripts': ['qabro = qabro.__init__:main']
     },
-    author="Pierre Equoy",
-    author_email="[e-mail]",
-    url='https://launchpad.net/qabro',
+    author=about['__author__'],
+    author_email=about['__author_email__'],
+    url=about['__url__'],
     license='License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
 )
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index cecdaa0..5e8e93e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: qabro
-version: '0.3'
+version: '0.4'
 summary: QA OEM bug reporting tool
 description: |
   Tool to generate a Launchpad bug report and attach useful logs (using