fix frame view relative paths

diff --git a/motioneye/handlers.py b/motioneye/handlers.py
index 1aff6ad63943edf0bbb48da115aee1283631e819..051621c10c0a1ad78ecab05649456db11b63aa3e 100644 (file)
--- a/motioneye/handlers.py
+++ b/motioneye/handlers.py
@@ -1044,7 +1044,8 @@ class PictureHandler(BaseHandler):
                     camera_id=camera_id,
                     camera_config=camera_config,
                     title=self.get_argument('title', camera_config.get('@name', '')),
-                    admin_username=config.get_main().get('@admin_username'))
+                    admin_username=config.get_main().get('@admin_username'),
+                    static_path='../../../static/')
 
         elif utils.is_remote_camera(camera_config):
             def on_response(remote_ui_config=None, error=None):

diff --git a/motioneye/tasks.py b/motioneye/tasks.py
index addf7c92e1b8d3805d2a541362693d7c090bb812..d6c412be484a72c829387000d9650898eeb8fb4a 100644 (file)
--- a/motioneye/tasks.py
+++ b/motioneye/tasks.py
@@ -33,6 +33,7 @@ _STATE_FILE_NAME = 'tasks.pickle'
 _MAX_TASKS = 100
 
 # we must be sure there's only one extra process that handles all tasks
+# TODO replace the pool with one simple thread
 _POOL_SIZE = 1
 
 _tasks = []

diff --git a/motioneye/templates/base.html b/motioneye/templates/base.html
index 4eb7e50e395dacbbd4b9bb4d21c2ba1e8339dee7..4a3361881b477bca92e05b89e43069da07762a64 100644 (file)
--- a/motioneye/templates/base.html
+++ b/motioneye/templates/base.html
@@ -15,7 +15,7 @@
             <link rel="stylesheet" type="text/css" href="{{static_path}}css/jquery.timepicker.css" />
             <link rel="shortcut icon" href="{{static_path}}favicon.ico" />
             <link rel="apple-touch-icon" href="{{static_path}}favicon.ico" />
-            <link rel="manifest" href="manifest.json" />
+            <link rel="manifest" href="{{static_path}}../manifest.json" />
         {% endblock %}
         {% block script %}
             <script type="text/javascript" src="{{static_path}}js/css-browser-selector.js"></script>

diff --git a/motioneye/uploadservices.py b/motioneye/uploadservices.py
index 57301c8b5c76d6736671945ae864496904ea5cae..7dc2a70e61dc2d81b43256fec43245fa615eba5e 100644 (file)
--- a/motioneye/uploadservices.py
+++ b/motioneye/uploadservices.py
@@ -778,13 +778,15 @@ def _load():
         except Exception as e:
             logging.error('could not open upload services state file "%s": %s' % (file_path, e))
             
-            return
+            return services
 
         try:
             data = json.load(file)
 
         except Exception as e:
-            return logging.error('could not read upload services state from file "%s": %s' % (file_path, e))
+            logging.error('could not read upload services state from file "%s": %s' % (file_path, e))
+            
+            return services
 
         finally:
             file.close()
@@ -809,6 +811,11 @@ def _save(services):
     
     logging.debug('saving upload services state to "%s"...' % file_path)
 
+    data = {}
+    for camera_id, camera_services in services.iteritems():
+        for name, service in camera_services.iteritems():
+            data.setdefault(str(camera_id), {})[name] = service.dump()
+
     try:
         file = open(file_path, 'w')
 
@@ -817,11 +824,6 @@ def _save(services):
         
         return
     
-    data = {}
-    for camera_id, camera_services in services.iteritems():
-        for name, service in camera_services.iteritems():
-            data.setdefault(str(camera_id), {})[name] = service.dump()
-
     try:
         json.dump(data, file, sort_keys=True, indent=4)