From a56981281ce4fb1a3a81eb3edd48e430b6902706 Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Wed, 18 Jan 2017 14:02:05 +0100 Subject: [PATCH] Accept comments in config/setup files Comments are lines starting with "#" - in the hope that no screen name or xrandr option will ever start with a hash sign. Fixes #50. --- README.md | 2 ++ autorandr.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5705284..b20d47e 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,8 @@ The most useful one is `$AUTORANDR_CURRENT_PROFILE`. ## Changelog +* *2017-01-18* Accept comments (lines starting with `#`) in config/setup files + **autorandr 1.0** * *2016-12-07* Tag the current code as version 1.0.0; see github issue #54 diff --git a/autorandr.py b/autorandr.py index f62ad07..a47282f 100755 --- a/autorandr.py +++ b/autorandr.py @@ -345,6 +345,8 @@ class XrandrOutput(object): for line in configuration.split("\n"): if line: line = line.split(None, 1) + if line and line[0].startswith("#"): + continue options[line[0]] = line[1] if len(line) > 1 else None edid = None @@ -464,7 +466,7 @@ def load_profiles(profile_path): if not os.path.isfile(config_name) or not os.path.isfile(setup_name): continue - edids = dict([ x.strip().split() for x in open(setup_name).readlines() if x.strip() ]) + edids = dict([ x.split() for x in (y.strip() for y in open(setup_name).readlines()) if x and x[0] != "#" ]) config = {} buffer = [] -- 2.39.2