jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-25 20:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Raspberry PI (all): streameye: use camera files instead of thread files

Browse Source
This commit is contained in:
Calin Crisan 2019-03-11 22:57:05 +02:00
parent 42cb0d0c35
commit adf81dea0d
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
board/raspberrypi/motioneye-modules/streameyectl.py
View File

@ -187,13 +187,13 @@ def _set_streameye_enabled(enabled):
config._camera_ids_cache = [] config._camera_ids_cache = []
logging.debug('disabling all cameras in motion.conf') logging.debug('disabling all cameras in motion.conf')
cmd = 'sed -r -i "s/^thread (.*)/#thread \\1/" /data/etc/motion.conf &>/dev/null' cmd = 'sed -r -i "s/^camera (.*)/#camera \\1/" /data/etc/motion.conf &>/dev/null'
if os.system(cmd): if os.system(cmd):
logging.error('failed to disable cameras in motion.conf') logging.error('failed to disable cameras in motion.conf')
logging.debug('renaming thread files') logging.debug('renaming camera files')
for name in os.listdir(settings.CONF_PATH): for name in os.listdir(settings.CONF_PATH):
if re.match('^thread-\d+.conf$', name): if re.match('^camera-\d+.conf$', name):
os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name + '.bak')) os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name + '.bak'))
logging.debug('adding simple mjpeg camera') logging.debug('adding simple mjpeg camera')
@ -231,9 +231,9 @@ def _set_streameye_enabled(enabled):
if camera_config.get('@proto') == 'mjpeg': if camera_config.get('@proto') == 'mjpeg':
config.rem_camera(camera_id) config.rem_camera(camera_id)
logging.debug('renaming thread files') logging.debug('renaming camera files')
for name in os.listdir(settings.CONF_PATH): for name in os.listdir(settings.CONF_PATH):
if re.match('^thread-\d+.conf.bak$', name): if re.match('^camera-\d+.conf.bak$', name):
os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name[:-4])) os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name[:-4]))
_streameye_enabled = False _streameye_enabled = False

6
board/raspberrypi/overlay/etc/init.d/S84streameye
View File

@ -6,11 +6,11 @@ MOTIONEYE_CONF_DIR="/data/etc/"
test -n "${OS_VERSION}" || source /etc/init.d/base test -n "${OS_VERSION}" || source /etc/init.d/base
enabled() { enabled() {
test $(ls -1 ${MOTIONEYE_CONF_DIR}/thread-*.conf 2>/dev/null| wc -l) == 1 || return 1 test $(ls -1 ${MOTIONEYE_CONF_DIR}/camera-*.conf 2>/dev/null| wc -l) == 1 || return 1
grep '# @proto mjpeg' ${MOTIONEYE_CONF_DIR}/thread-1.conf &>/dev/null || return 1 grep '# @proto mjpeg' ${MOTIONEYE_CONF_DIR}/camera-1.conf &>/dev/null || return 1
grep -E '# @url http://(.*)127.0.0.1:' ${MOTIONEYE_CONF_DIR}/thread-1.conf &>/dev/null || return 1 grep -E '# @url http://(.*)127.0.0.1:' ${MOTIONEYE_CONF_DIR}/camera-1.conf &>/dev/null || return 1
return 0 return 0
} }

10
board/raspberrypi2/motioneye-modules/streameyectl.py
View File

@ -187,13 +187,13 @@ def _set_streameye_enabled(enabled):
config._camera_ids_cache = [] config._camera_ids_cache = []
logging.debug('disabling all cameras in motion.conf') logging.debug('disabling all cameras in motion.conf')
cmd = 'sed -r -i "s/^thread (.*)/#thread \\1/" /data/etc/motion.conf &>/dev/null' cmd = 'sed -r -i "s/^camera (.*)/#camera \\1/" /data/etc/motion.conf &>/dev/null'
if os.system(cmd): if os.system(cmd):
logging.error('failed to disable cameras in motion.conf') logging.error('failed to disable cameras in motion.conf')
logging.debug('renaming thread files') logging.debug('renaming camera files')
for name in os.listdir(settings.CONF_PATH): for name in os.listdir(settings.CONF_PATH):
if re.match('^thread-\d+.conf$', name): if re.match('^camera-\d+.conf$', name):
os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name + '.bak')) os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name + '.bak'))
logging.debug('adding simple mjpeg camera') logging.debug('adding simple mjpeg camera')
@ -231,9 +231,9 @@ def _set_streameye_enabled(enabled):
if camera_config.get('@proto') == 'mjpeg': if camera_config.get('@proto') == 'mjpeg':
config.rem_camera(camera_id) config.rem_camera(camera_id)
logging.debug('renaming thread files') logging.debug('renaming camera files')
for name in os.listdir(settings.CONF_PATH): for name in os.listdir(settings.CONF_PATH):
if re.match('^thread-\d+.conf.bak$', name): if re.match('^camera-\d+.conf.bak$', name):
os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name[:-4])) os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name[:-4]))
_streameye_enabled = False _streameye_enabled = False

6
board/raspberrypi2/overlay/etc/init.d/S84streameye
View File

