mirror/xiaomi-dafang-hacks
1
0
Fork 0
mirror of https://github.com/EliasKotlyar/Xiaomi-Dafang-Hacks.git synced 2025-09-03 13:12:44 +02:00
Code Issues Releases Wiki Activity

Some cleanup in detectionOn.sh (#1764)

Browse Source
This commit is contained in:
Chris Osgood
2021-08-05 04:42:46 -04:00
committed by GitHub
parent 3ccc8bd65c
commit 7db553fa4b
1 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
firmware_mod/scripts/detectionOn.sh
View File

@@ -40,7 +40,7 @@ send_snapshot() {
if [ "$telegram_alert_type" = "text" ] ; then
debug_msg "Send telegram text"
/system/sdcard/bin/telegram m "Motion detected"
elif [ "$telegram_alert_type" = "image" -o "$telegram_alert_type" = "video+image" ] ; then
elif [ "$telegram_alert_type" = "image" -o "$telegram_alert_type" = "video+image" ] ; then
debug_msg "Send telegram image"
/system/sdcard/bin/telegram p "$snapshot_tempfile"
fi
@@ -62,8 +62,7 @@ send_snapshot() {
) &
fi
#save FTP snapshot
# Save FTP snapshot
if [ "$ftp_snapshot" = true ]; then
(
ftpput_cmd="/system/sdcard/bin/busybox ftpput"
@@ -84,10 +83,9 @@ send_snapshot() {
) &
fi
#save Dropbox snapshot
# Save Dropbox snapshot
if [ "$dropbox_snapshot" = true ]; then
(
debug_msg "Sending Dropbox snapshot to $dropbox_stills_dir/$filename.jpg"
/system/sdcard/bin/curl -X POST "$dropbox_url" \
--header "Authorization: Bearer $dropbox_token" \
@@ -97,17 +95,15 @@ send_snapshot() {
) &
fi
# Save a snapshot
if [ "$save_snapshot" = true ] ; then
(
debug_msg "Save snapshot to $save_snapshot_dir/$groupname/$filename.jpg"
# Save a snapshot
if [ "$save_snapshot" = true ] ; then
(
debug_msg "Save snapshot to $save_snapshot_dir/$groupname/$filename.jpg"
if [ ! -d "$save_snapshot_dir/$groupname" ]; then
mkdir -p "$save_snapshot_dir/$groupname"
chmod "$save_dirs_attr" "$save_snapshot_dir/$groupname"
fi
if [ ! -d "$save_snapshot_dir/$groupname" ]; then
mkdir -p "$save_snapshot_dir/$groupname"
chmod "$save_dirs_attr" "$save_snapshot_dir/$groupname"
fi
# Limit the number of snapshots
if [ "$(ls "$save_snapshot_dir" | wc -l)" -ge "$max_snapshot_days" ]; then
@@ -119,7 +115,7 @@ send_snapshot() {
) &
fi
## Save SMB snapshot
# Save SMB snapshot
if [ "$smb_snapshot" = true ]; then
(
smbclient_cmd="/system/bin/smbclient $smb_share"
@@ -137,6 +133,7 @@ send_snapshot() {
$smbclient_cmd -D "$smb_stills_path" -c "lcd /tmp; mkdir $groupname; cd $groupname; put $snapshot_tempfilename; rename $snapshot_tempfilename $filename.jpg"
) &
fi
# Wait for all background jobs to finish before existing
debug_msg "Waiting for background jobs to end in send_snapshot function:"
for jobpid in $(jobs -p); do
@@ -147,11 +144,11 @@ send_snapshot() {
}
record_video () {
# We only want one video stream at a time. Try to grab an
# exclusive flock on file descriptor 5. Bail out if another
# process already has it. Touch the flock to update it's mod
# time as a signal to the background process to keep recording
# when motion is repeatedly observed.
# We only want one video stream at a time. Try to grab an exclusive
# flock on file descriptor 5. Bail out if another process already has
# it. Touch the flock to update its mod time as a signal to the
# background process to keep recording when motion is repeatedly
# observed.
touch /run/recording_video.flock
exec 5<> /run/recording_video.flock
if /system/sdcard/bin/busybox flock -n -x 5; then
@@ -165,7 +162,6 @@ record_video () {
else
/system/sdcard/bin/openRTSP -4 -w "$video_rtsp_w" -h "$video_rtsp_h" -f "$video_rtsp_f" -d "$video_duration" -b "$output_buffer_size" rtsp://$USERNAME:$USERPASSWORD@127.0.0.1:$PORT/unicast > "$video_tempfile"
fi
else
# Use avconv to stitch multiple JPEGs into 1fps video.
# I couldn't get it working another way.
@@ -228,7 +224,6 @@ fi
# Next, start background tasks for all configured video notifications
# Save the video
if [ "$save_video" = true ] ; then
(
@@ -264,11 +259,11 @@ if [ "$ftp_video" = true ]; then
fi
ftpput_cmd="$ftpput_cmd $ftp_host"
# We only want one video stream at a time. Try to grab an
# exclusive flock on file descriptor 5. Bail out if another
# process already has it. Touch the flock to update it's mod
# time as a signal to the background process to keep recording
# when motion is repeatedly observed.
# We only want one video stream at a time. Try to grab an exclusive
# flock on file descriptor 5. Bail out if another process already has
# it. Touch the flock to update it's mod time as a signal to the
# background process to keep recording when motion is repeatedly
# observed.
touch /run/ftp_motion_video_stream.flock
exec 5<> /run/ftp_motion_video_stream.flock
if /system/sdcard/bin/busybox flock -n -x 5; then
@@ -277,10 +272,10 @@ if [ "$ftp_video" = true ]; then
# XXX Uses avconv to stitch multiple JPEGs into 1fps video.
# I couldn't get it working another way. /dev/videoX inputs
# fail. Localhost rtsp takes very long (10+ seconds) to
# start streaming and gets flaky when when memory or cpu
# are pegged. This is a clugy method, but works well even
# at high res, fps, cpu, and memory load!
# fail. Localhost rtsp takes very long (10+ seconds) to start
# streaming and gets flaky when when memory or cpu are pegged.
# This is a clugy method, but works well even at high res,
# fps, cpu, and memory load!
( while [ "$(/system/sdcard/bin/busybox date "+%s")" -le "$(/system/sdcard/bin/busybox expr "$(/system/sdcard/bin/busybox stat -c "%X" /run/ftp_motion_video_stream.flock)" + "$video_duration")" ]; do
/system/sdcard/bin/getimage
sleep 1
@@ -297,21 +292,17 @@ if [ "$ftp_video" = true ]; then
) &
fi
#save Dropbox video
if [ "$dropbox_video" = true ]; then
(
debug_msg "Saving Dropbox snapshot to $dropbox_videos_dir/$filename.mp4"
/system/sdcard/bin/curl -X POST "$dropbox_url" \
--header "Authorization: Bearer $dropbox_token" \
--header "Dropbox-API-Arg: {\"path\": \"$dropbox_videos_dir/$filename.mp4\"}" \
--header "Content-Type: application/octet-stream" \
--data-binary @"$video_tempfile"
) &
fi
# Save Dropbox video
if [ "$dropbox_video" = true ]; then
(
debug_msg "Saving Dropbox snapshot to $dropbox_videos_dir/$filename.mp4"
/system/sdcard/bin/curl -X POST "$dropbox_url" \
--header "Authorization: Bearer $dropbox_token" \
--header "Dropbox-API-Arg: {\"path\": \"$dropbox_videos_dir/$filename.mp4\"}" \
--header "Content-Type: application/octet-stream" \
--data-binary @"$video_tempfile"
) &
fi
# SMB snapshot and video
if [ "$smb_video" = true ]; then
@@ -354,7 +345,7 @@ if [ "$send_telegram" = true ]; then
(
include /system/sdcard/config/telegram.conf
if [ "$telegram_alert_type" = "video" -o "$telegram_alert_type" = "video+image" ] ; then
if [ "$telegram_alert_type" = "video" -o "$telegram_alert_type" = "video+image" ] ; then
if [ "$video_use_rtsp" = true ]; then
if [ "$AUDIOFORMAT" = "PCMU" ] || [ "$AUDIOFORMAT" = "OFF" ] ; then
# Convert file to mp4 and remove audio stream so video plays in telegram app
@@ -365,7 +356,7 @@ if [ "$send_telegram" = true ]; then
else
# avconv can't strip audio it doesn't understand
debug_msg "Send telegram video (only viable for external playback)"
/system/sdcard/bin/telegram v "$video_tempfile"
/system/sdcard/bin/telegram v "$video_tempfile"
fi
else
/system/sdcard/bin/avconv -i "$video_tempfile" "$video_tempfile-lo.mp4"
@@ -396,10 +387,10 @@ fi
# Run any user scripts.
for i in /system/sdcard/config/userscripts/motiondetection/*; do
if [ -x "$i" ]; then
debug_msg "Running: $i on $snapshot_tempfile"
$i on "$snapshot_tempfile" "$video_tempfile" &
fi
if [ -x "$i" ]; then
debug_msg "Running: $i on $snapshot_tempfile"
$i on "$snapshot_tempfile" "$video_tempfile" &
fi
done
# Wait for all background jobs to finish before exiting and deleting tempfile