From 13820563c1033a49f687a8bfcaa1d19d9ce5b148 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Tue, 21 Sep 2021 00:47:05 +0200
Subject: [PATCH] Youtube <=> URL="$1" no zenity if $2 not empty

---
 ajouter_video.sh             | 27 ++++++++++++++++-----------
 zen/new_file_in_astroport.sh |  4 ++++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ajouter_video.sh b/ajouter_video.sh
index aa6d94b..d8fb79d 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -28,10 +28,13 @@ ME="${0##*/}"
 [[ $(which xdpyinfo) == "" ]] && echo "ERREUR! Installez x11-utils" && echo "sudo apt install x11-utils" && exit 1
 
 URL="$1"
-[ $URL ] && echo "URL: $URL" && REVSOURCE="$(echo "$URL" | awk -F/ '{print $3}' | rev)_"\
-&& IMPORT=$(zenity --entry --width 640 --title="$URL => Astroport" --text="Choisissez comment copier cette source" --entry-text="Video" MP3 Web) \
-&& [[ $IMPORT == "Video" ]] && IMPORT="Youtube" \
-&& CHOICE="$IMPORT"
+if [ $URL ]; then
+    echo "URL: $URL"
+    REVSOURCE="$(echo "$URL" | awk -F/ '{print $3}' | rev)_"
+    [ ! $2 ] && IMPORT=$(zenity --entry --width 640 --title="$URL => Astroport" --text="Choisissez comment copier cette source" --entry-text="Video" MP3 Web) || IMPORT="Youtube"
+    [[ $IMPORT == "Video" ]] && IMPORT="Youtube"
+    CHOICE="$IMPORT"
+fi
 
 [[ $CHOICE == "Web" ]] && CHOICE=$(zenity --entry --width 640 --title="$URL => Astroport" --text="Cette source WEB est à enregistrer comme " --entry-text="Page" WebSite)
 
@@ -126,7 +129,7 @@ echo "VIDEO $YTURL"
 --no-mtime -o "${YTEMP}/%(id)s&%(title)s.%(ext)s" $YTURL
 
 # Get filename, extract ID, make destination dir and move copy.
-YFILE=$(ls -t ${YTEMP} | head -n 1)
+YFILE=$(ls -S ${YTEMP} | head -n 1)
 FILE_NAME="$(basename "${YFILE}")"
 FILE_EXT="${FILE_NAME##*.}"
 
@@ -140,7 +143,7 @@ TITLE="${YNAME%.*}"
 MEDIAKEY="YOUTUBE_${MEDIAID}"
 ## CORRECT PARAMETERS to Make Kodi compatible YASTRXBIAN FILE
 
-GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut} \
+[ ! $2 ] && GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut} \
     --text="Choisissez le(s) genre(s) d'information(s) contenue(s) dans cette vidéo \"${TITLE}\" publiée sur OASIS" \
     --column="Use" \
     --column="Feature" \
@@ -157,7 +160,7 @@ GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut} \
     FALSE Humain \
     FALSE Animal \
     TRUE Eveil \
-    TRUE ${AXID// /-})
+    TRUE ${AXID// /-}) || GENRES="${AXID// /-}"
 
 # FORMAT GENRES genre1|genre2|genre3
 
@@ -530,7 +533,7 @@ echo "new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_N
 ########################################################################
 MEDIAPUBKEY=$(cat $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/MEDIAPUBKEY)
 
-zenity --width=500 --height=500 --text-info \
+[ ! $2 ] && zenity --width=500 --height=500 --text-info \
        --title="QR CODE MEDIA ${MEDIAKEY} (PASS=$(cat /tmp/${MEDIAKEY}.pass))" \
        --html \
        --url="http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png" \
@@ -544,7 +547,7 @@ FILE_SIZE=$(echo "${FILE_SIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1; w
 
 G1BALANCE=$(~/.zen/astrXbian/zen/jaklis/jaklis.py balance -p $G1PUB) && [[ "$G1BALANCE" == "null" ]] && G1BALANCE=0 || G1BALANCE=$(echo "$G1BALANCE" | cut -d '.' -f 1)
 if [[ $G1BALANCE -gt 0 ]]; then
-    G1AMOUNT=$(zenity --entry --width 400 --title "VIRER DE LA MONNAIE LIBRE AU MEDIAKEY (MAX $G1BALANCE)" --text "Combien de JUNE (G1) souhaitez-vous offrir à ce MEDIA ($FILE_SIZE)" --entry-text="")
+    [ ! $2 ] && G1AMOUNT=$(zenity --entry --width 400 --title "VIRER DE LA MONNAIE LIBRE AU MEDIAKEY (MAX $G1BALANCE)" --text "Combien de JUNE (G1) souhaitez-vous offrir à ce MEDIA ($FILE_SIZE)" --entry-text="")
     [[ ! "$G1AMOUNT" =~ ^[0-9]+$ ]] && G1AMOUNT=0
     ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey pay -p ${MEDIAPUBKEY} -a $G1AMOUNT -c "#ASTROPORT:${MEDIAKEY} DON"
     ZENBALANCE=$(echo "100 * $G1AMOUNT" | bc -l | cut -d '.' -f 1)
@@ -559,5 +562,7 @@ cat /tmp/${MEDIAKEY}.log
 rm -f /tmp/${MEDIAKEY}.pass
 rm -f /tmp/${MEDIAKEY}.dunikey ## REMOVE KEYS
 
-[ $? == 0 ] && zenity --warning --width 300 --text "OK! MEDIA transféré ($ZENBALANCE ZEN). URL LOCALHOST prête à coller (/tmp/${MEDIAKEY}.log)" && exit 0 \
-|| zenity --warning --width 300 --text "Désolé une erreur est survenue... LOG: cat /tmp/${MEDIAKEY}.log" && exit 1
+if [ ! $2 ]; then
+    [ $? == 0 ] && zenity --warning --width 300 --text "OK! MEDIA transféré ($ZENBALANCE ZEN). URL LOCALHOST prête à coller (/tmp/${MEDIAKEY}.log)" && exit 0 \
+    || zenity --warning --width 300 --text "Désolé une erreur est survenue... LOG: cat /tmp/${MEDIAKEY}.log" && exit 1
+fi
diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh
index 84d815b..ffeaf15 100755
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@@ -24,6 +24,10 @@ G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
 # mkdir -p ~/astroport/mp3
 ########################################################################
 path="$1"
+
+if [[ "$path" == "" ]]; then
+    echo "## BATCH RUN. READ FIFO FILE."
+fi
 # Add trailing / if needed
 length=${#path}
 last_char=${path:length-1:1}