@ -6,11 +6,11 @@ MOTIONEYE_CONF_DIR="/data/etc/"
test -n "${OS_VERSION}" || source /etc/init.d/base test -n "${OS_VERSION}" || source /etc/init.d/base
enabled() { enabled() {
test $(ls -1 ${MOTIONEYE_CONF_DIR}/thread-*.conf 2>/dev/null| wc -l) == 1 || return 1 test $(ls -1 ${MOTIONEYE_CONF_DIR}/camera-*.conf 2>/dev/null| wc -l) == 1 || return 1
grep '# @proto mjpeg' ${MOTIONEYE_CONF_DIR}/thread-1.conf &>/dev/null || return 1 grep '# @proto mjpeg' ${MOTIONEYE_CONF_DIR}/camera-1.conf &>/dev/null || return 1
grep -E '# @url http://(.*)127.0.0.1:' ${MOTIONEYE_CONF_DIR}/thread-1.conf &>/dev/null || return 1 grep -E '# @url http://(.*)127.0.0.1:' ${MOTIONEYE_CONF_DIR}/camera-1.conf &>/dev/null || return 1
return 0 return 0
} }

2
board/raspberrypi2/overlay/usr/bin/streameye.sh
View File

@ -54,7 +54,7 @@ function start() {
function stop() { function stop() {
# stop the streameye background watch process # stop the streameye background watch process
ps | grep streameye.sh | grep -v $$ | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill ps | grep streameye.sh | grep -v $$ | grep -v S94streameye| grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill
# stop the raspimjpeg process # stop the raspimjpeg process
pid=$(ps | grep raspimjpeg.py | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1) pid=$(ps | grep raspimjpeg.py | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1)

10
board/raspberrypi3/motioneye-modules/streameyectl.py
View File

@ -187,13 +187,13 @@ def _set_streameye_enabled(enabled):
config._camera_ids_cache = [] config._camera_ids_cache = []
logging.debug('disabling all cameras in motion.conf') logging.debug('disabling all cameras in motion.conf')
cmd = 'sed -r -i "s/^thread (.*)/#thread \\1/" /data/etc/motion.conf &>/dev/null' cmd = 'sed -r -i "s/^camera (.*)/#camera \\1/" /data/etc/motion.conf &>/dev/null'
if os.system(cmd): if os.system(cmd):
logging.error('failed to disable cameras in motion.conf') logging.error('failed to disable cameras in motion.conf')
logging.debug('renaming thread files') logging.debug('renaming camera files')
for name in os.listdir(settings.CONF_PATH): for name in os.listdir(settings.CONF_PATH):
if re.match('^thread-\d+.conf$', name): if re.match('^camera-\d+.conf$', name):
os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name + '.bak')) os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name + '.bak'))
logging.debug('adding simple mjpeg camera') logging.debug('adding simple mjpeg camera')
@ -231,9 +231,9 @@ def _set_streameye_enabled(enabled):
if camera_config.get('@proto') == 'mjpeg': if camera_config.get('@proto') == 'mjpeg':
config.rem_camera(camera_id) config.rem_camera(camera_id)
logging.debug('renaming thread files') logging.debug('renaming camera files')
for name in os.listdir(settings.CONF_PATH): for name in os.listdir(settings.CONF_PATH):
if re.match('^thread-\d+.conf.bak$', name): if re.match('^camera-\d+.conf.bak$', name):
os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name[:-4])) os.rename(os.path.join(settings.CONF_PATH, name), os.path.join(settings.CONF_PATH, name[:-4]))
_streameye_enabled = False _streameye_enabled = False

6
board/raspberrypi3/overlay/etc/init.d/S84streameye
View File

@ -6,11 +6,11 @@ MOTIONEYE_CONF_DIR="/data/etc/"
test -n "${OS_VERSION}" || source /etc/init.d/base test -n "${OS_VERSION}" || source /etc/init.d/base
enabled() { enabled() {
test $(ls -1 ${MOTIONEYE_CONF_DIR}/thread-*.conf 2>/dev/null| wc -l) == 1 || return 1 test $(ls -1 ${MOTIONEYE_CONF_DIR}/camera-*.conf 2>/dev/null| wc -l) == 1 || return 1
grep '# @proto mjpeg' ${MOTIONEYE_CONF_DIR}/thread-1.conf &>/dev/null || return 1 grep '# @proto mjpeg' ${MOTIONEYE_CONF_DIR}/camera-1.conf &>/dev/null || return 1
grep -E '# @url http://(.*)127.0.0.1:' ${MOTIONEYE_CONF_DIR}/thread-1.conf &>/dev/null || return 1 grep -E '# @url http://(.*)127.0.0.1:' ${MOTIONEYE_CONF_DIR}/camera-1.conf &>/dev/null || return 1
return 0 return 0
} }

2
board/raspberrypi3/overlay/usr/bin/streameye.sh
View File

@ -54,7 +54,7 @@ function start() {
function stop() { function stop() {
# stop the streameye background watch process # stop the streameye background watch process
ps | grep streameye.sh | grep -v $$ | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill ps | grep streameye.sh | grep -v $$ | grep -v S94streameye| grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill
# stop the raspimjpeg process # stop the raspimjpeg process
pid=$(ps | grep raspimjpeg.py | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1) pid=$(ps | grep raspimjpeg.py | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1)