]> git.ipfire.org Git - ipfire.org.git/commitdiff
Ship local copy of hwdata module
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 Dec 2018 15:29:07 +0000 (15:29 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 Dec 2018 15:30:46 +0000 (15:30 +0000)
This is not really available over PIP

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am
requirements.txt
src/backend/fireinfo.py
src/backend/hwdata.py [new file with mode: 0644]
src/web/fireinfo.py

index d96b35b3e802739e5dfba2be766acb72502da38c..2cac0644902f9d0652fb3ed56a523ace0d407a49 100644 (file)
@@ -56,6 +56,7 @@ backend_PYTHON = \
        src/backend/decorators.py \
        src/backend/fireinfo.py \
        src/backend/geoip.py \
        src/backend/decorators.py \
        src/backend/fireinfo.py \
        src/backend/geoip.py \
+       src/backend/hwdata.py \
        src/backend/iuse.py \
        src/backend/memcached.py \
        src/backend/mirrors.py \
        src/backend/iuse.py \
        src/backend/memcached.py \
        src/backend/mirrors.py \
index da6d09eeeb4ebede217b8fb7d8b9925dee0d9b32..cab22856e3246d2e216b63f51c3a794a212225fc 100644 (file)
@@ -10,7 +10,6 @@ idna==2.7
 iso3166==0.9
 ldap3==2.5.1
 markdown2==2.3.6
 iso3166==0.9
 ldap3==2.5.1
 markdown2==2.3.6
-pciutils==2.3.7
 phonenumbers==8.9.15
 Pillow==5.3.0
 psycopg2-binary==2.7.5
 phonenumbers==8.9.15
 Pillow==5.3.0
 psycopg2-binary==2.7.5
index b14edd919a9efc8ec173a665e4ec7dcaa4aa18e2..4ca5c935e115647669913825b745b6710103d909 100644 (file)
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
 import datetime
 #!/usr/bin/python
 
 import datetime
-import hwdata
 import iso3166
 import logging
 import re
 
 from . import database
 import iso3166
 import logging
 import re
 
 from . import database
+from . import hwdata
 from . import util
 from .misc import Object
 
 from . import util
 from .misc import Object
 
diff --git a/src/backend/hwdata.py b/src/backend/hwdata.py
new file mode 100644 (file)
index 0000000..24a31c9
--- /dev/null
@@ -0,0 +1,223 @@
+#
+# Copyright (c) 1999--2012 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+
+""" Query hwdata database and return decription of vendor and/or device. """
+
+# pylint: disable=misplaced-bare-raise
+
+class USB(object):
+    """ Interace to usb.ids from hwdata package """
+    filename = '/usr/share/hwdata/usb.ids'
+    devices = None
+
+    def __init__(self, filename=None):
+        """ Load pci.ids from file to internal data structure.
+            parameter 'filename' can specify location of this file
+        """
+        if filename:
+            self.filename = filename
+        else:
+            self.filename = USB.filename
+        self.cache = 1
+
+        if self.cache and not USB.devices:
+            # parse usb.ids
+            USB.devices = {}
+            try:
+                f = open(self.filename, encoding='ISO8859-1')
+            except IOError:
+                return
+            lineno = 0
+            vendor = None
+            device = None
+            for line in f.readlines():
+                lineno += 1
+                l = line.split()
+                if line.startswith('#'):
+                    if line.startswith('# List of known device classes, subclasses and protocols'):
+                        break # end of database of devices, rest is protocols, types etc.
+                    else:
+                        continue
+                elif len(l) == 0:
+                    continue
+                elif line.startswith('\t\t'):
+                    interface_id = l[0].lower()
+                    if len(l) > 2:
+                        interface_name = ' '.join(l[1:])
+                    else:
+                        interface_name = ''
+                    try:
+                        USB.devices[vendor][1][device][0][interface_id] = interface_name
+                    except TypeError:
+                        sys.stderr.write("Unknown line at line {0} in {1}.\n".format(lineno, self.filename))
+                elif line.startswith('\t'):
+                    device = l[0].lower()
+                    device_name = ' '.join(l[1:])
+                    USB.devices[vendor][1][device] = [device_name, {}]
+                else:
+                    vendor = l[0].lower()
+                    vendor_name = ' '.join(l[1:])
+                    if vendor not in USB.devices:
+                        USB.devices[vendor] = [vendor_name, {}]
+                    else: # this should not happen
+                        USB.devices[vendor][0] = vendor_name
+
+    def get_vendor(self, vendor):
+        """ Return description of vendor. Parameter is two byte code in hexa.
+            If vendor is unknown None is returned.
+        """
+        vendor = vendor.lower()
+        if self.cache:
+            if vendor in USB.devices:
+                return USB.devices[vendor][0]
+            else:
+                return None
+        else:
+            raise # not implemented yet
+
+    def get_device(self, vendor, device):
+        """ Return description of device. Parameters are two byte code variables in hexa.
+            If device is unknown None is returned.
+        """
+        vendor = vendor.lower()
+        device = device.lower()
+        if self.cache:
+            if vendor in USB.devices:
+                if device in USB.devices[vendor][1]:
+                    return USB.devices[vendor][1][device][0]
+                else:
+                    return None
+            else:
+                return None
+        else:
+            raise # not implemented yet
+
+class PCI(object):
+    """ Interace to pci.ids from hwdata package """
+    filename = '/usr/share/hwdata/pci.ids'
+    devices = None
+
+    def __init__(self, filename=None):
+        """ Load pci.ids from file to internal data structure.
+            parameter 'filename' can specify location of this file
+        """
+        if filename:
+            self.filename = filename
+        else:
+            self.filename = PCI.filename
+        self.cache = 1
+
+        if self.cache and not PCI.devices:
+            # parse pci.ids
+            PCI.devices = {}
+            try:
+                f = open(self.filename, encoding='ISO8859-1')
+            except IOError:
+                return
+            vendor = None
+            for line in f.readlines():
+                l = line.split()
+                if line.startswith('#'):
+                    continue
+                elif len(l) == 0:
+                    continue
+                elif line.startswith('\t\t'):
+                    continue
+                elif line.startswith('\t'):
+                    device = l[0].lower()
+                    device_name = ' '.join(l[1:])
+                    PCI.devices[vendor][1][device] = device_name
+                else:
+                    vendor = l[0].lower()
+                    vendor_name = ' '.join(l[1:])
+                    if not vendor in  list(PCI.devices.keys()):
+                        PCI.devices[vendor] = [vendor_name, {}]
+                    else: # this should not happen
+                        PCI.devices[vendor][0] = vendor_name
+
+    def get_vendor(self, vendor):
+        """ Return description of vendor. Parameter is two byte code in hexa.
+            If vendor is unknown None is returned.
+        """
+        vendor = vendor.lower()
+        if self.cache:
+            if vendor in list(PCI.devices.keys()):
+                return PCI.devices[vendor][0]
+            else:
+                return None
+        else:
+            raise # not implemented yet
+
+    def get_device(self, vendor, device):
+        """ Return description of device. Parameters are two byte code variables in hexa.
+            If device is unknown None is returned.
+        """
+        vendor = vendor.lower()
+        device = device.lower()
+        if self.cache:
+            if vendor in list(PCI.devices.keys()):
+                if device in list(PCI.devices[vendor][1].keys()):
+                    return PCI.devices[vendor][1][device]
+                else:
+                    return None
+            else:
+                return None
+        else:
+            raise # not implemented yet
+
+class PNP(object):
+    """ Interace to pnp.ids from hwdata package """
+    filename = '/usr/share/hwdata/pnp.ids'
+    VENDORS = None
+
+    def __init__(self, filename=None):
+        """ Load pnp.ids from file to internal data structure.
+            parameter 'filename' can specify location of this file
+        """
+        if filename:
+            self.filename = filename
+        else:
+            self.filename = PNP.filename
+        self.cache = 1
+
+        if self.cache and not PNP.VENDORS:
+            # parse pnp.ids
+            PNP.VENDORS = {}
+            try:
+                f = open(self.filename, encoding='ISO8859-1')
+            except IOError:
+                return
+            for line in f.readlines():
+                l = line.split()
+                if line.startswith('#'):
+                    continue
+                elif len(l) == 0:
+                    continue
+                else:
+                    vendor_id = l[0].upper()
+                    PNP.VENDORS[vendor_id] = ' '.join(l[1:])
+
+    def get_vendor(self, vendor_id):
+        """ Return description of vendor. Parameter is 3 character long id of vendor.
+            If vendor is unknown None is returned.
+        """
+        vendor_id = vendor_id.upper()
+        if self.cache:
+            if vendor_id in list(PNP.VENDORS.keys()):
+                return PNP.VENDORS[vendor_id]
+            else:
+                return None
+        else:
+            raise # not implemented yet
index cbb1518da0ac19aac9153c38e607094029e53508..60fe3c638c4bbdbf3e65c200861ec3165eb40237 100644 (file)
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
 import datetime
 #!/usr/bin/python
 
 import datetime
-import hwdata
 import logging
 import re
 import json
 import logging
 import re
 import json