fixed old motion error

diff --git a/extra/motioneye.init-debian b/extra/motioneye.init-debian
index 5d2d2941262c8f6ab65fced662b14def3ff39f8e..caf0c359778df920246a86f2908537327fa127ad 100755 (executable)
--- a/extra/motioneye.init-debian
+++ b/extra/motioneye.init-debian
@@ -14,11 +14,11 @@
 
 NAME="motioneye"
 PATH_BIN="/bin:/usr/bin:/sbin:/usr/sbin"
-DAEMON="/usr/bin/meyectl"
+DAEMON="/usr/local/bin/meyectl"
 PIDFILE="/var/run/$NAME.pid"
 DESC="motionEye server"
-USER="motion"
-OPTIONS="startserver -c /etc/motioneye/motioneye.conf -l"
+USER="root"
+OPTIONS="startserver -c /etc/motioneye/motioneye.conf -l -b"
 
 . /lib/lsb/init-functions
 
@@ -29,7 +29,7 @@ RET=0
 case "$1" in
     start)
         log_daemon_msg "Starting $DESC"
-        if start-stop-daemon --start --oknodo --exec $DAEMON -b --chuid $USER -- $OPTIONS; then
+        if start-stop-daemon --start --oknodo --exec $DAEMON --chuid $USER -- $OPTIONS; then
             log_end_msg 0
         else
             log_end_msg 1
@@ -39,7 +39,7 @@ case "$1" in
 
     stop)
         log_daemon_msg "Stopping $DESC"
-        if start-stop-daemon --stop --oknodo --exec $DAEMON --retry 5; then
+        if start-stop-daemon --stop --oknodo --pidfile $PIDFILE --retry 5; then
             log_end_msg 0
         else
             log_end_msg 1

diff --git a/motioneye.py b/motioneye.py
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/motioneye/config.py b/motioneye/config.py
index 4c4baaad69b93209df68fae6b85478a22ba742c6..bc953a37b557d483f35f747f6449a785fe35533e 100644 (file)
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -517,7 +517,7 @@ def add_camera(device_details):
         camera_config['@url'] = device_details['url']
     
     if utils.local_motion_camera(camera_config):
-        _set_default_motion_camera(camera_id, camera_config, is_old_motion())
+        _set_default_motion_camera(camera_id, camera_config)
 
         # go through the config conversion functions back and forth once
         camera_config = motion_camera_ui_to_dict(motion_camera_dict_to_ui(camera_config), camera_config)
@@ -1566,7 +1566,7 @@ def _set_default_motion(data, old_motion):
         data.setdefault('webcontrol_port', 7999)
 
 
-def _set_default_motion_camera(camera_id, data, old_motion=False):
+def _set_default_motion_camera(camera_id, data):
     data.setdefault('@name', 'Camera' + str(camera_id))
     data.setdefault('@id', camera_id)
     
@@ -1591,20 +1591,12 @@ def _set_default_motion_camera(camera_id, data, old_motion=False):
     data.setdefault('@network_password', '')
     data.setdefault('target_dir', settings.MEDIA_PATH)
     
-    if old_motion:
-        data.setdefault('webcam_localhost', False)
-        data.setdefault('webcam_port', int('808' + str(camera_id)))
-        data.setdefault('webcam_maxrate', 5)
-        data.setdefault('webcam_quality', 85)
-        data.setdefault('webcam_motion', False)
-    
-    else:
-        data.setdefault('stream_localhost', False)
-        data.setdefault('stream_port', int('808' + str(camera_id)))
-        data.setdefault('stream_maxrate', 5)
-        data.setdefault('stream_quality', 85)
-        data.setdefault('stream_motion', False)
-        data.setdefault('stream_auth_method', 0)
+    data.setdefault('stream_localhost', False)
+    data.setdefault('stream_port', int('808' + str(camera_id)))
+    data.setdefault('stream_maxrate', 5)
+    data.setdefault('stream_quality', 85)
+    data.setdefault('stream_motion', False)
+    data.setdefault('stream_auth_method', 0)
 
     data.setdefault('@webcam_resolution', 100)
     data.setdefault('@webcam_server_resize', False)
