From 86f02d5ae2c03abc1edaa49fe8c2645e205e37fd Mon Sep 17 00:00:00 2001 From: xf0r3m Date: Sat, 22 Jul 2023 12:24:41 +0200 Subject: [PATCH] =?utf8?q?Dodanie=20najnowszych=20wersji=20narz=C4=99dzi?= =?utf8?q?=20'create=5Fmedia',=20'pl',=20'newsfeed'?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- tools/000/create_media | 24 +++++++++++++++++------- tools/000/newsfeed | 16 +++++++++++----- tools/000/pl | 17 +++++++++++------ 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/tools/000/create_media b/tools/000/create_media index 9471ff1..1ef71a2 100755 --- a/tools/000/create_media +++ b/tools/000/create_media @@ -10,25 +10,29 @@ function help() { echo "Options:"; echo " --i386-efi - creating 32-bit EFI usb drive with iso image"; echo " (comapatible with immudex only iso images)"; + echo " --nuke - write 0 to 1st megabyte of disk"; echo "Usage:"; - echo " $ create_media [--i386-efi] "; + echo " $ create_media [--i386-efi] [--nuke] [iso_image]"; } if [ "$1" ] && [ "$1" = "--i386-efi" ]; then target="i386-efi"; shift; fi +if [ "$1" ] && [ "$1" = "--nuke" ]; then target="nuke"; shift; fi if [ "$1" ] && echo $1 | grep -Eq '/dev/(sd[a-z]|vd[a-z]|mmcblk[0-9])'; then disk=$1; shift; else help; exit 1; fi -if [ "$1" ] && file $1 | grep -q 'ISO 9660'; then - iso=$1; -else - help; - exit 1; +if [ ! "$target" ] || [ "$target" != "nuke" ]; then + if [ "$1" ] && file $1 | grep -q 'ISO 9660'; then + iso=$1; + else + help; + exit 1; + fi fi -if [ "$target" ]; then +if [ "$target" = "i386-efi" ]; then echo -n "Writing zeros to 1st megabyte on disk..."; sudo dd if=/dev/zero bs=1M of=$disk count=1 > /dev/null 2>&1; if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi @@ -83,6 +87,12 @@ if [ "$target" ]; then echo -n "Umounting all mounted filesystems..."; sudo umount /mnt/* > /dev/null 2>&1; if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi + +elif [ "$target" = "nuke" ]; then + echo -n "Writing zeros to 1st megabyte on disk..."; + sudo dd if=/dev/zero bs=1M of=$disk count=1 > /dev/null 2>&1; + if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi + else echo -n "Writing zeros to 1st megabyte on disk..."; sudo dd if=/dev/zero bs=1M of=$disk count=1 > /dev/null 2>&1; diff --git a/tools/000/newsfeed b/tools/000/newsfeed index a3a426a..1f9d304 100755 --- a/tools/000/newsfeed +++ b/tools/000/newsfeed @@ -84,11 +84,17 @@ else #https://linuxhint.com/trim_string_bash if grep -q 'CDATA' /tmp/newsfeed_${2}.xml; then - sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \ - sed 's//\n/g' | grep '' | sed -n '2,$p' | \ - sed 's/<title>//' | sed 's/"/"/g' | \ - sed 's/<!\[CDATA\[//g' | sed 's/\]\]>//g' | \ - sed 's/^[[:space:]]*//g' | nl | less; + #sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \ + #sed 's/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \ + #sed 's/<title>//' | sed 's/"/"/g' | \ + #sed 's/<!\[CDATA\[//g' | sed 's/\]\]>//g' | \ + #sed 's/^[[:space:]]*//g' | nl | less; + grep -e '<title>' -e '<description>' /tmp/newsfeed_${2}.xml |\ + sed -n '3,$p' | sed -e 's/<title>//g' -e 's/<description>/>>>/g' |\ + sed 's/&#[0-9]*;//g' | \ + sed 's/"//g' | sed -e 's/<!\[CDATA\[//g' -e 's/\]\]>//g' |\ + sed -e 's/<img.*br\/>/<obrazek>/g' -e 's/^[[:space:]]*//g' \ + -e 's/<\/description>/\n/g' -e 's/<\/title>//g' | nl -b p^[[:alnum:]] | less else sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \ sed 's/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \ diff --git a/tools/000/pl b/tools/000/pl index 34efee5..e800822 100755 --- a/tools/000/pl +++ b/tools/000/pl @@ -3,8 +3,8 @@ if [ "$1" ] && [ $1 = "--video" ]; then video=1; shift; - if [ $# -gt 1 ]; then format=$1; shift; file=$1; - else format="best"; file=$1; fi + if [ $# -gt 1 ]; then format="--ytdl-format=$1"; shift; file=$1; + else format="--ytdl-forma=best"; file=$1; fi else file=$1; fi @@ -25,11 +25,11 @@ function help() { echo "Format listy:"; echo -e "\tnazwa linku: https://youtube.com/..."; } - if [ "$1" ]; then PS3="Link: "; linkNames=$(cut -d ":" -f 1 $1 | sed 's/\ /_/g' | awk '{printf $1" "}') select name in $linkNames; do + if [ "$MPVPID" ]; then kill $MPVPID; fi if [ ! "$name" ]; then break; fi link=$(grep "$name" $file | cut -d ":" -f 2-); if [ ! "$link" ]; then @@ -38,13 +38,18 @@ if [ "$1" ]; then fi if echo $link | grep -q "youtube"; then if [ "$video" ]; then - ytplay -v $link -f $format; + #ytplay -v $link -f $format + mpv $format ytdl://$link > /dev/null 2>&1 & MPVPID=$! else - ytplay -a $link -f best[height=360]; + #ytplay -a $link -f best[height=360] + format="--no-video --ytdl-format=best[height=360]"; + mpv $format ytdl://$link > /dev/null 2>&1 & MPVPID=$! fi else - mpv --no-video $link; + mpv --no-video $link > /tmp/pl.log 2>&1 & MPVPID=$!; + tail -f /tmp/pl.log | grep "icy-title" & fi + #echo "MPV: $MPVPID"; done else help; -- 2.39.5