the update mechanism is now fully functional

diff --git a/doc/todo.txt b/doc/todo.txt
index 2e4ed4562da41e3d485caccb715285bcfab91cd3..e693d35d6ace837a41556425d3fee8f67db0ec19 100644 (file)
--- 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 b18e8b14dd045037f541494bac391beb085451c1..5f78b5d0db77dd3ad4c6190972d7932fe17d0759 100644 (file)
--- 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 8818a8a09652636ab0c0afae8e3cee98089a07f3..b4e2ea430bf8e6500f75f07f4d877a5e155bcff4 100644 (file)
--- a/src/server.py
+++ b/src/server.py
@@ -34,7 +34,7 @@ application = Application(
         (r'^/movie/(?P<camera_id>\d+)/(?P<op>download)/(?P<filename>.+)/?$', 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 aafcbade8907133ac1399a5fdc5c2826934712c4..4d2820ed1afa7362cfcb21c80d687c4f0b427215 100644 (file)
--- 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: