version bump to 0.18

diff --git a/motioneye.py b/motioneye.py
index 8448a4e9fc16fd94f4f5a41a9c66d103fca7e3e6..9a774172fd5be08edee6a843e1e471f95acd40e8 100755 (executable)
--- a/motioneye.py
+++ b/motioneye.py
@@ -29,7 +29,7 @@ import settings
 
 sys.path.append(os.path.join(getattr(settings, 'PROJECT_PATH', os.path.dirname(sys.argv[0])), 'src'))
 
-VERSION = '0.17'
+VERSION = '0.18'
 
 
 def _configure_settings():

diff --git a/src/handlers.py b/src/handlers.py
index d398c745c00896f0b896ac29dc9b6329beec3e5b..c719e4d83a74bf5a97d900dd014e33e5d40094df 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -726,7 +726,7 @@ class PictureHandler(BaseHandler):
             def on_response(remote_list=None, error=None):
                 if error:
                     return self.finish_json({'error': 'Failed to get picture list for %(url)s: %(msg)s.' % {
-                            'url': remote.make_camera_url(camera_config)}, 'msg': error})
+                            'url': remote.make_camera_url(camera_config), 'msg': error}})
 
                 self.finish_json(remote_list)
             
@@ -760,7 +760,7 @@ class PictureHandler(BaseHandler):
             def on_response(response=None, error=None):
                 if error:
                     return self.finish_json({'error': 'Failed to download picture from %(url)s: %(msg)s.' % {
-                            'url': remote.make_camera_url(camera_config)}, 'msg': error})
+                            'url': remote.make_camera_url(camera_config), 'msg': error}})
 
                 pretty_filename = os.path.basename(filename) # no camera name available w/o additional request
                 self.set_header('Content-Type', 'image/jpeg')
@@ -823,7 +823,7 @@ class PictureHandler(BaseHandler):
             def on_response(response=None, error=None):
                 if error:
                     return self.finish_json({'error': 'Failed to delete picture from %(url)s: %(msg)s.' % {
-                            'url': remote.make_camera_url(camera_config)}, 'msg': error})
+                            'url': remote.make_camera_url(camera_config), 'msg': error}})
 
                 self.finish_json()
 
@@ -875,7 +875,7 @@ class PictureHandler(BaseHandler):
                 def on_response(response=None, error=None):
                     if error:
                         return self.finish_json({'error': 'Failed to download zip file from %(url)s: %(msg)s.' % {
-                                'url': remote.make_camera_url(camera_config)}, 'msg': error})
+                                'url': remote.make_camera_url(camera_config), 'msg': error}})
      
                     key = mediafiles.set_prepared_cache(response)
                     logging.debug('prepared zip file for group %(group)s of camera %(id)s with key %(key)s' % {
@@ -933,7 +933,7 @@ class PictureHandler(BaseHandler):
                 def on_response(response=None, error=None):
                     if error:
                         return self.finish_json({'error': 'Failed to download timelapse movie from %(url)s: %(msg)s.' % {
-                                'url': remote.make_camera_url(camera_config)}, 'msg': error})
+                                'url': remote.make_camera_url(camera_config), 'msg': error}})
 
                     key = mediafiles.set_prepared_cache(response)
                     logging.debug('prepared timelapse movie for group %(group)s of camera %(id)s with key %(key)s' % {
@@ -1005,7 +1005,7 @@ class MovieHandler(BaseHandler):
             def on_response(remote_list=None, error=None):
                 if error:
                     return self.finish_json({'error': 'Failed to get movie list for %(url)s: %(msg)s.' % {
-                            'url': remote.make_camera_url(camera_config)}, 'msg': error})
+                            'url': remote.make_camera_url(camera_config), 'msg': error}})
 
                 self.finish_json(remote_list)
             
@@ -1030,7 +1030,7 @@ class MovieHandler(BaseHandler):
             def on_response(response=None, error=None):
                 if error:
                     return self.finish_json({'error': 'Failed to download movie from %(url)s: %(msg)s.' % {
-                            'url': remote.make_camera_url(camera_config)}, 'msg': error})
+                            'url': remote.make_camera_url(camera_config), 'msg': error}})
 
                 pretty_filename = os.path.basename(filename) # no camera name available w/o additional request
                 self.set_header('Content-Type', 'video/mpeg')
@@ -1092,7 +1092,7 @@ class MovieHandler(BaseHandler):
             def on_response(response=None, error=None):
                 if error:
                     return self.finish_json({'error': 'Failed to delete movie from %(url)s: %(msg)s.' % {
-                            'url': remote.make_camera_url(camera_config)}, 'msg': error})
+                            'url': remote.make_camera_url(camera_config), 'msg': error}})
 
                 self.finish_json()
 

diff --git a/src/remote.py b/src/remote.py
index fb0812f9a0c682a0e0144e4328d98bbb53bac0fe..8988bcb2da259c961daa7ef04c169a1280305dfa 100644 (file)
--- a/src/remote.py
+++ b/src/remote.py
@@ -537,7 +537,7 @@ def del_media_content(local_config, callback, filename, media_type):
             'id': camera_id,
             'filename': filename}
 
-    request = _make_request(host, port, username, password, uri, method='POST', timeout=settings.REMOTE_REQUEST_TIMEOUT)
+    request = _make_request(host, port, username, password, uri, method='POST', data='{}', timeout=settings.REMOTE_REQUEST_TIMEOUT)
 
     def on_response(response):
         if response.error:

diff --git a/static/js/main.js b/static/js/main.js
index da413b9545d7e30bc8cbfffdec2ee0f92f01289a..793d7c5e8fd95edf36083fa907b697ef327299d4 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -1318,7 +1318,12 @@ function doDeleteFile(uri, callback) {
     url = parts.slice(0, 3).join('/') + uri;
     
     runConfirmDialog('Really delete this file?', function () {
-        ajax('POST', url, null, function () {
+        ajax('POST', url, null, function (data) {
+            if (data == null || data.error) {
+                showErrorMessage(data && data.error);
+                return;
+            }
+
             if (callback) {
                 callback();
             }