bin/process: Do not assume ~/Public/live/, so that it also works on the server

1 files changed, 15 insertions, 11 deletions

diff --git a/bin/process b/bin/process
index 8de7e00..146c4cc 100755
--- a/bin/process
+++ b/bin/process
@@ -1,12 +1,10 @@
 #!/bin/sh
 set -eu
 
-cd "${LIVEDIR:-$HOME/Public/live/}"
-
 makefile_pre() {
 	cat <<'EOF'
 .POSIX:
-FFMFLAGS = -hide_banner -loglevel info
+FFMFLAGS = -y -hide_banner -loglevel warning
 
 
 
@@ -31,23 +29,29 @@ all: $(sources.webmx) $(combined.webmx)
 
 $(combined.webmx):
 	ffmpeg $(FFMFLAGS) `printf ' -i %s' $?` $*.webm
-	ln $*.webm queue/"`basename $(*D)`".webm
+	mkdir -p processed/"`basename $(*D)`"
+	ln $*.webm processed/"`basename $(*D)`"/
 	touch $@
 EOF
 }
 
+mpds() {
+	find live/data/*/*/live.mpd | LANG=POSIX.UTF-8 sort
+}
+
 mkdeps() {
-	find data/*/*/live.mpd | varlist 'sources.mpd'
-	find data/*/*/live.mpd | cut -d/ -f1,2 | sed 's|$|/combined.webmx|' |
-		LANG=POSIX.UTF-8 sort | uniq | varlist 'combined.webmx'
+	mpds | varlist 'sources.mpd'
+	mpds | cut -d/ -f1-3 | sed 's,$,/combined.webmx,' | uniq |
+		varlist 'combined.webmx'
 	printf '\n'
 
-	find data/*/*/live.mpd | sed 's/^\(.*\)\.mpd$/\1.webmx: \1.mpd/'
-	find data/*/*/live.mpd | sed 's/^\(.*\)\.mpd$/\1.webm: \1.webmx/'
+	mpds | sed 's/^\(.*\)\.mpd$/\1.webmx:\t\1.mpd/'
+	mpds | sed 's/^\(.*\)\.mpd$/\1.webm:\t\1.webmx/'
 	printf '\n'
 
-	find data/*/*/live.mpd | sed 's/\.mpd$/.webm/' | LANG=POSIX.UTF-8 sort |
-		awk -F/ '{ printf "data/%s/combined.webmx:\t%s\n", $2, $0 }'
+	mpds | sed 's/\.mpd$/.webm/' | awk -F/ '{
+		printf "live/data/%s/combined.webmx:\t%s\n", $3, $0
+	}'
 }