Merge ~sylvain-pineau/plainbox-provider-resource:udev_resource_short_list_option into plainbox-provider-resource:master

[Sylvain Pineau]

Add a short option to just list the devices (w/o) the category prefix title, e.g:

$ ./udev_resource -l CAPTURE -s
046d HD Pro Webcam C920 [046d:082d]
SunplusIT Inc Integrated IR Camera: Integrate [04f2:b615]
Chicony Electronics Co.,Ltd. Integrated Camera: Integrated C [04f2:b614]

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/bin/udev_resource b/bin/udev_resource
index 17dd8a7..fdb57ff 100755
--- a/bin/udev_resource
+++ b/bin/udev_resource
@@ -55,14 +55,18 @@ class UdevResultLister:
         for c in categories:
             self._data[c] = []
 
-    def display(self):
+    def display(self, short=False):
         if not self._devices:
             return 1
         for c, devices in self._data.items():
-            print("{} ({}):".format(c, len(devices)))
-            for d in devices:
-                print(" - {}".format(d))
-            print()
+            if short:
+                for d in devices:
+                    print("{}".format(d.replace('None ', '').replace(' None', '')))
+            else:
+                print("{} ({}):".format(c, len(devices)))
+                for d in devices:
+                    print(" - {}".format(d))
+                print()
 
     def filter(self):
         if not self._devices:
@@ -80,7 +84,11 @@ class UdevResultLister:
             self._devices.append(device)
             p = getattr(device, "product", "Unknow product")
             v = getattr(device, "vendor", "Unknow vendor")
-            self._data[c].append("{} {}".format(v, p))
+            vid = device.vendor_id if device.vendor_id else 0
+            pid = device.product_id if device.product_id else 0
+            if not p:
+                p = getattr(device, "interface", "Unknow product")
+            self._data[c].append("{} {} [{:04x}:{:04x}]".format(v, p, vid, pid))
 
 
 def main():
@@ -105,6 +113,7 @@ def main():
                         categories.
                         Acceptable categories to list are: 
                         {}""".format(', '.join(categories)))
+    parser.add_argument('-s', '--short', action='store_true')
     args = parser.parse_args()
     try:
         output = check_output(shlex.split(args.command))
@@ -122,7 +131,7 @@ def main():
     if args.list:
         result = UdevResultLister(args.list)
         udev.run(result)
-        return result.display()
+        return result.display(args.short)
     elif args.filter:
         result = UdevResultLister(args.filter)
         udev.run(result)