From 9bea4bcb9ab9c3fe901ea3fa9a346e70ff7f49ff Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 20 Jan 2023 15:17:02 +0100 Subject: [PATCH] better TW control --- ajouter_media.sh | 22 +++++++++++++++++++++- tools/VISA.new.sh | 6 +++--- tools/download_from_kodi_log.sh | 9 +++++---- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/ajouter_media.sh b/ajouter_media.sh index 7f069010..6f48224d 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -166,7 +166,7 @@ espeak "Ready !" ######################################################################## # CHOOSE CATEGORY (remove anime, not working!) -[ ! $2 ] && [[ $CHOICE == "" ]] && CHOICE=$(zenity --entry --width 300 --title="Catégorie" --text="Quelle catégorie pour ce media ?" --entry-text="Vlog" Video Film Serie Web Page Youtube Mp3) +[ ! $2 ] && [[ $CHOICE == "" ]] && CHOICE=$(zenity --entry --width 300 --title="Catégorie" --text="Quelle catégorie pour ce media ?" --entry-text="Vlog" Video Film Serie Web Page Youtube Mp3 Kodi) [[ $CHOICE == "" ]] && echo "NO CHOICE MADE" && exit 1 # LOWER CARACTERS @@ -202,6 +202,26 @@ case ${CAT} in ${MY_PATH}/tools/vlc_webcam.sh + exit 0 + ;; +######################################################################## +# CASE ## KODI + #~ _ __ _ _ +#~ | |/ /___ __| (_) +#~ | ' // _ \ / _` | | +#~ | . \ (_) | (_| | | +#~ |_|\_\___/ \__,_|_| +######################################################################## + kodi) + + espeak "Kodi U Q Load" + + [ ! $2 ] && zenity --warning --width 300 --text "${PLAYER}. Prêt à enregistrer votre video ?" + + ## EXTRACT AND COPY VIDEO FROM UQLOAD + ${MY_PATH}/tools/download_from_kodi_log.sh + + exit 0 ;; ######################################################################## diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index fa9a718a..607c0301 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -167,11 +167,11 @@ YOMAIN=$(echo ${PLAYER} | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com NID="${myIPFS}" WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance WID="https://ipfs.$(myHostName)/api" -WID="http://ipfs.$(myHostName):5001" +# WID="http://ipfs.$(myHostName):5001" -[[ $isLAN ]] && NID="http://astroport.localhost:8080" \ - && WID="http://astroport.localhost:5001" +[[ $isLAN ]] && NID="http://ipfs.localhost:8080" \ + && WID="http://ipfs.localhost:5001" #### diff --git a/tools/download_from_kodi_log.sh b/tools/download_from_kodi_log.sh index 569bc848..03a147ce 100755 --- a/tools/download_from_kodi_log.sh +++ b/tools/download_from_kodi_log.sh @@ -66,10 +66,11 @@ do ( [[ $(which ipfs) && $IPFSNODEID ]] \ && espeak "Download $uqname done. Adding file to I P F S" \ - && CID=$(ipfs add -q ~/Astroport/$uqname.mp4 | tail -n 1) \ - && mkdir -p ~/.zen/tmp/$IPFSNODEID/$PLAYER/Astroport/ \ - && echo "/ipfs/$CID" > ~/.zen/tmp/$IPFSNODEID/Astroport/$uqname.mp4.ipfs \ - && espeak "Added to Station 12345 mapping" + && $MY_PATH/new_file_in_astroport.sh "$HOME/Astroport/" "$uqname.mp4" + #~ && CID=$(ipfs add -q ~/Astroport/$uqname.mp4 | tail -n 1) \ + #~ && mkdir -p ~/.zen/tmp/$IPFSNODEID/$PLAYER/Astroport/ \ + #~ && echo "/ipfs/$CID" > ~/.zen/tmp/$IPFSNODEID/Astroport/$uqname.mp4.ipfs \ + #~ && espeak "Added to Station 12345 mapping" ) & fi done