Ensure that restore never intrudes on another recording

[code/pulserecorder.git] / pulserecorder

diff --git a/pulserecorder b/pulserecorder
index 8ad87c8fcb9dc7480a8cbdfc0009a34de31ecdba..58fdec76d01f63264f22ef3e169b9e13f32eef51 100755 (executable)
--- a/pulserecorder
+++ b/pulserecorder
@@ -15,7 +15,7 @@
 #
 # The third form waits for a new sink-input to appear, and will record that.
 #
 #
 # The third form waits for a new sink-input to appear, and will record that.
 #

-# Copyright © 2020 martin f. krafft <madduck@madduck.net>
+# Copyright © 2020–2021 martin f. krafft <madduck@madduck.net>

 # Released under the teams of the Artistic Licence 2.0
 #
 set -eu
 # Released under the teams of the Artistic Licence 2.0
 #
 set -eu


@@ -72,7 +72,7 @@ pa_wait_for_event() {
   type="${1:-*}" event="${2:-*}" id="${3:-*}"
   pa_subscribe | (
     read pid
   type="${1:-*}" event="${2:-*}" id="${3:-*}"
   pa_subscribe | (
     read pid

-    #echo >&2 pa_subscribe started with PID $pid
+    #echo >&2 pa_subscribe started with PID $pid, waiting for $type/$event/$id

     while read lead xevent on xtype xid; do
       xid=${xid#\#}
       #echo >&2 "pa_subscribe: $xtype/$xevent/$xid ($type/$event/$id)"
     while read lead xevent on xtype xid; do
       xid=${xid#\#}
       #echo >&2 "pa_subscribe: $xtype/$xevent/$xid ($type/$event/$id)"


@@ -91,6 +91,28 @@ pa_get_next_index() {
   }
 }
 
   }
 }
 

+uuidgen() {
+  hascmd() { command -v "$@" >/dev/null;}
+  if   hascmd uuid; then uuid
+  elif hascmd uuidgen; then uuidgen
+  elif hascmd python3; then
+    python3 -c 'import uuid; print(uuid.uuid1())'
+  elif hascmd python; then
+    python -c 'import uuid; print(uuid.uuid1())'
+  else
+    dd if=/dev/urandom bs=16 count=1 status=none | base64
+  fi
+}
+
+if [ -z "$outfile" ]; then
+  uuid=$(uuidgen)
+  outfile="${uuid}.ogg"
+fi
+
+if [ -f "$outfile" ] && [ $clobber -eq 0 ]; then
+  echo >&2 "E: file exists, and -f not given: $outfile"
+  exit 1
+fi

 case "$index" in
 
   (last)
 case "$index" in
 
   (last)


@@ -117,29 +139,7 @@ if [ -z "$index" ]; then
   exit 1
 fi
 
   exit 1
 fi
 

-uuidgen() {
-  hascmd() { command -v "$@" >/dev/null;}
-  if   hascmd uuid; then uuid
-  elif hascmd uuidgen; then uuidgen
-  elif hascmd python3; then
-    python3 -c 'import uuid; print(uuid.uuid1())'
-  elif hascmd python; then
-    python -c 'import uuid; print(uuid.uuid1())'
-  else
-    dd if=/dev/urandom bs=16 count=1 status=none | base64
-  fi
-}
-
-uuid=$(uuidgen)
-
-[ -n "$outfile" ] || outfile="${uuid}.ogg"
-
-if [ -f "$outfile" ] && [ $clobber -eq 0 ]; then
-  echo >&2 "E: file exists, and -f not given: $outfile"
-  exit 1
-fi
-
-devname="record-to-file-${uuid}"
+devname="record-to-file-$(echo -n ${outfile%.*} | tr -c '[:alnum:]' '_')"

 
 echo >&2 "Recording source $index to $outfile …"
 
 
 echo >&2 "Recording source $index to $outfile …"
 


@@ -152,8 +152,18 @@ load_module() {
 }
 
 move_source_to_sink() {
 }
 
 move_source_to_sink() {

-  local c;
+  local c d;

   c=$(pactl list short sink-inputs | sed -rne "s,^${1}[[:space:]]+([[:digit:]]+).+,\1,p")
   c=$(pactl list short sink-inputs | sed -rne "s,^${1}[[:space:]]+([[:digit:]]+).+,\1,p")

+  d="$(pactl list short sinks | sed -rne "s,^${c}[[:space:]]+([^[:space:]]+).+,\1,p")"
+  case "$d" in
+    (record-to-file-*)
+      # Never restore to a record-to-file destination, or it could botch
+      # another recording
+      c="@DEFAULT_SINK@"
+      ;;
+    (*) :;;
+  esac
+  echo >&2 "Moving input $1 to sink $2 (restore to $c) …"

   cleanup_hook pactl move-sink-input $1 $c
   pactl move-sink-input $1 $2
 }
   cleanup_hook pactl move-sink-input $1 $c
   pactl move-sink-input $1 $2
 }