update caption dir and assets dir

6 files changed, 31 insertions, 25 deletions

diff --git a/roles/obs/templates/intro b/roles/obs/templates/intro
index 7b5d4ab..bf02dc3 100755
--- a/roles/obs/templates/intro
+++ b/roles/obs/templates/intro
@@ -8,7 +8,7 @@ fi
 SLUG=$1
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE--*.webm)
+    LIST=({{ emacsconf_caption_dir }}/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE--*.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 else
@@ -16,8 +16,8 @@ else
 fi
 shift
 overlay $SLUG
-if [[ -f /data/emacsconf/assets/intros/$SLUG.webm ]]; then
-  mpv /data/emacsconf/assets/intros/$SLUG.webm
+if [[ -f {{ emacsconf_caption_dir }}/assets/intros/$SLUG.webm ]]; then
+  mpv {{ emacsconf_caption_dir }}/assets/intros/$SLUG.webm
 else
-  firefox /data/emacsconf/assets/in-between/$SLUG.png
+  firefox {{ emacsconf_caption_dir }}/assets/in-between/$SLUG.png
 fi
diff --git a/roles/obs/templates/mpv-track b/roles/obs/templates/mpv-track
index a7f3c62..f8e8d04 100755
--- a/roles/obs/templates/mpv-track
+++ b/roles/obs/templates/mpv-track
@@ -10,7 +10,7 @@ fi
 # Update the overlay
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*.webm)
+    LIST=({{ emacsconf_caption_dir }}/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 fi
diff --git a/roles/obs/templates/overlay b/roles/obs/templates/overlay
index 5f967ec..1361884 100755
--- a/roles/obs/templates/overlay
+++ b/roles/obs/templates/overlay
@@ -3,17 +3,20 @@
 
 SLUG=$(echo "$1" | perl -ne 'if (/emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
 
-if [[ -f /data/emacsconf/assets/overlays/$SLUG-other.png ]]; then
+if [[ -f {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-other.svg.png ]]; then
     echo "Found other overlay for $SLUG, copying"
-    cp /data/emacsconf/assets/overlays/$SLUG-other.png ~/other.png
+    cp {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-other.svg.png ~/other.png
+elif [[ -f {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png ]]; then
+    echo "Found video overlay for $SLUG, copying"
+    cp {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png ~/other.png
 else
-    echo "Could not find /data/emacsconf/assets/overlays/$SLUG-other.png, please override ~/other.png manually"
-    cp /data/emacsconf/assets/overlays/blank-other.png ~/other.png
+    echo "Could not find {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-other.svg.png, please override ~/other.png manually"
+    cp {{ emacsconf_caption_dir }}/assets/overlays/blank-other.svg.png ~/other.png
 fi
-if [[ -f /data/emacsconf/assets/overlays/$SLUG-video.png ]]; then
+if [[ -f {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png ]]; then
     echo "Found video overlay for $SLUG, copying"
-    cp /data/emacsconf/assets/overlays/$SLUG-video.png ~/video.png
+    cp {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png ~/video.png
 else
-    echo "Could not find /data/emacsconf/assets/overlays/$SLUG-video.png, override ~/video.png manually"
-    cp /data/emacsconf/assets/overlays/blank-video.png ~/video.png
+    echo "Could not find {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png, override ~/video.png manually"
+    cp {{ emacsconf_caption_dir }}/assets/overlays/blank-video.svg.png ~/video.png
 fi
diff --git a/roles/obs/templates/play b/roles/obs/templates/play
index 4f437a8..20fd24c 100755
--- a/roles/obs/templates/play
+++ b/roles/obs/templates/play
@@ -10,7 +10,7 @@ fi
 # Update the overlay
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*--main.webm)
+    LIST=({{ emacsconf_caption_dir }}/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*--main.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 fi
diff --git a/roles/obs/templates/play-with-intro b/roles/obs/templates/play-with-intro
index 75ce10d..1b1b9a5 100755
--- a/roles/obs/templates/play-with-intro
+++ b/roles/obs/templates/play-with-intro
@@ -10,7 +10,7 @@ fi
 # Update the overlay
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*.webm)
+    LIST=({{ emacsconf_caption_dir }}/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 fi
@@ -18,7 +18,7 @@ shift
 SLUG=$(echo "$FILE" | perl -ne 'if (/emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
 overlay $SLUG
 # Play the video
-if [[ -f /data/emacsconf/assets/intros/$SLUG.webm ]]; then
+if [[ -f {{ emacsconf_caption_dir }}/assets/intros/$SLUG.webm ]]; then
     intro $SLUG
 fi
 mpv $FILE $* &
diff --git a/roles/obs/templates/set-overlay b/roles/obs/templates/set-overlay
index 212df71..0b6712b 100644
--- a/roles/obs/templates/set-overlay
+++ b/roles/obs/templates/set-overlay
@@ -1,22 +1,25 @@
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-[0-9][0-9][0-9][0-9]-$FILE*.webm)
+    LIST=({{ emacsconf_caption_dir }}/assets/stream/emacsconf-[0-9][0-9][0-9][0-9]-$FILE*.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 fi
 shift
 SLUG=$(echo "$FILE" | perl -ne 'if (/^emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
-if [[ -f /data/emacsconf/assets/overlays/$SLUG-other.png ]]; then
+if [[ -f {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-other.svg.png ]]; then
     echo "Found other overlay for $SLUG, copying"
-    cp /data/emacsconf/assets/overlays/$SLUG-other.png ~/other.png
+    cp {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-other.svg.png ~/other.png
+elif [[ -f {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png ]]; then
+    echo "Found video overlay for $SLUG, copying"
+    cp {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png ~/other.png
 else
-    echo "Could not find /data/emacsconf/assets/overlays/$SLUG-other.png, please override ~/other.png manually"
-    cp /data/emacsconf/assets/overlays/blank-other.png ~/other.png
+    echo "Could not find {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-other.svg.png, please override ~/other.png manually"
+    cp {{ emacsconf_caption_dir }}/assets/overlays/blank-other.svg.png ~/other.png
 fi
-if [[ -f /data/emacsconf/assets/overlays/$SLUG-video.png ]]; then
+if [[ -f {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png ]]; then
     echo "Found video overlay for $SLUG, copying"
-    cp /data/emacsconf/assets/overlays/$SLUG-video.png ~/video.png
+    cp {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png ~/video.png
 else
-    echo "Could not find /data/emacsconf/assets/overlays/$SLUG-video.png, override ~/video.png manually"
-    cp /data/emacsconf/assets/overlays/blank-video.png ~/video.png
+    echo "Could not find {{ emacsconf_caption_dir }}/assets/overlays/$SLUG-video.svg.png, override ~/video.png manually"
+    cp {{ emacsconf_caption_dir }}/assets/overlays/blank-video.svg.png ~/video.png
 fi