Merge remote-tracking branch 'ukhas/master'

update_server/app.py

@@ -1,46 +1,48 @@
 #!/usr/bin/env python
 
 # Copyright 2012 Daniel Richman
+# Copyright 2015 Adam Greig
 # DL-Fldigi update check server
 
-import os.path
+import os
 import yaml
+import os.path
+import subprocess
 from flask import Flask, abort, request, jsonify
 
-app_dir = os.path.dirname(__file__)
-config_file = os.path.join(app_dir, "config.yml")
-config = {}
-
 app = Flask(__name__)
 
-def load_config():
+# Load config from file
-    global config
+app_dir = os.path.abspath(os.path.dirname(__file__))
+config_file = os.path.join(app_dir, "config.yml")
+config = yaml.load(open(config_file))
+
+# Swap to directory containing this script, to ensure we're inside
+# the git repository.
+os.chdir(app_dir)
+
+
+def git_rev_list(commit):
+    commits = subprocess.check_output(["git", "rev-list", commit + "^{}"])
+    return set(commits.split("\n")[1:])
+
+# Store commits considered old
+old_commits = git_rev_list(config['latest_release'])
 
-    mtime = os.stat(config_file).st_mtime
-    if mtime != config.get("_mtime", None):
-        with open(config_file) as f:
-            config = yaml.load(f)
-        config["_mtime"] = mtime
 
 @app.route("/")
 def check():
-    load_config()
-
     try:
-        platform = request.args["platform"]
         commit = request.args["commit"]
-        expect = config["expect"][platform]
 
-        if isinstance(expect, list) and commit in expect:
+        if commit in old_commits:
-            return ""
-        elif isinstance(expect, basestring) and expect == commit:
-            return ""
-        else:
             return jsonify(config["update"])
+        else:
+            return ""
 
     except KeyError:
         # bad platform or missing arg
         abort(400)
 
 if __name__ == "__main__":
-    app.run()
+    app.run(debug=True)

update_server/config.yml

@@ -1,9 +1,4 @@
 update:
     url: "http://ukhas.org.uk/projects:dl-fldigi"
     text: "There is a new version of dl-fldigi available!"
-expect:
+latest_release: "DL3.1"
-    win32: "that would be self description"
-    linux: "which is unfortunately not possible"
-    macosx:
-        - "well, technically it is,"
-        - "but I don't have a super computer"