Update for new ansible version

8 files changed, 53 insertions, 32 deletions

diff --git a/roles/prerec/tasks/main.yml b/roles/prerec/tasks/main.yml
index 8144e28..5b39977 100644
--- a/roles/prerec/tasks/main.yml
+++ b/roles/prerec/tasks/main.yml
@@ -33,7 +33,7 @@
     owner: "{{ emacsconf_user }}"
     group: "{{ emacsconf_group }}"
 - name: Recreate encoding script and backup old one
-  tags: process-prerec
+  tags: process-prerec, prerec-scripts
   template:
     src: "reencode.sh"
     dest: "{{ emacsconf_caption_dir }}/scripts/reencode.sh"
@@ -41,8 +41,12 @@
     group: "{{ emacsconf_group }}"
     backup: yes
     mode: 0775
+- name: Get UIDs
+  tags: process-prerec, prerec-scripts
+  getent:
+    database: passwd
 - name: Copy scripts for processing
-  tags: process-prerec
+  tags: process-prerec, prerec-scripts
   template:
     src: "{{ item }}"
     dest: "/usr/local/bin/{{ item }}"
@@ -59,9 +63,11 @@
     - reencode.sh
     - run-aeneas.sh
     - rename-original.sh
+    - copy-original.sh
     - mux-subs.sh
     - verify-main.sh
     - remux.sh
+    - get-file-prefix
 - name: Copy Makefile
   template:
     src: Makefile
diff --git a/roles/prerec/templates/process-prerec.sh b/roles/prerec/templates/process-prerec.sh
index 795753d..d98337f 100755
--- a/roles/prerec/templates/process-prerec.sh
+++ b/roles/prerec/templates/process-prerec.sh
@@ -5,14 +5,9 @@ ORIGINAL=$1
 REENCODED=$(echo "$ORIGINAL" | perl -pe 's/^(emacsconf-[0-9]*-.*?--.*?--.*?--).*/$1reencoded.webm/')
 SLUG=$(echo "$ORIGINAL" | perl -ne '/^emacsconf-[0-9]*-(.*?)--/ && print $1')
 MAIN=$(echo "$ORIGINAL" | perl -pe 's/^(emacsconf-[0-9]*-.*?--.*?--.*?--).*/$1main.webm/')
-SCREEN=reencode-$SLUG
-if ! ( screen -ls | grep -q $SLUG ); then
-    screen -dmS $SCREEN
-fi
 # ( cd /data/emacsconf/cache; ./update-cache )
-# /data/emacsconf/{{ emacsconf_year }}/scripts/talk $SLUG "WAITING_FOR_PREREC" "PROCESSING"
+# /data/emacsconf/admin/{{ emacsconf_year }}/scripts/talk $SLUG "WAITING_FOR_PREREC" "PROCESSING"
 if [[ ! -f "$REENCODED" ]]; then
-   screen -S $SCREEN -X screen -t reencode-$SLUG /bin/bash -c "/data/emacsconf/{{ emacsconf_year }}/scripts/reencode.sh \"$ORIGINAL\" \"$REENCODED\" && /data/emacsconf/{{ emacsconf_year }}/scripts/upload.sh $REENCODED $MAIN && /data/emacsconf/{{ emacsconf_year }}/scripts/thumbnail.sh \"$MAIN\" && /data/emacsconf/{{ emacsconf_year }}/scripts/upload.sh $(echo "$MAIN" | sed s/webm$/png/) exec /bin/bash" &
+   screen -dmS reencode-$SLUG /bin/bash -c "reencode.sh \"$ORIGINAL\" \"$REENCODED\" && upload.sh $REENCODED $MAIN && thumbnail.sh \"$MAIN\" && upload.sh $(echo "$MAIN" | sed s/webm$/png/); echo $(date -Iminutes) $SLUG reencoded >> ~/emacsconf.log && exec /bin/bash" &
 fi
