From 0958bcd274395e3e6c935cbec261c23c0f1a7858 Mon Sep 17 00:00:00 2001 From: pasha Date: Tue, 9 May 2023 01:23:01 +0300 Subject: [PATCH] combine seds in peertube.sh, ytmpd check for novideo streams --- fedilives/peertube.sh | 12 +++++------- for_bigg/ytmpdplay.sh | 10 +++++++--- for_smol/ytmpdplay.sh | 25 ++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/fedilives/peertube.sh b/fedilives/peertube.sh index 744523e..1b48352 100644 --- a/fedilives/peertube.sh +++ b/fedilives/peertube.sh @@ -10,13 +10,11 @@ wget "$link" -O /tmp/videohtml ### Variables -videolink=$( grep "meta property" /tmp/videohtml | grep "og:video:url" \ - | sed 's/.*href="//' | sed 's#" />##') -chatver=$( grep 'peertube-plugin-livechat' /tmp/videohtml | grep 'version'\ - | sed 's#.*npmName..:..peertube-plugin-livechat.....name..:..livechat.....version..:..##' \ - | sed 's#.....description.....PeerTube plugin livechat: offers a way.*##' ) -instance=$(echo "$videolink" | sed 's#https://##' | sed 's#/videos/watch/.*##') -videoid=$(echo $videolink | sed 's#.*videos/watch/##') +videolink=$(grep "og:video:url" /tmp/videohtml | sed 's/.*href="//;s#" />##' ) +chatver=$(grep "peertube-plugin-livechat" /tmp/videohtml \ + | sed 's#.*npmName..:..peertube-plugin-livechat.....name..:..livechat.....version..:..##;s#.....description.....PeerTube plugin livechat: offers a way.*##' ) +instance=$(echo "$videolink" | sed 's#https://##;s#/videos/watch/.*##') +videoid=$(echo "$videolink" | sed 's#.*videos/watch/##') ### Delete html diff --git a/for_bigg/ytmpdplay.sh b/for_bigg/ytmpdplay.sh index 90eaf45..07c8909 100755 --- a/for_bigg/ytmpdplay.sh +++ b/for_bigg/ytmpdplay.sh @@ -3,8 +3,13 @@ : "${1?How to use: $0 YT_VIDEO_LINK}" yt_link="$1" -play_link=$(yt-dlp -g "$yt_link" | sed '1d') - +is_video=$(yt-dlp -g "$yt_link" | wc -l) +if [[ $is_video == 2 ]] +then + play_link=$(yt-dlp -g "$yt_link" | sed '1d') +else + play_link=$(yt-dlp -g "$yt_link") +fi echo "Clear playlist? (N/y)" read -r clearplay @@ -29,4 +34,3 @@ esac mpc add "$play_link" 1>/dev/null exit 0 - diff --git a/for_smol/ytmpdplay.sh b/for_smol/ytmpdplay.sh index f906e57..07c8909 100755 --- a/for_smol/ytmpdplay.sh +++ b/for_smol/ytmpdplay.sh @@ -3,11 +3,34 @@ : "${1?How to use: $0 YT_VIDEO_LINK}" yt_link="$1" +is_video=$(yt-dlp -g "$yt_link" | wc -l) +if [[ $is_video == 2 ]] +then + play_link=$(yt-dlp -g "$yt_link" | sed '1d') +else + play_link=$(yt-dlp -g "$yt_link") +fi -play_link=$(yt-dlp -g "$yt_link" | sed '1d') +echo "Clear playlist? (N/y)" +read -r clearplay +case "$clearplay" in +"y") mpc clear 1>/dev/null +echo "Playlist cleared" mpc add "$play_link" 1>/dev/null mpc play 1>/dev/null +echo "Playing" +exit 0 +;; +"n") +echo "Adding" +;; +"") +echo "Adding" +;; +esac + +mpc add "$play_link" 1>/dev/null exit 0