mirror/xiaomi-dafang-hacks
1
0
Fork 0
mirror of https://github.com/EliasKotlyar/Xiaomi-Dafang-Hacks.git synced 2025-09-08 23:20:48 +02:00
Code Issues Releases Wiki Activity

Fix FTP video upload fail #1199 (#1200)

Browse Source 
* Fixed new stills/video target dir path

* Remove groupname in ftp_* as dir creation is not supported
This commit is contained in:
Seweryn Zeman
2019-10-18 16:50:23 +02:00
committed by jmtatsch
parent 37cce78775
commit 159ccef004
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware_mod/scripts/detectionOn.sh
View File

@@ -121,8 +121,8 @@ if [ "$ftp_snapshot" = true -o "$ftp_video" = true ]; then
ftpput_cmd="$ftpput_cmd $ftp_host" ftpput_cmd="$ftpput_cmd $ftp_host"
if [ "$ftp_snapshot" = true ]; then if [ "$ftp_snapshot" = true ]; then
debug_msg "Sending FTP snapshot to ftp://$ftp_host/$ftp_stills_dir/$groupname/$filename.jpg" debug_msg "Sending FTP snapshot to ftp://$ftp_host/$ftp_stills_dir/$filename.jpg"
$ftpput_cmd "$ftp_stills_dir/$groupname/$filename.jpg" "$snapshot_tempfile" $ftpput_cmd "$ftp_stills_dir/$filename.jpg" "$snapshot_tempfile"
fi fi
if [ "$ftp_video" = true ]; then if [ "$ftp_video" = true ]; then
@@ -135,7 +135,7 @@ if [ "$ftp_snapshot" = true -o "$ftp_video" = true ]; then
exec 5<> /run/ftp_motion_video_stream.flock exec 5<> /run/ftp_motion_video_stream.flock
if /system/sdcard/bin/busybox flock -n -x 5; then if /system/sdcard/bin/busybox flock -n -x 5; then
# Got the lock # Got the lock
debug_msg "Begin FTP video stream to ftp://$ftp_host/$ftp_videos_dir/$groupname/$filename.avi for $video_duration seconds" debug_msg "Begin FTP video stream to ftp://$ftp_host/$ftp_videos_dir/$filename.avi for $video_duration seconds"
# XXX Uses avconv to stitch multiple JPEGs into 1fps video. # XXX Uses avconv to stitch multiple JPEGs into 1fps video.
# I couldn't get it working another way. /dev/videoX inputs # I couldn't get it working another way. /dev/videoX inputs
@@ -148,7 +148,7 @@ if [ "$ftp_snapshot" = true -o "$ftp_video" = true ]; then
sleep 1 sleep 1
done ) \ done ) \
| /system/sdcard/bin/avconv -analyzeduration 0 -f image2pipe -r 1 -c:v mjpeg -c:a none -i - -c:v copy -c:a none -f avi - 2>/dev/null \ | /system/sdcard/bin/avconv -analyzeduration 0 -f image2pipe -r 1 -c:v mjpeg -c:a none -i - -c:v copy -c:a none -f avi - 2>/dev/null \
| $ftpput_cmd "$ftp_videos_dir/$groupname/$filename.avi" - & | $ftpput_cmd "$ftp_videos_dir/$filename.avi" - &
else else
debug_msg "FTP video stream already running, continued another $video_duration seconds" debug_msg "FTP video stream already running, continued another $video_duration seconds"
fi fi
@@ -227,7 +227,7 @@ if [ "$send_telegram" = true ]; then
/system/sdcard/bin/telegram p "$snapshot_tempfile" /system/sdcard/bin/telegram p "$snapshot_tempfile"
elif [ "$telegram_alert_type" = "video" ] ; then elif [ "$telegram_alert_type" = "video" ] ; then
debug_msg "Send telegram video" debug_msg "Send telegram video"
/system/sdcard/bin/avconv -i "$video_tempfile" "$video_tempfile-lo.mp4" /system/sdcard/bin/avconv -i "$video_tempfile" "$video_tempfile-lo.mp4"
/system/sdcard/bin/telegram v "$video_tempfile-lo.mp4" /system/sdcard/bin/telegram v "$video_tempfile-lo.mp4"
rm "$video_tempfile-lo.mp4" rm "$video_tempfile-lo.mp4"
fi fi