From ea425075f141db7d791edbd26fe05f0698087a4c Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 27 Oct 2013 12:12:24 +0200 Subject: [PATCH] the update mechanism is now fully functional --- doc/todo.txt | 1 - src/handlers.py | 5 ++++- src/server.py | 2 +- src/update.py | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/todo.txt b/doc/todo.txt index 2e4ed45..e693d35 100644 --- a/doc/todo.txt +++ b/doc/todo.txt @@ -1,4 +1,3 @@ --> add an autoupdate mechanism -> make camera frames positions configurable -> add a view log functionality -> add a previewer for movies diff --git a/src/handlers.py b/src/handlers.py index b18e8b1..5f78b5d 100644 --- a/src/handlers.py +++ b/src/handlers.py @@ -2,7 +2,10 @@ import base64 import json import logging +import os +import sys +from tornado import ioloop from tornado.web import RequestHandler, HTTPError, asynchronous import config @@ -614,4 +617,4 @@ class UpdateHandler(BaseHandler): result = update.perform_update(version) - return self.finish_json(result) + self.finish_json(result) diff --git a/src/server.py b/src/server.py index 8818a8a..b4e2ea4 100644 --- a/src/server.py +++ b/src/server.py @@ -34,7 +34,7 @@ application = Application( (r'^/movie/(?P\d+)/(?Pdownload)/(?P.+)/?$', handlers.MovieHandler), (r'^/update/?$', handlers.UpdateHandler), ], - debug=False, # also disables autoreloading + debug=True, # enables autoreload log_function=log_request, static_path=settings.STATIC_PATH, static_url_prefix=settings.STATIC_URL diff --git a/src/update.py b/src/update.py index aafcbad..4d2820e 100644 --- a/src/update.py +++ b/src/update.py @@ -31,10 +31,15 @@ def get_all_versions(stable=False): 'repo': settings.REPO[1]} try: + logging.debug('fetching %(url)s...' % {'url': url}) + response = urllib2.urlopen(url, timeout=settings.REMOTE_REQUEST_TIMEOUT) response = json.load(response) versions = response.keys() + logging.debug('available versions: %(versions)s' % { + 'versions': ', '.join(versions)}) + # stable versions are those of form x.y # unstable versions are of form x.y.z if stable: -- 2.39.5