-screen -S $SCREEN -X screen -t captions-$SLUG /bin/bash -c "/data/emacsconf/{{ emacsconf_year }}/scripts/process-captions.py $(dirname $ORIGINAL); exec /bin/bash"
-screen -x $SCREEN
+screen -dmS captions-$SLUG /bin/bash -c "/data/emacsconf/admin/{{ emacsconf_year }}/scripts/process-captions.py $(dirname $ORIGINAL); echo $(date -Iminutes) $SLUG captioned >> ~/emacsconf.log; exec /bin/bash"
diff --git a/roles/prerec/templates/reencode.sh b/roles/prerec/templates/reencode.sh
index b0bdfc7..665fee2 100755
--- a/roles/prerec/templates/reencode.sh
+++ b/roles/prerec/templates/reencode.sh
@@ -33,7 +33,7 @@ shift `expr $OPTIND - 1`
 OPTIND=1
 
 input="$1"
-output="$2"
+output="${2:-$(echo $input | sed 's/--original.*/--reencoded.webm/')}"
 
 command="$(cat<<EOF
 ffmpeg -y -i "$input" $time_limit \
diff --git a/roles/prerec/templates/remux.sh b/roles/prerec/templates/remux.sh
index c378133..2d2320b 100755
--- a/roles/prerec/templates/remux.sh
+++ b/roles/prerec/templates/remux.sh
@@ -1,20 +1,29 @@
 #!/usr/bin/env bash
 # {{ ansible_managed }}
 # Mix in the normalized audio
-# Usage: remux.sh $input_video
+# Usage: remux.sh $input_video_or_slug
 
 with_suffix() {
-    echo "$input_video" | sed "s/--\(reencoded\|original\).webm\$/--$1/"
+    echo "$input_video" | sed "s/--\(main\|reencoded\|original\).webm\$/--$1/"
 }
 
 input_video="$1"
+if [ ! -f $input_video ]; then
+		# treat it as a slug
+		input_video=$(get-file-prefix $1)--reencoded.webm
+fi
+
 input_audio="$(with_suffix "normalized.opus")"
 output_video="$(with_suffix "final.webm")"
 main_video="$(with_suffix "main.webm")"
 main_subs="$(with_suffix "main.vtt")"
 
+if cat $main_subs | head -1 | grep captioned; then
+		$subs = "-i $main_subs"
+fi
+
 command="$(cat<<EOF
-ffmpeg -i "$input_video" -i "$input_audio" -c:v copy -c:a copy -map 0:v:0 -map 1:a:0 "$output_video" &&
+ffmpeg -y -i "$input_video" -i "$input_audio" $subs -c:v copy -c:a copy -map 0:v:0 -map 1:a:0 "$output_video" &&
        cp "$output_video" "$main_video" &&
        if [[ -f "$main_subs" ]]; then touch -m "$main_subs"; fi
 EOF
@@ -23,14 +32,18 @@ EOF
 printf "input: %s\ncomputed output: %s\nrelated main: %s\n\n" "$input_video" "$output_video" "$main_video"
 printf "Produced incantation:\n%s\n\n" "$command"
 
-while true;
-do
-    read -r -p "Run it?  y/n " -n 1 -r response
-    if [[ $response =~ ^([yY])$ ]]; then
-        eval "$command"
-        exit 0
-    else
-        printf "\nExiting\n"
-        exit 3
-    fi
-done
+if [ -z "$CONFIRMED" ]; then
+		eval "$command"
+else
+		while true;
+		do
+				read -r -p "Run it?  y/n " -n 1 -r response
+				if [[ $response =~ ^([yY])$ ]]; then
+						eval "$command"
+						exit 0
+				else
+						printf "\nExiting\n"
+						exit 3
+				fi
+		done
+fi
diff --git a/roles/prerec/templates/rename-original.sh b/roles/prerec/templates/rename-original.sh
index 0499ae8..ed085ed 100755
--- a/roles/prerec/templates/rename-original.sh
+++ b/roles/prerec/templates/rename-original.sh
@@ -8,7 +8,7 @@ EXTRA=""
 if [ -z ${3-unset} ]; then
 		EXTRA=""
 elif [ -n "$3" ]; then
-		EXTRA="--$3"
+		EXTRA="$3"
 elif echo "$FILE" | grep -e '\(webm\|mp4\|mov\)'; then
 		EXTRA="--original"
 fi
