frodovdr/yavdr-ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add error handling for parse-edid call.

Browse Source 
If parse-edid can not parse the given edid, use "Unknown" for vendor
and model name.
This commit is contained in:
Alexander Grothe
2018-05-08 10:28:25 +02:00
parent 6724ddcc23
commit 70945dc97b
4 changed files with 490 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/xrandr_facts.py
View File

@@ -174,12 +174,17 @@ def parse_xrandr_verbose(iterator):
def parse_edid_data(edid):
vendor = "Unknown"
model = "Unknown"
data = subprocess.check_output("parse-edid < {}".format(edid), shell=True, universal_newlines=True)
for line in data.splitlines():
if "VendorName" in line:
vendor = line.strip().split('"')[1]
if "ModelName" in line:
model = line.strip().split('"')[1]
try:
data = subprocess.check_output("parse-edid < {}".format(edid),
shell=True, universal_newlines=True)
except subprocess.CalledProcessError:
pass
else:
for line in data.splitlines():
if "VendorName" in line:
vendor = line.strip().split('"')[1]
if "ModelName" in line:
model = line.strip().split('"')[1]
return vendor, model
def collect_nvidia_data():