refactor #2

zorg/zorg/config.py

@@ -4,7 +4,7 @@ import os
 
 import piksemel
 
-from zorg.consts import *
+from zorg import consts
 from zorg.parser import *
 from zorg.probe import VideoDevice, Monitor
 from zorg.utils import *
@@ -12,11 +12,11 @@ from zorg.utils import *
 def saveXorgConfig(card):
     parser = XorgParser()
 
-    secModule = XorgSection("Module")
-    secFlags = XorgSection("ServerFlags")
-    secDevice = XorgSection("Device")
-    secScr = XorgSection("Screen")
-    secLay = XorgSection("ServerLayout")
+    secModule   = XorgSection("Module")
+    secFlags    = XorgSection("ServerFlags")
+    secDevice   = XorgSection("Device")
+    secScr      = XorgSection("Screen")
+    secLay      = XorgSection("ServerLayout")
 
     parser.sections = [
         secModule,
@@ -106,9 +106,9 @@ def saveXorgConfig(card):
         secLay.set("Identifier", "Layout")
         secLay.set("Screen", "Screen")
 
-    backup(xorgConf)
+    backup(consts.xorg_conf_file)
 
-    f = open(xorgConf, "w")
+    f = open(consts.xorg_conf_file, "w")
     f.write(parser.toString())
     f.close()
 
@@ -117,10 +117,10 @@ def addTag(p, name, data):
     t.insertData(data)
 
 def getDeviceInfo(busId):
-    if not os.path.exists(config_file):
+    if not os.path.exists(consts.config_file):
         return
 
-    doc = piksemel.parse(config_file)
+    doc = piksemel.parse(consts.config_file)
 
     cardTag = None
     for tag in doc.tags("Card"):
@@ -205,11 +205,11 @@ def getDeviceInfo(busId):
     return device
 
 def saveDeviceInfo(card):
-    if not os.path.exists(config_dir):
-        os.mkdir(config_dir, 0755)
+    if not os.path.exists(consts.config_dir):
+        os.mkdir(consts.config_dir, 0755)
 
     try:
-        doc = piksemel.parse(config_file)
+        doc = piksemel.parse(consts.config_file)
     except OSError:
         doc = piksemel.newDocument("ZORG")
 
@@ -275,10 +275,10 @@ def saveDeviceInfo(card):
             if card.monitors.has_key(outName):
                 addMonitor(outName, "SecondMonitor")
 
-    f = open(config_file, "w")
+    f = open(consts.config_file, "w")
     f.write(doc.toPrettyString().replace("\n\n", ""))
 
-    f = open(configured_bus_file, "w")
+    f = open(consts.configured_bus_file, "w")
     f.write(info["bus-id"])
 
 def getKeymap():
@@ -286,7 +286,7 @@ def getKeymap():
     variant = "basic"
 
     try:
-        doc = piksemel.parse(config_file)
+        doc = piksemel.parse(consts.config_file)
 
         keyboard = doc.getTag("Keyboard")
         if keyboard:
@@ -319,11 +319,11 @@ def getKeymap():
     return layout, variant
 
 def saveKeymap(layout, variant="basic"):
-    if not os.path.exists(config_dir):
-        os.mkdir(config_dir, 0755)
+    if not os.path.exists(consts.config_dir):
+        os.mkdir(consts.config_dir, 0755)
 
     try:
-        doc = piksemel.parse(config_file)
+        doc = piksemel.parse(consts.config_file)
     except OSError:
         doc = piksemel.newDocument("ZORG")
 
@@ -336,4 +336,5 @@ def saveKeymap(layout, variant="basic"):
     keyboardTag.insertTag("Layout").insertData(layout)
     keyboardTag.insertTag("Variant").insertData(variant)
 
-    file(config_file, "w").write(doc.toPrettyString().replace("\n\n", ""))
+    f = file(consts.config_file, "w")
+    f.write(doc.toPrettyString().replace("\n\n", ""))

zorg/zorg/consts.py

@@ -15,6 +15,4 @@ monitors_file       = join(data_dir,    "MonitorsDB")
 xkb_symbols_dir     = join(data_dir,    "xkb/symbols")
 drivers_dir         = join(modules_dir, "drivers")
 
-sysdir = "/sys/bus/pci/devices/"
-
 package_sep = "/"

zorg/zorg/hwdata.py

 # -*- coding: utf-8 -*-
 
 import zorg.probe
-from zorg.consts import *
+from zorg import consts
 from zorg.utils import *
 
 drivers = {
@@ -69,7 +69,7 @@ drivers = {
 def getCompatibleDriverNames(vendor_id, product_id):
     pci_id = vendor_id + product_id
     drvlist = []
-    for line in loadFile(drivers_file):
+    for line in loadFile(consts.drivers_file):
         if line.startswith(pci_id):
             drvlist = line.rstrip("\n").split(" ")[1:]
             break
@@ -88,14 +88,14 @@ def getAvailableDriverNames():
     availableDrivers = zorg.probe.listAvailableDrivers()
     availablePackages = zorg.probe.listDriverPackages()
 
-    packages = [x.split(package_sep) for x in drivers.keys() if package_sep in x]
+    packages = [x.split(consts.package_sep) for x in drivers.keys() if consts.package_sep in x]
 
     for d in availableDrivers:
         drvlist.append(d)
 
     for drv, pkg in packages:
         if pkg.replace("-", "_") in availablePackages:
-            d = drv + package_sep + pkg
+            d = drv + consts.package_sep + pkg
             drvlist.append(d)
             if drv in drvlist:
                 drvlist.remove(drv)
@@ -107,7 +107,7 @@ def getMonitorInfos():
     vendorList = {}
     vendor = []
 
-    for line in loadFile(monitors_file):
+    for line in loadFile(consts.monitors_file):
         monitor = line.split(";")
 
         if len(monitor) == 5:

zorg/zorg/probe.py

@@ -6,10 +6,12 @@ import glob
 import struct
 import fnmatch
 
-from zorg.consts import *
+from zorg import consts
 from zorg.parser import *
 from zorg.utils import *
 
+sysdir = "/sys/bus/pci/devices/"
+
 # from pci/header.h
 PCI_COMMAND             = 0x04
 PCI_COMMAND_IO          = 0x1
@@ -99,15 +101,15 @@ class VideoDevice:
                 self.driver = "fbdev"
             return
 
-        for line in loadFile(drivers_file):
+        for line in loadFile(consts.drivers_file):
             if line.startswith(self.vendor_id + self.product_id):
                 print "Device ID found in driver database."
 
                 driverlist = line.rstrip("\n").split(" ")[1:]
 
                 for drv in driverlist:
-                    if package_sep in drv:
-                        drvname, drvpackage = drv.split(package_sep, 1)
+                    if consts.package_sep in drv:
+                        drvname, drvpackage = drv.split(consts.package_sep, 1)
                         if drvpackage.replace("-", "_") in self._driverPackages():
                             self.driver = drvname
                             self.package = drvpackage
@@ -140,8 +142,8 @@ class VideoDevice:
         self.package = None
 
         if withDriver:
-            if package_sep in withDriver:
-                drvname, drvpackage = withDriver.split(package_sep, 1)
+            if consts.package_sep in withDriver:
+                drvname, drvpackage = withDriver.split(consts.package_sep, 1)
                 if drvpackage.replace("-", "_") in self._driverPackages():
                     self.driver = drvname
                     self.package = drvpackage
@@ -231,12 +233,12 @@ def call(package, model, method, *args):
     return cmethod(timeout=2**16-1, *args)
 
 def getKeymapList():
-    return os.listdir(xkb_symbols_dir)
+    return os.listdir(consts.xkb_symbols_dir)
 
 def driverExists(name):
-    return os.path.exists(os.path.join(drivers_dir, "%s_drv.so" % name))
+    return os.path.exists(os.path.join(consts.drivers_dir, "%s_drv.so" % name))
 
-def listAvailableDrivers(d = drivers_dir):
+def listAvailableDrivers(d = consts.drivers_dir):
     a = []
     if os.path.exists(d):
         for drv in os.listdir(d):