Merge branch 'master' into 'master'

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

See merge request agenda-libre/agenda-libre-ruby!20

public/adl-submit.py

@@ -369,28 +369,33 @@ def SubmitEvent(event, testOutputFile):
     finally:
         curl.close()
 
+def ensure_latest_version_is_used():
+    # 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.URL, baseUrl + './adl-submit-latest-version')
+        curl.perform()
+        if curl.getinfo(curl.HTTP_CODE) == 200:
+            contents = contents.getvalue().decode()
+            if float(contents) != float('3.5'):
+                print("Votre script n'est plus à jour, merci de télécharger la nouvelle version à l'adresse")
+                print(("%sadl-submit.py") % baseUrl)
+                sys.exit(1)
+    finally:
+        curl.close()
 
-if (len(sys.argv) <= 1) or sys.argv[1] == "--help":
-    Usage()
 
-(event, testOutputFile) = ParseOptions(sys.argv[1:])
 
-# Check that we are running the latest version of the adl-submit
+if __name__ == "__main__":
-# script
+    if (len(sys.argv) <= 1) or sys.argv[1] == "--help":
-contents = io.BytesIO()
+        Usage()
-curl = pycurl.Curl()
-try:
-    curl.setopt(curl.WRITEDATA, contents)
-    curl.setopt (curl.URL, baseUrl + './adl-submit-latest-version')
-    curl.perform()
-    if curl.getinfo(curl.HTTP_CODE) == 200:
-        contents = contents.getvalue().decode()
-        if float(contents) != float('3.5'):
-            print("Votre script n'est plus à jour, merci de télécharger la nouvelle version à l'adresse")
-            print(("%sadl-submit.py") % baseUrl)
-            sys.exit(1)
-finally:
-    curl.close()
 
-SubmitEvent(event, testOutputFile)
+    (event, testOutputFile) = ParseOptions(sys.argv[1:])
+
+    ensure_latest_version_is_used()
+
+    SubmitEvent(event, testOutputFile)