find more internal connectors

[lilass.git] / dsl.py

diff --git a/dsl.py b/dsl.py
index 606809cd9d7e80b99776152d5d7070d72d58cbfa..2b677bf4fd44456af3de9be81e67c467a460f061 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -21,7 +21,8 @@ from gui import getFrontend
 frontend = getFrontend("cli") # the fallback, until we got a proper frontend. This is guaranteed to be available.
 
 # for auto-config: common names of internal connectors
 frontend = getFrontend("cli") # the fallback, until we got a proper frontend. This is guaranteed to be available.
 
 # for auto-config: common names of internal connectors

-commonInternalConnectorNames = ['LVDS', 'LVDS0', 'LVDS1', 'LVDS-0', 'LVDS-1']
+commonInternalConnectorPrefixes = ['LVDS', 'eDP']
+commonInternalConnectorSuffices = ['', '0', '1', '-0', '-1']

 
 # this is as close as one can get to an enum in Python
 class RelativeScreenPosition:
 
 # this is as close as one can get to an enum in Python
 class RelativeScreenPosition:


@@ -92,6 +93,12 @@ def loadConfigFile(filename):
     # add some convencience get functions
     return result
 
     # add some convencience get functions
     return result
 

+# iterator yielding common names of internal connectors
+def commonInternalConnectorNames():
+    for prefix in commonInternalConnectorPrefixes:
+        for suffix in commonInternalConnectorSuffices:
+            yield prefix+suffix
+

 # helper function: execute a process, return output as iterator, throw exception if there was an error
 # you *must* iterate to the end if you use this!
 def processOutputGen(*args):
 # helper function: execute a process, return output as iterator, throw exception if there was an error
 # you *must* iterate to the end if you use this!
 def processOutputGen(*args):


@@ -171,7 +178,7 @@ def classifyConnectors(allConnectors):
             raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector)
     else:
         # auto-config
             raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector)
     else:
         # auto-config

-        internalConnector = findAvailableConnector(commonInternalConnectorNames, allConnectors)
+        internalConnector = findAvailableConnector(commonInternalConnectorNames(), allConnectors)

         if internalConnector is None:
             raise Exception("Could not automatically find internal connector, please use ~/.dsl.conf to specify it manually.")
     # all the rest is external then, obviously - unless the user wants to do that manually
         if internalConnector is None:
             raise Exception("Could not automatically find internal connector, please use ~/.dsl.conf to specify it manually.")
     # all the rest is external then, obviously - unless the user wants to do that manually


@@ -192,23 +199,22 @@ def classifyConnectors(allConnectors):
 
 # if we run top-level
 if __name__ == "__main__":
 
 # if we run top-level
 if __name__ == "__main__":

+    # parse command-line arguments
+    parser = argparse.ArgumentParser(description='easy Display Setup for Laptops')
+    parser.add_argument("-f", "--frontend",
+                        dest="frontend",
+                        help="The frontend to be used for user interaction")
+    parser.add_argument("-r", "--relative-position",
+                        dest="rel_position", choices=RelativeScreenPosition.__names__.keys(),
+                        help="Position of external screen relative to internal one")
+    parser.add_argument("-i", "--internal-only",
+                        dest="internal_only", action='store_true',
+                        help="Enable internal screen, disable all the others (as if no external screen was connected")
+    cmdArgs = parser.parse_args()
+    
+    # load frontend
+    frontend = getFrontend(cmdArgs.frontend)

     try:
     try:

-        # parse command-line arguments
-        parser = argparse.ArgumentParser(description='easy Display Setup for Laptops')
-        parser.add_argument("-f", "--frontend",
-                            dest="frontend",
-                            help="The frontend to be used for user interaction")
-        parser.add_argument("-r", "--relative-position",
-                            dest="rel_position", choices=RelativeScreenPosition.__names__.keys(),
-                            help="Position of external screen relative to internal one")
-        parser.add_argument("-i", "--internal-only",
-                            dest="internal_only", action='store_true',
-                            help="Enable internal screen, disable all the others (as if no external screen was connected")
-        cmdArgs = parser.parse_args()
-        
-        # load frontend
-        frontend = getFrontend(cmdArgs.frontend)
-        

         # load connectors and classify them
         connectors = getXrandrInformation()
         (internalConnector, externalConnectors) = classifyConnectors(connectors)
         # load connectors and classify them
         connectors = getXrandrInformation()
         (internalConnector, externalConnectors) = classifyConnectors(connectors)


@@ -219,7 +225,6 @@ if __name__ == "__main__":
             connectorArgs[c] = ["--off"]
         
         # check whether we got an external screen or not
             connectorArgs[c] = ["--off"]
         
         # check whether we got an external screen or not

-        # Check what to do

         usedExternalConnector = findAvailableConnector(externalConnectors, connectors) # *the* external connector which is actually used
         hasExternal = not cmdArgs.internal_only and usedExternalConnector is not None
         if hasExternal:
         usedExternalConnector = findAvailableConnector(externalConnectors, connectors) # *the* external connector which is actually used
         hasExternal = not cmdArgs.internal_only and usedExternalConnector is not None
         if hasExternal:


@@ -253,9 +258,12 @@ if __name__ == "__main__":
         
         # make sure the internal screen is really, *really* turned on if there is no external screen
         if not hasExternal:
         
         # make sure the internal screen is really, *really* turned on if there is no external screen
         if not hasExternal:

-            backlight = float(subprocess.check_output(["xbacklight", "-get"]).strip())
-            if backlight == 0: # it's completely turned off, we better enable it
-                subprocess.check_call(["xbacklight", "-set", "100"])
+            try:
+                backlight = float(subprocess.check_output(["xbacklight", "-get"]).strip())
+                if backlight == 0: # it's completely turned off, we better enable it
+                    subprocess.check_call(["xbacklight", "-set", "100"])
+            except FileNotFoundError:
+                print("xbacklight has not been found, unable to turn your laptop backlight on.")

     except Exception as e:
         frontend.error(str(e))
         raise
     except Exception as e:
         frontend.error(str(e))
         raise