From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 5 Aug 2017 16:34:39 +0000 (+0300)
Subject: Merge branch 'event_end' of https://github.com/jcsilva/motioneye into jcsilva-event_end
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=7ecd924b05f0424fd5abc219f7fd17a8cf739e94;p=motioneye-debian

Merge branch 'event_end' of https://github.com/jcsilva/motioneye into jcsilva-event_end
---

7ecd924b05f0424fd5abc219f7fd17a8cf739e94
diff --cc motioneye/config.py
index 2a8be05,91ec1b1..9c36b9b
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@@ -1045,11 -914,14 +1045,14 @@@ def motion_camera_ui_to_dict(ui, old_co
      # event end
      on_event_end = ['%(script)s stop %%t' % {'script': meyectl.find_command('relayevent')}]
  
+     if ui['command_post_notifications_enabled']:
+         on_event_end += utils.split_semicolon(ui['command_post_notifications_exec'])
+     
      data['on_event_end'] = '; '.join(on_event_end)
 -    
 +
      # movie end
      on_movie_end = ['%(script)s movie_end %%t %%f' % {'script': meyectl.find_command('relayevent')}]
 -    
 +
      if ui['web_hook_storage_enabled']:
          url = re.sub('\\s', '+', ui['web_hook_storage_url'])
  
diff --cc motioneye/templates/main.html
index e6de447,f05bb89..552a543
--- a/motioneye/templates/main.html
+++ b/motioneye/templates/main.html
@@@ -1005,8 -910,21 +1005,21 @@@
                      <tr class="settings-item advanced-setting" required="true" depends="commandNotificationsEnabled motionDetectionEnabled" strip="true">
                          <td class="settings-item-label"><span class="settings-item-label">Command</span></td>
                          <td class="settings-item-value"><input type="text" class="styled notifications camera-config" id="commandNotificationsEntry" placeholder="command..."></td>
 -                        <td><span class="help-mark" title="a command to be executed when motion is detected; multiple commands can be separated by a semicolon; don't use semilcolons inside commands; the following special tokens are accepted: %Y = year, %m = month, %d = date, %H = hour, %M = minute, %S = second, %q = frame number">?</span></td>
 +                        <td><span class="help-mark" title="a command to be executed when motion is detected; multiple commands can be separated by a semicolon; don't use semilcolons inside commands; the following special tokens are accepted: %Y = year, %m = month, %d = day, %H = hour, %M = minute, %S = second, %q = frame number, %v = event number">?</span></td>
                      </tr>
+                     <tr class="settings-item advanced-setting" depends="motionDetectionEnabled">
+                         <td colspan="100"><div class="settings-item-separator"></div></td>
+                     </tr>
+                     <tr class="settings-item advanced-setting" depends="motionDetectionEnabled">
+                         <td class="settings-item-label"><span class="settings-item-label">Run A Post Command</span></td>
+                         <td class="settings-item-value"><input type="checkbox" class="styled notifications camera-config" id="commandPostNotificationsEnabledSwitch"></td>
+                         <td><span class="help-mark" title="enable this if you want to execute a command whenever a motion event is finished">?</span></td>
+                     </tr>
+                     <tr class="settings-item advanced-setting" required="true" depends="commandPostNotificationsEnabled motionDetectionEnabled" strip="true">
+                         <td class="settings-item-label"><span class="settings-item-label">Command</span></td>
+                         <td class="settings-item-value"><input type="text" class="styled notifications camera-config" id="commandPostNotificationsEntry" placeholder="command..."></td>
+                         <td><span class="help-mark" title="a command to be executed when motion event is finished; multiple commands can be separated by a semicolon; don't use semilcolons inside commands; the following special tokens are accepted: %Y = year, %m = month, %d = date, %H = hour, %M = minute, %S = second, %q = frame number">?</span></td>
+                     </tr>
                      {% for config in camera_sections.get('notifications', {}).get('configs', []) %}
                          {{config_item(config, "motionDetectionEnabled")}}
                      {% endfor %}