Attachment 601561 Details for Bug 843608 – procDeviceDetector patch for check /proc/bus/input for devices

[patch] procDeviceDetector patch for check /proc/bus/input for devices

procDeviceDetector.patch (text/plain), 2.03 KB, created by Greg Nichols on 2012-07-31 18:27:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-07-31 18:27:38 UTC

Size: 2.03 KB

patch

obsolete

>Index: procDeviceDetector.py
>===================================================================
>--- procDeviceDetector.py	(revision 1160)
>+++ procDeviceDetector.py	(working copy)
>@@ -11,22 +11,25 @@
> 
> class ProcDeviceDetector(DeviceDetector):
>     "A class for detecting devices via the /proc file system"
>+    # some well-known paths into proc
>+    inputBusPath = "/proc/bus/input/devices"
>     
>-    def __init__(self):
>+    def __init__(self, path=None):
>         DeviceDetector.__init__(self, name=Constants.proc)
>-        self.usbPath = "/proc/bus/usb/devices"
>         self.nextKey = None
>+        self.devices = None
>+        
>+    def loadDevices(self, path):
>+        self.path = path
>+        self.devices = list()
>         self.__loadDevices()
>+        return self.devices
>         
>     def __loadDevices(self):
>-        self.devices = list()
>-        self.__loadUsbDevices()
>-        
>-    def __loadUsbDevices(self):        
>         # treat the file as a bunch of attrubute=value strings
>-        # sepearated by blank lines for each device
>+        # seperated by blank lines for each device
>         try:
>-            pipe = Command("cat " + self.usbPath)
>+            pipe = Command("cat " + self.path)
>             pipe.start()
>             properties = dict()
>             while 1:
>@@ -83,12 +86,18 @@
>                 
>             
>     def getDevices(self):
>-        self.__loadDevices()
>         return self.devices
>+    
>+    def getDevice(self, udi):
>+        if self.devices:
>+            for device in self.devices:
>+                if device.hasPropertyValue(udi):
>+                    return device
>+        # otherwise 
>+        return None
>             
>         
>     def dump(self):
>-        self.__loadDevices()
>         for device in self.devices:
>             print device.getProperties()
>             
>@@ -124,5 +133,6 @@
>         
> 
> if __name__ == "__main__":
>-    detector=ProcDeviceDetector("/proc/bus/usb/devices")
>+    detector=ProcDeviceDetector()
>+    detector.loadDevices("/proc/bus/input/devices")
>     print detector.dump()

Actions: View | Diff

Attachments on bug 843608: 601561 | 601562