fix flake8; add mosquitto2mqtt script

This commit is contained in:
Robert Kaussow 2018-11-11 02:36:52 +01:00
parent 58ed9c0bc2
commit 9cd52d248f
3 changed files with 60 additions and 5 deletions

8
jdk.py
View File

@ -15,7 +15,8 @@ def fetch_java_version():
args = cmd.split(" ")
try:
proc = subprocess.check_output(args, stderr=subprocess.STDOUT, universal_newlines=True)
proc = subprocess.check_output(
args, stderr=subprocess.STDOUT, universal_newlines=True)
proc = proc.splitlines()
for line in proc:
lines.append(line.rstrip())
@ -36,7 +37,8 @@ def get_vendor_version():
exp_zulu = re.compile(r"zulu (\d+(\.\d+){1,})")
vendor = "zulu"
version = "%s-jdk%s" % (exp_zulu.search(line).group(1), exp_jdk.search(line).group())
version = "%s-jdk%s" % (exp_zulu.search(line).group(1),
exp_jdk.search(line).group())
else:
exp = re.compile(r"(\d+(\.\d+){1,})")
version = exp.search(line).group()
@ -52,7 +54,7 @@ def main():
result.update(vendor=vendor)
result.update(version=version)
result.update(error=False)
except OSError as e:
except OSError:
result.update(vendor="nobody")
result.update(version="0.0.0")
result.update(error=False)

View File

@ -15,7 +15,8 @@ def fetch_nodejs_version():
args = cmd.split(" ")
try:
proc = subprocess.check_output(args, stderr=subprocess.STDOUT, universal_newlines=True)
proc = subprocess.check_output(
args, stderr=subprocess.STDOUT, universal_newlines=True)
proc = proc.splitlines()
for line in proc:
lines.append(line.rstrip())
@ -36,7 +37,7 @@ def main():
version = fetch_nodejs_version()
result.update(version=version)
result.update(error=False)
except OSError as e:
except OSError:
result.update(version="0.0.0")
result.update(error=False)
except Exception as e:

52
zigbee2mqtt.py Executable file
View File

@ -0,0 +1,52 @@
#!/usr/bin/env python2.7
# -*- coding: UTF-8 -*-
import re
import json
import subprocess
from collections import defaultdict
def fetch_zigbee2mqtt_version():
lines = []
cmd = "git describe --tags"
args = cmd.split(" ")
try:
proc = subprocess.check_output(
args, stderr=subprocess.STDOUT, universal_newlines=True,
cwd="/opt/zigbee2mqtt")
proc = proc.splitlines()
for line in proc:
lines.append(line.rstrip())
exp = re.compile(r"(\d+(\.\d+){1,})")
version = exp.search(lines[0]).group()
except Exception:
raise
return version
def main():
result = defaultdict(dict)
try:
version = fetch_zigbee2mqtt_version()
result.update(version=version)
result.update(error=False)
except OSError:
result.update(version="0.0.0")
result.update(error=False)
except Exception as e:
result.update(error=True)
result.update(message=str(e))
print(json.dumps(result))
if __name__ == "__main__":
main()