@@ -1615,12 +1607,8 @@ def _set_default_motion_camera(camera_id, data, old_motion=False):
 
     data.setdefault('@motion_detection', True)
     data.setdefault('text_changes', False)
-    if old_motion:
-        data.setdefault('locate', False)
-    
-    else:
-        data.setdefault('locate_motion_mode', False)
-        data.setdefault('locate_motion_style', 'redbox')
+    data.setdefault('locate_motion_mode', False)
+    data.setdefault('locate_motion_style', 'redbox')
     
     data.setdefault('threshold', 2000)
     data.setdefault('noise_tune', True)
@@ -1631,17 +1619,10 @@ def _set_default_motion_camera(camera_id, data, old_motion=False):
     data.setdefault('post_capture', 4)
     data.setdefault('minimum_motion_frames', 1)
     
-    if old_motion:
-        data.setdefault('output_normal', False)
-        data.setdefault('jpeg_filename', '')
-        data.setdefault('output_all', False)
-        data.setdefault('gap', 10)
-
-    else:
-        data.setdefault('output_pictures', False)
-        data.setdefault('picture_filename', '')
-        data.setdefault('emulate_motion', False)
-        data.setdefault('event_gap', 10)
+    data.setdefault('output_pictures', False)
+    data.setdefault('picture_filename', '')
+    data.setdefault('emulate_motion', False)
+    data.setdefault('event_gap', 10)
     
     data.setdefault('snapshot_interval', 0)
     data.setdefault('snapshot_filename', '')
@@ -1651,13 +1632,8 @@ def _set_default_motion_camera(camera_id, data, old_motion=False):
     data.setdefault('ffmpeg_variable_bitrate', 0)
     data.setdefault('ffmpeg_bps', 44000) # a quality of about 85% 
     data.setdefault('movie_filename', '%Y-%m-%d/%H-%M-%S')
-    if old_motion:
-        data.setdefault('max_mpeg_time', 0)
-        data.setdefault('ffmpeg_cap_new', False)
-    
-    else:
-        data.setdefault('max_movie_time', 0)
-        data.setdefault('ffmpeg_output_movies', False)
+    data.setdefault('max_movie_time', 0)
+    data.setdefault('ffmpeg_output_movies', False)
     data.setdefault('ffmpeg_video_codec', 'msmpeg4')
     data.setdefault('@preserve_movies', 0)
     

diff --git a/motioneye/server.py b/motioneye/server.py
index 42696e2b844803dca3c389cac075fa9799d64339..4278c6073ba2b047788a3d39c9e556c03b03d820 100644 (file)
--- a/motioneye/server.py
+++ b/motioneye/server.py
@@ -261,12 +261,12 @@ def test_requirements():
         logging.fatal('please install pycurl')
         sys.exit(-1)
     
-    import mediafiles
-    has_ffmpeg = mediafiles.find_ffmpeg() is not None
-    
     import motionctl
     has_motion = motionctl.find_motion() is not None
     
+    import mediafiles
+    has_ffmpeg = mediafiles.find_ffmpeg() is not None
+    
     import v4l2ctl
     has_v4lutils = v4l2ctl.find_v4l2_ctl() is not None
 
@@ -275,6 +275,9 @@ def test_requirements():
         logging.fatal('please install cifs-utils')
         sys.exit(-1)
 
+    if not has_motion:
+        logging.info('motion not installed')
+
     if not has_ffmpeg:
         if has_motion:
             logging.warn('you have motion installed, but no ffmpeg')
@@ -282,11 +285,12 @@ def test_requirements():
         else:
             logging.info('ffmpeg not installed')
 
-    if not has_motion:
-        logging.info('motion not installed')
-
     if not has_v4lutils:
-        logging.info('v4l-utils not installed')
+        if has_motion:
+            logging.warn('you have motion installed, but no v4l-utils')
+
+        else:
+            logging.info('v4l-utils not installed')
 
         
 def start_motion():