factor event code resolving out into evdev.util

gvalkov · gvalkov · commit 2b25e798f4ee · 2012-08-19T13:58:21.000+03:00
diff --git a/evdev/device.py b/evdev/device.py
@@ -2,7 +2,7 @@
 
 import os
 
-from evdev import _input, ecodes
+from evdev import _input, ecodes, util
 from evdev.events import InputEvent
 
 
@@ -81,23 +81,7 @@ def capabilities(self, verbose=False):
         '''
 
         if verbose:
-            cap = {}
-            for type, codes in self._capabilities.items():
-                type_name = ecodes.EV[type]
-
-                # ecodes.keys are a combination of KEY_ and BTN_ codes
-                if type == ecodes.EV_KEY:
-                    code_names = ecodes.keys
-                else:
-                    code_names = getattr(ecodes, type_name.split('_')[-1])
-
-                codes_res = []
-                for i in codes:
-                    l = [(code_names[i], i) if i in code_names else ('?', i)]
-                    codes_res.append(l)
-
-                cap[(type_name, type)] = codes_res
-            return cap
+            return dict(util.resolve_ecodes(self._capabilities))
         else:
             return self._capabilities
 
diff --git a/evdev/util.py b/evdev/util.py
@@ -4,6 +4,7 @@
 import stat
 import glob
 
+from evdev import ecodes
 from evdev.events import event_factory
 
 
@@ -47,4 +48,30 @@ def categorize(event):
         return event
 
 
-__all__ = list_devices, is_device, categorize
+def resolve_ecodes(typecodemap, unknown='?'):
+    '''
+    Resolve event codes and types to their verbose names:
+    {            1  : [272, 273, 274] } =>
+    { ('EV_KEY', 1) : [('BTN_MOUSE', 272),
+                       ('BTN_RIGHT', 273),
+                       ('BTN_MIDDLE', 273)] }
+    '''
+
+    for type, codes in typecodemap.items():
+        type_name = ecodes.EV[type]
+
+        # ecodes.keys are a combination of KEY_ and BTN_ codes
+        if type == ecodes.EV_KEY:
+            code_names = ecodes.keys
+        else:
+            code_names = getattr(ecodes, type_name.split('_')[-1])
+
+        codes_res = []
+        for i in codes:
+            l = [(code_names[i], i) if i in code_names else (unknown, i)]
+            codes_res.append(l)
+
+        yield (type_name, type), codes_res
+
+
+__all__ = list_devices, is_device, categorize, resolve_ecodes
