From f8c2ceae9e70562dc8d6542c12afb17219f12760 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 30 May 2019 22:46:52 +0300 Subject: [PATCH] motioneye: remove advanced flag from extra settings --- .../raspberrypi/motioneye-modules/boardctl.py | 7 +-- .../motioneye-modules/streameyectl.py | 48 ++----------------- .../motioneye-modules/boardctl.py | 7 +-- .../motioneye-modules/streameyectl.py | 48 ++----------------- .../motioneye-modules/boardctl.py | 6 +-- .../motioneye-modules/streameyectl.py | 48 ++----------------- package/motioneye/extractl.py | 25 ++-------- package/motioneye/ipctl.py | 8 +--- package/motioneye/servicectl.py | 16 ++----- package/motioneye/watchctl.py | 11 +---- 10 files changed, 26 insertions(+), 198 deletions(-) diff --git a/board/raspberrypi/motioneye-modules/boardctl.py b/board/raspberrypi/motioneye-modules/boardctl.py index e507c053f4..58d0d82f56 100644 --- a/board/raspberrypi/motioneye-modules/boardctl.py +++ b/board/raspberrypi/motioneye-modules/boardctl.py @@ -226,8 +226,7 @@ def _set_sys_mon(sys_mon): def boardSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -240,7 +239,6 @@ def gpuMem(): 'min': '16', 'max': '448', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_board_settings, 'set': _set_board_settings, @@ -255,7 +253,6 @@ def cameraLed(): 'description': 'control the led on the CSI camera board', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_board_settings, 'set': _set_board_settings, @@ -277,7 +274,6 @@ def overclock(): ('1000|500|600|6', 'turbo (1000/500/600/6)') ], 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_board_settings, 'set': _set_board_settings, @@ -292,7 +288,6 @@ def sysMon(): 'description': 'when this is enabled, system monitoring info will be overlaid on top of the first camera frame', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': False, 'get': _get_sys_mon, 'set': _set_sys_mon diff --git a/board/raspberrypi/motioneye-modules/streameyectl.py b/board/raspberrypi/motioneye-modules/streameyectl.py index 77ffe1c84f..7fd7f34eb4 100644 --- a/board/raspberrypi/motioneye-modules/streameyectl.py +++ b/board/raspberrypi/motioneye-modules/streameyectl.py @@ -516,7 +516,6 @@ if _get_streameye_enabled(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': lambda: 'streameye.log', } @@ -525,7 +524,6 @@ if _get_streameye_enabled(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': lambda: 'raspimjpeg.log', } @@ -534,8 +532,7 @@ if _get_streameye_enabled(): def streamEyeMainSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -547,7 +544,6 @@ def streamEye(): 'disabling motion detection, media files and all other advanced features (works only with the CSI camera)', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_streameye_enabled, 'set': _set_streameye_enabled_deferred, @@ -559,8 +555,7 @@ def streamEyeCameraSeparator1(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -580,7 +575,6 @@ def seBrightness(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -605,7 +599,6 @@ def seContrast(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -630,7 +623,6 @@ def seSaturation(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -655,7 +647,6 @@ def seSharpness(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -670,8 +661,7 @@ def streamEyeCameraSeparator2(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -686,7 +676,6 @@ def seResolution(): 'type': 'choices', 'choices': RESOLUTION_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -706,7 +695,6 @@ def seRotation(): 'type': 'choices', 'choices': ROTATION_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -725,7 +713,6 @@ def seVflip(): 'description': 'enable this to flip the captured image vertically', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -744,7 +731,6 @@ def seHflip(): 'description': 'enable this to flip the captured image horizontally', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -768,7 +754,6 @@ def seFramerate(): 'ticks': "1|5|10|15|20|25|30", 'decimals': 0, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -793,7 +778,6 @@ def seQuality(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -815,7 +799,6 @@ def seBitrate(): 'max': 100000000, 'unit': 'bps', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -840,7 +823,6 @@ def seZoomx(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -865,7 +847,6 @@ def seZoomy(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -890,7 +871,6 @@ def seZoomw(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -915,7 +895,6 @@ def seZoomh(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -934,7 +913,6 @@ def sePreview(): 'description': 'enable this if you want to see the preview on an HDMI-connected monitor', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'get': _get_raspimjpeg_settings, 'set': _set_raspimjpeg_settings, @@ -947,8 +925,7 @@ def streamEyeCameraSeparator3(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -968,7 +945,6 @@ def seIso(): 'decimals': 0, 'unit': '', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -990,7 +966,6 @@ def seShutter(): 'max': 6000000, 'unit': 'microseconds', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1004,8 +979,7 @@ def streamEyeCameraSeparator4(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -1020,7 +994,6 @@ def seExposure(): 'type': 'choices', 'choices': EXPOSURE_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1045,7 +1018,6 @@ def seEv(): 'decimals': 0, 'unit': '', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1065,7 +1037,6 @@ def seAwb(): 'type': 'choices', 'choices': AWB_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1085,7 +1056,6 @@ def seMetering(): 'type': 'choices', 'choices': METERING_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1105,7 +1075,6 @@ def seDrc(): 'type': 'choices', 'choices': DRC_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1124,7 +1093,6 @@ def seVstab(): 'description': 'enables or disables video stabilization for this camera', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1143,7 +1111,6 @@ def seDenoise(): 'description': 'enables image denoising', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1163,7 +1130,6 @@ def seImxfx(): 'type': 'choices', 'choices': IMXFX_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1183,7 +1149,6 @@ def seProto(): 'type': 'choices', 'choices': PROTO_CHOICES, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_streameye_settings, @@ -1204,7 +1169,6 @@ def sePort(): 'min': 0, 'max': 65535, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==mjpeg'], @@ -1226,7 +1190,6 @@ def seRTSPPort(): 'min': 0, 'max': 65535, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==rtsp'], @@ -1247,7 +1210,6 @@ def seAuthMode(): 'type': 'choices', 'choices': AUTH_CHOICES, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==mjpeg'], diff --git a/board/raspberrypi2/motioneye-modules/boardctl.py b/board/raspberrypi2/motioneye-modules/boardctl.py index 56d24de1bb..bc7c1056fb 100644 --- a/board/raspberrypi2/motioneye-modules/boardctl.py +++ b/board/raspberrypi2/motioneye-modules/boardctl.py @@ -220,8 +220,7 @@ def _set_sys_mon(sys_mon): def boardSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -234,7 +233,6 @@ def gpuMem(): 'min': '16', 'max': '944', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_board_settings, 'set': _set_board_settings, @@ -249,7 +247,6 @@ def cameraLed(): 'description': 'control the led on the CSI camera board', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_board_settings, 'set': _set_board_settings, @@ -271,7 +268,6 @@ def overclock(): ('1000|500|600|6', 'turbo (1000/500/600/6)') ], 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_board_settings, 'set': _set_board_settings, @@ -286,7 +282,6 @@ def sysMon(): 'description': 'when this is enabled, system monitoring info will be overlaid on top of the first camera frame', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': False, 'get': _get_sys_mon, 'set': _set_sys_mon diff --git a/board/raspberrypi2/motioneye-modules/streameyectl.py b/board/raspberrypi2/motioneye-modules/streameyectl.py index 77ffe1c84f..7fd7f34eb4 100644 --- a/board/raspberrypi2/motioneye-modules/streameyectl.py +++ b/board/raspberrypi2/motioneye-modules/streameyectl.py @@ -516,7 +516,6 @@ if _get_streameye_enabled(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': lambda: 'streameye.log', } @@ -525,7 +524,6 @@ if _get_streameye_enabled(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': lambda: 'raspimjpeg.log', } @@ -534,8 +532,7 @@ if _get_streameye_enabled(): def streamEyeMainSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -547,7 +544,6 @@ def streamEye(): 'disabling motion detection, media files and all other advanced features (works only with the CSI camera)', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_streameye_enabled, 'set': _set_streameye_enabled_deferred, @@ -559,8 +555,7 @@ def streamEyeCameraSeparator1(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -580,7 +575,6 @@ def seBrightness(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -605,7 +599,6 @@ def seContrast(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -630,7 +623,6 @@ def seSaturation(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -655,7 +647,6 @@ def seSharpness(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -670,8 +661,7 @@ def streamEyeCameraSeparator2(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -686,7 +676,6 @@ def seResolution(): 'type': 'choices', 'choices': RESOLUTION_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -706,7 +695,6 @@ def seRotation(): 'type': 'choices', 'choices': ROTATION_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -725,7 +713,6 @@ def seVflip(): 'description': 'enable this to flip the captured image vertically', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -744,7 +731,6 @@ def seHflip(): 'description': 'enable this to flip the captured image horizontally', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -768,7 +754,6 @@ def seFramerate(): 'ticks': "1|5|10|15|20|25|30", 'decimals': 0, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -793,7 +778,6 @@ def seQuality(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -815,7 +799,6 @@ def seBitrate(): 'max': 100000000, 'unit': 'bps', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -840,7 +823,6 @@ def seZoomx(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -865,7 +847,6 @@ def seZoomy(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -890,7 +871,6 @@ def seZoomw(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -915,7 +895,6 @@ def seZoomh(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -934,7 +913,6 @@ def sePreview(): 'description': 'enable this if you want to see the preview on an HDMI-connected monitor', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'get': _get_raspimjpeg_settings, 'set': _set_raspimjpeg_settings, @@ -947,8 +925,7 @@ def streamEyeCameraSeparator3(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -968,7 +945,6 @@ def seIso(): 'decimals': 0, 'unit': '', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -990,7 +966,6 @@ def seShutter(): 'max': 6000000, 'unit': 'microseconds', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1004,8 +979,7 @@ def streamEyeCameraSeparator4(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -1020,7 +994,6 @@ def seExposure(): 'type': 'choices', 'choices': EXPOSURE_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1045,7 +1018,6 @@ def seEv(): 'decimals': 0, 'unit': '', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1065,7 +1037,6 @@ def seAwb(): 'type': 'choices', 'choices': AWB_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1085,7 +1056,6 @@ def seMetering(): 'type': 'choices', 'choices': METERING_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1105,7 +1075,6 @@ def seDrc(): 'type': 'choices', 'choices': DRC_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1124,7 +1093,6 @@ def seVstab(): 'description': 'enables or disables video stabilization for this camera', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1143,7 +1111,6 @@ def seDenoise(): 'description': 'enables image denoising', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1163,7 +1130,6 @@ def seImxfx(): 'type': 'choices', 'choices': IMXFX_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1183,7 +1149,6 @@ def seProto(): 'type': 'choices', 'choices': PROTO_CHOICES, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_streameye_settings, @@ -1204,7 +1169,6 @@ def sePort(): 'min': 0, 'max': 65535, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==mjpeg'], @@ -1226,7 +1190,6 @@ def seRTSPPort(): 'min': 0, 'max': 65535, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==rtsp'], @@ -1247,7 +1210,6 @@ def seAuthMode(): 'type': 'choices', 'choices': AUTH_CHOICES, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==mjpeg'], diff --git a/board/raspberrypi3/motioneye-modules/boardctl.py b/board/raspberrypi3/motioneye-modules/boardctl.py index d66bba8c0f..c65ab5591c 100644 --- a/board/raspberrypi3/motioneye-modules/boardctl.py +++ b/board/raspberrypi3/motioneye-modules/boardctl.py @@ -185,8 +185,7 @@ def _set_sys_mon(sys_mon): def boardSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -199,7 +198,6 @@ def gpuMem(): 'min': '16', 'max': '944', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_board_settings, 'set': _set_board_settings, @@ -214,7 +212,6 @@ def cameraLed(): 'description': 'control the led on the CSI camera board', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_board_settings, 'set': _set_board_settings, @@ -229,7 +226,6 @@ def sysMon(): 'description': 'when this is enabled, system monitoring info will be overlaid on top of the first camera frame', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': False, 'get': _get_sys_mon, 'set': _set_sys_mon diff --git a/board/raspberrypi3/motioneye-modules/streameyectl.py b/board/raspberrypi3/motioneye-modules/streameyectl.py index 77ffe1c84f..7fd7f34eb4 100644 --- a/board/raspberrypi3/motioneye-modules/streameyectl.py +++ b/board/raspberrypi3/motioneye-modules/streameyectl.py @@ -516,7 +516,6 @@ if _get_streameye_enabled(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': lambda: 'streameye.log', } @@ -525,7 +524,6 @@ if _get_streameye_enabled(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': lambda: 'raspimjpeg.log', } @@ -534,8 +532,7 @@ if _get_streameye_enabled(): def streamEyeMainSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -547,7 +544,6 @@ def streamEye(): 'disabling motion detection, media files and all other advanced features (works only with the CSI camera)', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_streameye_enabled, 'set': _set_streameye_enabled_deferred, @@ -559,8 +555,7 @@ def streamEyeCameraSeparator1(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -580,7 +575,6 @@ def seBrightness(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -605,7 +599,6 @@ def seContrast(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -630,7 +623,6 @@ def seSaturation(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -655,7 +647,6 @@ def seSharpness(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -670,8 +661,7 @@ def streamEyeCameraSeparator2(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -686,7 +676,6 @@ def seResolution(): 'type': 'choices', 'choices': RESOLUTION_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -706,7 +695,6 @@ def seRotation(): 'type': 'choices', 'choices': ROTATION_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -725,7 +713,6 @@ def seVflip(): 'description': 'enable this to flip the captured image vertically', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -744,7 +731,6 @@ def seHflip(): 'description': 'enable this to flip the captured image horizontally', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -768,7 +754,6 @@ def seFramerate(): 'ticks': "1|5|10|15|20|25|30", 'decimals': 0, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -793,7 +778,6 @@ def seQuality(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -815,7 +799,6 @@ def seBitrate(): 'max': 100000000, 'unit': 'bps', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -840,7 +823,6 @@ def seZoomx(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -865,7 +847,6 @@ def seZoomy(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -890,7 +871,6 @@ def seZoomw(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -915,7 +895,6 @@ def seZoomh(): 'decimals': 0, 'unit': '%', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -934,7 +913,6 @@ def sePreview(): 'description': 'enable this if you want to see the preview on an HDMI-connected monitor', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'get': _get_raspimjpeg_settings, 'set': _set_raspimjpeg_settings, @@ -947,8 +925,7 @@ def streamEyeCameraSeparator3(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -968,7 +945,6 @@ def seIso(): 'decimals': 0, 'unit': '', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -990,7 +966,6 @@ def seShutter(): 'max': 6000000, 'unit': 'microseconds', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1004,8 +979,7 @@ def streamEyeCameraSeparator4(): return { 'type': 'separator', 'section': 'device', - 'camera': True, - 'advanced': True + 'camera': True } @@ -1020,7 +994,6 @@ def seExposure(): 'type': 'choices', 'choices': EXPOSURE_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1045,7 +1018,6 @@ def seEv(): 'decimals': 0, 'unit': '', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1065,7 +1037,6 @@ def seAwb(): 'type': 'choices', 'choices': AWB_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1085,7 +1056,6 @@ def seMetering(): 'type': 'choices', 'choices': METERING_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1105,7 +1075,6 @@ def seDrc(): 'type': 'choices', 'choices': DRC_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1124,7 +1093,6 @@ def seVstab(): 'description': 'enables or disables video stabilization for this camera', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1143,7 +1111,6 @@ def seDenoise(): 'description': 'enables image denoising', 'type': 'bool', 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1163,7 +1130,6 @@ def seImxfx(): 'type': 'choices', 'choices': IMXFX_CHOICES, 'section': 'device', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_raspimjpeg_settings, @@ -1183,7 +1149,6 @@ def seProto(): 'type': 'choices', 'choices': PROTO_CHOICES, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'get': _get_streameye_settings, @@ -1204,7 +1169,6 @@ def sePort(): 'min': 0, 'max': 65535, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==mjpeg'], @@ -1226,7 +1190,6 @@ def seRTSPPort(): 'min': 0, 'max': 65535, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==rtsp'], @@ -1247,7 +1210,6 @@ def seAuthMode(): 'type': 'choices', 'choices': AUTH_CHOICES, 'section': 'streaming', - 'advanced': True, 'camera': True, 'required': True, 'depends': ['seProto==mjpeg'], diff --git a/package/motioneye/extractl.py b/package/motioneye/extractl.py index df9cde7204..55a6140e00 100644 --- a/package/motioneye/extractl.py +++ b/package/motioneye/extractl.py @@ -355,7 +355,6 @@ def hostname(): 'description': 'sets a custom hostname for the device (leave blank for default)', 'type': 'str', 'section': 'general', - 'advanced': True, 'reboot': True, 'required': False, 'validate': '^[a-z0-9\-_.]{0,64}$', @@ -368,8 +367,7 @@ def hostname(): def extraDateSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -381,7 +379,6 @@ def dateMethod(): 'type': 'choices', 'choices': [('http', 'HTTP'), ('ntp', 'NTP')], 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'get': _get_date_settings, @@ -397,7 +394,6 @@ def dateHost(): 'description': 'sets the hostname or IP address to which the HTTP request will be made', 'type': 'str', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'depends': ['dateMethod==http'], @@ -414,7 +410,6 @@ def dateNtpServer(): 'description': 'sets a custom NTP server (leave blank to use the default server)', 'type': 'str', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': False, 'depends': ['dateMethod==ntp'], @@ -434,7 +429,6 @@ def dateTimeout(): 'max': 3600, 'unit': 'seconds', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'get': _get_date_settings, @@ -453,7 +447,6 @@ def dateInterval(): 'max': 86400, 'unit': 'seconds', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'depends': ['dateMethod==http'], @@ -467,8 +460,7 @@ def dateInterval(): def extraMotionEyeSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -481,7 +473,6 @@ def port(): 'min': 1, 'max': 65535, 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'get': _get_motioneye_settings, @@ -497,7 +488,6 @@ def motionBinary(): 'description': 'sets the path to the motion binary', 'type': 'str', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'get': _get_motioneye_settings, @@ -513,7 +503,6 @@ def motionKeepAlive(): 'description': 'enables continuous motion daemon hang detection (at the expense of a slightly higher CPU usage)', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'unit': 'seconds', 'get': _get_motioneye_settings, @@ -529,7 +518,6 @@ def debug(): 'description': 'turning debugging on will generate verbose log messages and will mount all the partitions in read-write mode', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_motioneye_settings, 'set': _set_motioneye_settings, @@ -544,7 +532,6 @@ def prereleases(): 'description': 'turning this option on will allow updating to prereleases (untested, possibly unstable versions)', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'get': _get_os_settings, 'set': _set_os_settings, 'get_set_dict': True @@ -555,8 +542,7 @@ def prereleases(): def extraLogsSeparator(): return { 'type': 'separator', - 'section': 'expertSettings', - 'advanced': True + 'section': 'expertSettings' } @@ -567,7 +553,6 @@ def motionLog(): 'description': 'download the log files and include them with any issue you want to report', 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': _get_motion_log, } @@ -577,7 +562,6 @@ def motionEyeLog(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': _get_motion_eye_log, } @@ -587,7 +571,6 @@ def messagesLog(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': _get_messages_log, } @@ -597,7 +580,6 @@ def bootLog(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': _get_boot_log, } @@ -607,7 +589,6 @@ def dmesgLog(): return { 'type': 'html', 'section': 'expertSettings', - 'advanced': True, 'get': _get_dmesg_log, } diff --git a/package/motioneye/ipctl.py b/package/motioneye/ipctl.py index 7d568bc7de..5195531b63 100644 --- a/package/motioneye/ipctl.py +++ b/package/motioneye/ipctl.py @@ -154,8 +154,7 @@ def _set_ip_settings(s): def ipSeparator(): return { 'type': 'separator', - 'section': 'network', - 'advanced': True + 'section': 'network' } @@ -167,7 +166,6 @@ def ipConfigType(): 'type': 'choices', 'choices': [('dhcp', 'Automatic (DHCP)'), ('static', 'Manual (Static IP)')], 'section': 'network', - 'advanced': True, 'reboot': True, 'get': _get_ip_settings, 'set': _set_ip_settings, @@ -183,7 +181,6 @@ def ipConfigStaticAddr(): 'type': 'str', 'validate': '^[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?$', 'section': 'network', - 'advanced': True, 'required': True, 'depends': ['ipConfigType==static'], 'reboot': True, @@ -201,7 +198,6 @@ def ipConfigStaticMask(): 'type': 'str', 'validate': '^[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?$', 'section': 'network', - 'advanced': True, 'required': True, 'depends': ['ipConfigType==static'], 'reboot': True, @@ -219,7 +215,6 @@ def ipConfigStaticGw(): 'type': 'str', 'validate': '^[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?$', 'section': 'network', - 'advanced': True, 'required': True, 'depends': ['ipConfigType==static'], 'reboot': True, @@ -237,7 +232,6 @@ def ipConfigStaticDns(): 'type': 'str', 'validate': '^[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?$', 'section': 'network', - 'advanced': True, 'required': True, 'depends': ['ipConfigType==static'], 'reboot': True, diff --git a/package/motioneye/servicectl.py b/package/motioneye/servicectl.py index 29291787e5..fe5b27a166 100644 --- a/package/motioneye/servicectl.py +++ b/package/motioneye/servicectl.py @@ -182,8 +182,7 @@ def _set_service_settings(s): def services(): return { 'label': 'Services', - 'description': 'configure extra services (such as FTP or SSH)', - 'advanced': True + 'description': 'configure extra services (such as FTP or SSH)' } @@ -194,7 +193,6 @@ def ftpEnabled(): 'description': 'enable this if you want to access the files on your motionEyeOS system using FTP', 'type': 'bool', 'section': 'services', - 'advanced': True, 'reboot': True, 'get': _get_service_settings, 'set': _set_service_settings, @@ -209,7 +207,6 @@ def ftpAuth(): 'description': 'enable this if you want the FTP server to ask for credentials (i.e. to disable anonymous logins)', 'type': 'bool', 'section': 'services', - 'advanced': True, 'reboot': True, 'depends': ['ftpEnabled'], 'get': _get_service_settings, @@ -225,7 +222,6 @@ def ftpWritable(): 'description': 'enable this if you want to allow creating, editing or removing files/directories through FTP (i.e. to disable read-only mode)', 'type': 'bool', 'section': 'services', - 'advanced': True, 'reboot': True, 'depends': ['ftpAuth', 'ftpEnabled'], 'get': _get_service_settings, @@ -238,8 +234,7 @@ def ftpWritable(): def ftpSeparator(): return { 'type': 'separator', - 'section': 'services', - 'advanced': True + 'section': 'services' } @@ -250,7 +245,6 @@ def smbEnabled(): 'description': 'enable this if you want files on your motionEyeOS system to be visible on the local network (using SMB protocol)', 'type': 'bool', 'section': 'services', - 'advanced': True, 'reboot': True, 'get': _get_service_settings, 'set': _set_service_settings, @@ -265,7 +259,6 @@ def smbAuth(): 'description': 'enable this if you want the Samba server to ask for credentials (i.e. to disable guest access)', 'type': 'bool', 'section': 'services', - 'advanced': True, 'reboot': True, 'depends': ['smbEnabled'], 'get': _get_service_settings, @@ -281,7 +274,6 @@ def smbWritable(): 'description': 'enable this if you want to allow creating, editing or removing files/directories on your motionEyeOS system from the local network', 'type': 'bool', 'section': 'services', - 'advanced': True, 'reboot': True, 'depends': ['smbAuth', 'smbEnabled'], 'get': _get_service_settings, @@ -294,8 +286,7 @@ def smbWritable(): def smbSeparator(): return { 'type': 'separator', - 'section': 'services', - 'advanced': True + 'section': 'services' } @@ -306,7 +297,6 @@ def sshEnabled(): 'description': 'enable this if you want to login remotely on your motionEyeOS system using an SSH client (such as Putty)', 'type': 'bool', 'section': 'services', - 'advanced': True, 'reboot': True, 'get': _get_service_settings, 'set': _set_service_settings, diff --git a/package/motioneye/watchctl.py b/package/motioneye/watchctl.py index c23012b58b..6a97ecd635 100644 --- a/package/motioneye/watchctl.py +++ b/package/motioneye/watchctl.py @@ -132,8 +132,7 @@ def _set_watch_settings(s): def expertSettings(): return { 'label': 'Expert Settings', - 'description': 'system tweaks and board-specific options', - 'advanced': True + 'description': 'system tweaks and board-specific options' } @@ -144,7 +143,6 @@ def watchLink(): 'description': 'enable this if you want the system to reboot upon detecting network link issues', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_watch_settings, 'set': _set_watch_settings, @@ -162,7 +160,6 @@ def watchLinkTimeout(): 'max': 3600, 'unit': 'seconds', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'depends': ['watchLink'], @@ -179,7 +176,6 @@ def watchConnect(): 'description': 'enable this if you want the system to constantly try to connect to a certain host and reboot upon failure', 'type': 'bool', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'get': _get_watch_settings, 'set': _set_watch_settings, @@ -194,7 +190,6 @@ def watchConnectHost(): 'description': 'sets the hostname or IP address to which a TCP connection will be opened', 'type': 'str', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'depends': ['watchConnect'], @@ -213,7 +208,6 @@ def watchConnectPort(): 'min': 1, 'max': 65535, 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'depends': ['watchConnect'], @@ -232,7 +226,6 @@ def watchConnectRetries(): 'min': 1, 'max': 100, 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'depends': ['watchConnect'], @@ -252,7 +245,6 @@ def watchConnectTimeout(): 'max': 3600, 'unit': 'seconds', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'depends': ['watchConnect'], @@ -272,7 +264,6 @@ def watchConnectInterval(): 'max': 3600, 'unit': 'seconds', 'section': 'expertSettings', - 'advanced': True, 'reboot': True, 'required': True, 'depends': ['watchConnect'],