 |
tDo not randomize playlists automatically - bitreich-tv - meme tv encoding and … |
 |
git clone git://src.adamsgaard.dk/bitreich-tv |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 43e65f21c98fa9ebc6d8970e1b877db0804eed3f |
|
parent c6593d91ceb081ec0459266ece964f7741acb59b |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Thu, 27 Aug 2020 08:49:09 +0200 |
|
|
|
Do not randomize playlists automatically |
|
|
|
Diffstat: |
|
M bin/brtv-generate-playlist.sh | 6 +++--- |
|
M brtv-all.sh | 3 ++- |
|
M brtv-bitreich.sh | 1 + |
|
M brtv-corona.sh | 1 + |
|
M brtv-gopher.sh | 1 + |
|
M brtv-news.sh | 5 ++++- |
|
M brtv-slav.sh | 1 + |
|
|
|
7 files changed, 13 insertions(+), 5 deletions(-) |
|
--- |
|
diff --git a/bin/brtv-generate-playlist.sh b/bin/brtv-generate-playlist.sh |
|
t@@ -1,7 +1,7 @@ |
|
#!/bin/sh |
|
# supply hashtags.txt as stdin |
|
-# output is a randomized plaintext playlist with urls to memes and respective |
|
-# titles. |
|
+# output is a plaintext playlist with urls to memes and title slides |
|
+# titles and image memes are served on a separate host ($title_image_host) |
|
|
|
|
|
### CONFIGURATION START |
|
t@@ -23,7 +23,7 @@ add_title() { |
|
printf '%s/9/%s/%s\n' "$title_image_host" "$title_dir" "${1#\#}.${vide… |
|
} |
|
|
|
-sort -R | while read -r tag url; do |
|
+while read -r tag url; do |
|
|
|
if regeximatch "$url" '\.(mkv|webm|mp4)$'; then |
|
add_title "$tag" |
|
diff --git a/brtv-all.sh b/brtv-all.sh |
|
t@@ -6,5 +6,6 @@ set -e |
|
annna="/home/ad/code/annna" |
|
tagfile="modules/hashtags/hashtags.txt" |
|
|
|
-bin/brtv-generate-playlist.sh < "${annna}/${tagfile}" | \ |
|
+sort -R "${annna}/${tagfile}" | \ |
|
+bin/brtv-generate-playlist.sh | \ |
|
bin/brtv-playlist-to-m3u.sh |
|
diff --git a/brtv-bitreich.sh b/brtv-bitreich.sh |
|
t@@ -7,5 +7,6 @@ annna="/home/ad/code/annna" |
|
tagfile="modules/hashtags/hashtags.txt" |
|
|
|
grep -E "^#[A-z0-9-]*bitreich[A-z0-9-]* " "${annna}/${tagfile}" | \ |
|
+sort -R | \ |
|
bin/brtv-generate-playlist.sh | \ |
|
bin/brtv-playlist-to-m3u.sh |
|
diff --git a/brtv-corona.sh b/brtv-corona.sh |
|
t@@ -7,5 +7,6 @@ annna="/home/ad/code/annna" |
|
tagfile="modules/hashtags/hashtags.txt" |
|
|
|
grep -E "^#corona-" "${annna}/${tagfile}" | \ |
|
+sort -R | \ |
|
bin/brtv-generate-playlist.sh | \ |
|
bin/brtv-playlist-to-m3u.sh |
|
diff --git a/brtv-gopher.sh b/brtv-gopher.sh |
|
t@@ -7,5 +7,6 @@ annna="/home/ad/code/annna" |
|
tagfile="modules/hashtags/hashtags.txt" |
|
|
|
grep -E "^#[A-z0-9-]*gopher[A-z0-9-]* " "${annna}/${tagfile}" | \ |
|
+sort -R | \ |
|
bin/brtv-generate-playlist.sh | \ |
|
bin/brtv-playlist-to-m3u.sh |
|
diff --git a/brtv-news.sh b/brtv-news.sh |
|
t@@ -11,4 +11,7 @@ tagfile="modules/hashtags/hashtags.txt" |
|
grep 'Adding #' | sed 's/.* #/#/;s/ .*//' | \ |
|
while read -r tag; do |
|
grep "$tag" "${annna}/${tagfile}" | head -1 |
|
-done | bin/brtv-generate-playlist.sh | bin/brtv-playlist-to-m3u.sh |
|
+done | \ |
|
+sort -R | \ |
|
+bin/brtv-generate-playlist.sh | \ |
|
+bin/brtv-playlist-to-m3u.sh |
|
diff --git a/brtv-slav.sh b/brtv-slav.sh |
|
t@@ -7,5 +7,6 @@ annna="/home/ad/code/annna" |
|
tagfile="modules/hashtags/hashtags.txt" |
|
|
|
grep -E "^#slav-" "${annna}/${tagfile}" | \ |
|
+sort -R | \ |
|
bin/brtv-generate-playlist.sh | \ |
|
bin/brtv-playlist-to-m3u.sh |
