From 875748b625f63f551c7bdb6d6d8ae9886b3df9b8 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 8 Oct 2019 10:28:33 +0300 Subject: [PATCH 1/2] motioneye/extrctl.py: add SNTP support --- package/motioneye/extractl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/motioneye/extractl.py b/package/motioneye/extractl.py index 55a6140e00..4160638daf 100644 --- a/package/motioneye/extractl.py +++ b/package/motioneye/extractl.py @@ -375,9 +375,9 @@ def extraDateSeparator(): def dateMethod(): return { 'label': 'Date Method', - 'description': 'decides whether NTP or HTTP is used for setting and updating the system date', + 'description': 'decides whether (S)NTP or HTTP is used for setting and updating the system date', 'type': 'choices', - 'choices': [('http', 'HTTP'), ('ntp', 'NTP')], + 'choices': [('sntp', 'SNTP (recommended)'), ('ntp', 'NTP'), ('http', 'HTTP')], 'section': 'expertSettings', 'reboot': True, 'required': True, @@ -412,7 +412,7 @@ def dateNtpServer(): 'section': 'expertSettings', 'reboot': True, 'required': False, - 'depends': ['dateMethod==ntp'], + 'depends': ['dateMethod==(ntp|sntp)'], 'get': _get_date_settings, 'set': _set_date_settings, 'get_set_dict': True @@ -449,7 +449,7 @@ def dateInterval(): 'section': 'expertSettings', 'reboot': True, 'required': True, - 'depends': ['dateMethod==http'], + 'depends': ['dateMethod==(http'], 'get': _get_date_settings, 'set': _set_date_settings, 'get_set_dict': True From ca3c9aafd0b77dad8de2185ec3d90b3c96f81e63 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 9 Oct 2019 21:54:15 +0300 Subject: [PATCH 2/2] extractl.py: fix dateInterval depends --- package/motioneye/extractl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/motioneye/extractl.py b/package/motioneye/extractl.py index 4160638daf..282fc02139 100644 --- a/package/motioneye/extractl.py +++ b/package/motioneye/extractl.py @@ -449,7 +449,7 @@ def dateInterval(): 'section': 'expertSettings', 'reboot': True, 'required': True, - 'depends': ['dateMethod==(http'], + 'depends': ['dateMethod==http'], 'get': _get_date_settings, 'set': _set_date_settings, 'get_set_dict': True