From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 28 Dec 2014 17:07:31 +0000 (+0200)
Subject: minor timelapse & zip fix
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=5ae86ee2cbe4d68b32417897ac1dd07fdf107625;p=motioneye-debian

minor timelapse & zip fix
---

diff --git a/src/handlers.py b/src/handlers.py
index e2db4b6..8c2df63 100644
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -911,7 +911,7 @@ class PictureHandler(BaseHandler):
                     self.set_header('Content-Disposition', response['content_disposition'])
                     self.finish(response['data'])
 
-                remote.get_zipped_content(camera_config, media_type='picture', key=key, callback=on_response)
+                remote.get_zipped_content(camera_config, media_type='picture', key=key, group=group, callback=on_response)
 
         else: # prepare
             logging.debug('preparing zip file for group %(group)s of camera %(id)s' % {
@@ -978,7 +978,7 @@ class PictureHandler(BaseHandler):
                     self.set_header('Content-Disposition', response['content_disposition'])
                     self.finish(response['data'])
 
-                remote.get_timelapse_movie(camera_config, key, callback=on_response)
+                remote.get_timelapse_movie(camera_config, key, group=group, callback=on_response)
 
         elif check:
             logging.debug('checking timelapse movie status for group %(group)s of camera %(id)s' % {
@@ -1007,7 +1007,7 @@ class PictureHandler(BaseHandler):
                     else:
                         self.finish_json(response)
 
-                remote.check_timelapse_movie(camera_config, callback=on_response)
+                remote.check_timelapse_movie(camera_config, group=group, callback=on_response)
 
         else: # start timelapse
             interval = int(self.get_argument('interval'))
@@ -1043,7 +1043,7 @@ class PictureHandler(BaseHandler):
                     
                     remote.make_timelapse_movie(camera_config, framerate, interval, group=group, callback=on_make)
 
-                remote.check_timelapse_movie(camera_config, callback=on_status)
+                remote.check_timelapse_movie(camera_config, group=group, callback=on_status)
 
 
     @BaseHandler.auth(admin=True)
diff --git a/src/remote.py b/src/remote.py
index 120358f..836e439 100644
--- a/src/remote.py
+++ b/src/remote.py
@@ -417,7 +417,7 @@ def make_zipped_content(local_config, media_type, group, callback):
     http_client.fetch(request, _callback_wrapper(on_response))
 
 
-def get_zipped_content(local_config, media_type, key, callback):
+def get_zipped_content(local_config, media_type, key, group, callback):
     host = local_config.get('@host', local_config.get('host')) 
     port = local_config.get('@port', local_config.get('port'))
     username = local_config.get('@username', local_config.get('username'))
@@ -429,8 +429,9 @@ def get_zipped_content(local_config, media_type, key, callback):
             'id': camera_id,
             'url': make_camera_url(local_config)})
     
-    request = _make_request(host, port, username, password, uri + '/%(media_type)s/%(id)s/zipped/nevermind/?key=%(key)s' % {
+    request = _make_request(host, port, username, password, uri + '/%(media_type)s/%(id)s/zipped/%(group)s/?key=%(key)s' % {
             'media_type': media_type,
+            'group': group,
             'id': camera_id,
             'key': key})
 
@@ -504,7 +505,7 @@ def make_timelapse_movie(local_config, framerate, interval, group, callback):
     http_client.fetch(request, _callback_wrapper(on_response))
 
 
-def check_timelapse_movie(local_config, callback):
+def check_timelapse_movie(local_config, group, callback):
     host = local_config.get('@host', local_config.get('host')) 
     port = local_config.get('@port', local_config.get('port'))
     username = local_config.get('@username', local_config.get('username'))
@@ -516,7 +517,9 @@ def check_timelapse_movie(local_config, callback):
             'id': camera_id,
             'url': make_camera_url(local_config)})
     
-    request = _make_request(host, port, username, password, uri + '/picture/%(id)s/timelapse/nevermind/?check=true' % {'id': camera_id})
+    request = _make_request(host, port, username, password, uri + '/picture/%(id)s/timelapse/%(group)s/?check=true' % {
+            'id': camera_id,
+            'group': group})
     
     def on_response(response):
         if response.error:
@@ -543,7 +546,7 @@ def check_timelapse_movie(local_config, callback):
     http_client.fetch(request, _callback_wrapper(on_response))
 
 
-def get_timelapse_movie(local_config, key, callback):
+def get_timelapse_movie(local_config, key, group, callback):
     host = local_config.get('@host', local_config.get('host')) 
     port = local_config.get('@port', local_config.get('port'))
     username = local_config.get('@username', local_config.get('username'))
@@ -555,8 +558,9 @@ def get_timelapse_movie(local_config, key, callback):
             'id': camera_id,
             'url': make_camera_url(local_config)})
     
-    request = _make_request(host, port, username, password, uri + '/picture/%(id)s/timelapse/nevermind/?key=%(key)s' % {
+    request = _make_request(host, port, username, password, uri + '/picture/%(id)s/timelapse/%(group)s/?key=%(key)s' % {
             'id': camera_id,
+            'group': group,
             'key': key})
 
     def on_response(response):
diff --git a/static/js/main.js b/static/js/main.js
index 5cc0a1d..f2b4507 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -2353,9 +2353,14 @@ function runTimelapseDialog(cameraId, groupKey, group) {
                     }
 
                     if (data.key) {
-                        hideModalDialog(); /* progress */
-                        hideModalDialog(); /* timelapse dialog */
-                        downloadFile('/picture/' + cameraId + '/timelapse/' + groupKey + '/?key=' + data.key);
+                        progressBar[0].setProgress(100);
+                        progressBar[0].setText('100%');
+                        
+                        setTimeout(function () {
+                            hideModalDialog(); /* progress */
+                            hideModalDialog(); /* timelapse dialog */
+                            downloadFile('/picture/' + cameraId + '/timelapse/' + groupKey + '/?key=' + data.key);
+                        }, 500);
                     }
                     else {
                         progressBar[0].setProgress(data.progress * 100);