kellya/matrix-webhook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(formatter/buildbot): cleanup redundancy in logic

Browse source
This commit is contained in:
Alex Kelly 2022-01-11 22:22:20 -05:00
parent 97e10df1a2
commit 8c18c2054e
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
matrix_webhook/formatters/buildbot.py
View file

@ -9,33 +9,26 @@ def formatter(data, headers):
reason = data["buildset"]["reason"] reason = data["buildset"]["reason"]
project = data["properties"]["project"][0] project = data["properties"]["project"][0]
submittime = datetime.fromtimestamp(data["buildset"]["submitted_at"]) submittime = datetime.fromtimestamp(data["buildset"]["submitted_at"])
# This could use some optimization, but it works for now. try:
if buildstate == "starting": if buildstate == "starting":
try:
data["body"] = ( data["body"] = (
f"###Buildbot job #{buildid} for {project} - {buildstate}\n\n" f"###Buildbot job #{buildid} for {project} - {buildstate}\n\n"
f"{reason}\n\n" f"{reason}\n\n"
f"**started at** {submittime}\n\n" f"**started at** {submittime}\n\n"
f"[view details]({buildlink})" f"[view details]({buildlink})"
) )
except Exception as error: elif buildstate == "build successful":
print(error)
elif buildstate == "build successful":
try:
data["body"] = ( data["body"] = (
f"###Buildbot job #{buildid} for {project} - {buildstate}\n\n" f"###Buildbot job #{buildid} for {project} - {buildstate}\n\n"
f"**completed at** {datetime.fromtimestamp(data['complete_at'])}\n\n" f"**completed at** {datetime.fromtimestamp(data['complete_at'])}\n\n"
f"[view details]({buildlink})" f"[view details]({buildlink})"
) )
except Exception as error: else:
print(error)
else:
try:
data["body"] = ( data["body"] = (
f"###Buildbot job #{buildid} for {project} - {buildstate}\n\n" f"###Buildbot job #{buildid} for {project} - {buildstate}\n\n"
f"[view details]({buildlink})" f"[view details]({buildlink})"
) )
except Exception as error: except Exception as error:
print(error) print(error)
return data return data