Rework adl-submit.py so it can be used as a library

This commit is contained in:
Florent Fayolle 2018-11-08 21:23:28 +01:00
parent 68c8287d2f
commit 7c6fa54271

View File

@ -369,17 +369,12 @@ def SubmitEvent(event, testOutputFile):
finally: finally:
curl.close() curl.close()
def ensure_latest_version_is_used():
if (len(sys.argv) <= 1) or sys.argv[1] == "--help": # Check that we are running the latest version of the adl-submit
Usage() # script
contents = io.BytesIO()
(event, testOutputFile) = ParseOptions(sys.argv[1:]) curl = pycurl.Curl()
try:
# Check that we are running the latest version of the adl-submit
# script
contents = io.BytesIO()
curl = pycurl.Curl()
try:
curl.setopt(curl.WRITEDATA, contents) curl.setopt(curl.WRITEDATA, contents)
curl.setopt (curl.URL, baseUrl + './adl-submit-latest-version') curl.setopt (curl.URL, baseUrl + './adl-submit-latest-version')
curl.perform() curl.perform()
@ -389,8 +384,18 @@ try:
print("Votre script n'est plus à jour, merci de télécharger la nouvelle version à l'adresse") print("Votre script n'est plus à jour, merci de télécharger la nouvelle version à l'adresse")
print(("%sadl-submit.py") % baseUrl) print(("%sadl-submit.py") % baseUrl)
sys.exit(1) sys.exit(1)
finally: finally:
curl.close() curl.close()
SubmitEvent(event, testOutputFile)
if __name__ == "__main__":
if (len(sys.argv) <= 1) or sys.argv[1] == "--help":
Usage()
(event, testOutputFile) = ParseOptions(sys.argv[1:])
ensure_latest_version_is_used()
SubmitEvent(event, testOutputFile)