Dodanie najnowszych wersji narzędzi 'create_media', 'pl', 'newsfeed'

diff --git a/tools/000/create_media b/tools/000/create_media
index 9471ff13adc1fa22f7a18639843394110baa46ff..1ef71a2ebe386233f8ae692e7f00708ec4888717 100755 (executable)
--- 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] <usb_disk> <iso_image>";
+  echo "  $ create_media [--i386-efi] [--nuke] <usb_disk> [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 a3a426a9f66c6b59a1b768ebbddf0ec73fa912b8..1f9d304fb6c5b7c36259d0fc7c4932777c4c6d09 100755 (executable)
--- 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/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \
-        sed 's/<title>//' | sed 's/&quot;/"/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/&quot;/"/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/&quot;//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 34efee532e0bac11fe538a39c8e8dd3b1fbbb643..e8008228ee696368aa276dae7718a16517a12d19 100755 (executable)
--- 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;