@@ -16,8 +16,13 @@ filename=$(basename -- "$FILE")
 extension="${filename##*.}"
 filename="${filename%.*}"
 FILE_PREFIX=$(jq -r '.talks[] | select(.slug=="'$SLUG'")["file-prefix"]' < $TALKS_JSON)
-mv "$FILE" $FILE_PREFIX$EXTRA.$extension
-echo $FILE_PREFIX$EXTRA.$extension
+if echo "$FILE" | grep -q \\. ; then
+		mv "$FILE" $FILE_PREFIX$EXTRA.$extension
+		echo $FILE_PREFIX$EXTRA.$extension
+else
+		mv "$FILE" $FILE_PREFIX$EXTRA
+		echo $FILE_PREFIX$EXTRA
+fi
 # Copy to original if needed
 if [ -f $FILE_PREFIX--original.webm ] && [ ! -f $FILE_PREFIX--main.$extension ]; then
 		cp $FILE_PREFIX--original.$extension $FILE_PREFIX--main.webm
diff --git a/roles/prerec/templates/run-aeneas.sh b/roles/prerec/templates/run-aeneas.sh
index 8246c85..a9e27f4 100755
--- a/roles/prerec/templates/run-aeneas.sh
+++ b/roles/prerec/templates/run-aeneas.sh
@@ -11,4 +11,4 @@ if [ ! -f $BASE--whisper.vtt ]; then
 fi
 python3 -m aeneas.tools.execute_task $AUDIO *.txt "task_language=eng|os_task_file_format=vtt|is_text_type=plain" ${BASE}--aeneas.vtt
 cp ${BASE}--aeneas.vtt ${BASE}--main.vtt
-/data/emacsconf/{{ emacsconf_year }}/scripts/upload.sh ${BASE}--main.vtt
+/data/emacsconf/admin/{{ emacsconf_year }}/scripts/upload.sh ${BASE}--main.vtt
diff --git a/roles/prerec/templates/talk b/roles/prerec/templates/talk
index 0531cda..fa2e5f0 100755
--- a/roles/prerec/templates/talk
+++ b/roles/prerec/templates/talk
@@ -6,6 +6,8 @@
 SLUG="$1"
 FROM_STATUS="$2"
 TO_STATUS="$3"
+XDG_RUNTIME_DIR=/run/user/{{ getent_passwd[emacsconf_user].1 }}
+
 if [ "x$TO_STATUS" == "x" ]; then
     FROM_STATUS=.
     TO_STATUS="$2"
@@ -14,7 +16,7 @@ cd {{ emacsconf_private_dir }}
 #echo "Pulling conf.org..."
 #git pull
 echo "Updating status..."
-emacsclient --eval "(emacsconf-with-todo-hooks (emacsconf-update-talk-status \"$SLUG\" \"$FROM_STATUS\" \"$TO_STATUS\"))" -a emacs
+XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR emacsclient --eval "(emacsconf-with-todo-hooks (emacsconf-update-talk-status \"$SLUG\" \"$FROM_STATUS\" \"$TO_STATUS\"))" -a emacs
 #echo "Committing and pushing in the background"
 #git commit -m "Update task status for $SLUG from $FROM_STATUS to $TO_STATUS" conf.org
 #git push &
diff --git a/roles/prerec/templates/upload.sh b/roles/prerec/templates/upload.sh
index f3dc9c5..fbf3025 100755
--- a/roles/prerec/templates/upload.sh
+++ b/roles/prerec/templates/upload.sh
@@ -2,5 +2,5 @@
 # {{ ansible_managed }}
 
 scp $* orga@media.emacsconf.org:~/backstage
-/data/emacsconf/{{ emacsconf_year }}/scripts/publish-backstage-index.sh
-rsync -avze ssh orga@media.emacsconf.org:~/backstage/ /data/emacsconf/cache/
+/data/emacsconf/admin/{{ emacsconf_year }}/scripts/publish-backstage-index.sh
+rsync -avze ssh orga@media.emacsconf.org:~/backstage/ /data/emacsconf/admin/cache/