From 2ce58bc7c2730da209d1d46436e2bdaeb6aeeb60 Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 16 Dec 2022 13:02:03 +0100 Subject: [PATCH] DEV-DEBUG REGISTER https://git.p2p.legal --- ajouter_media.sh | 11 +++++------ tools/new_file_in_astroport.sh | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ajouter_media.sh b/ajouter_media.sh index cd6edfa9..6ce1d1d2 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -388,7 +388,7 @@ echo '[ ## EVOLVE TO ARTICLE # httrack --mirror --ext-depth=0 --depth=1 --near --stay-on-same-address --keep-links=0 --path article-x --quiet https://example.com/article-x/ - [ ! $2 ] && [[ $URL == "" ]] && URL=$(zenity --entry --width 300 --title "URL à convertir en PDF (VIDE POUR UN FICHIER LOCAL)" --text "Indiquez le lien (URL)" --entry-text="") + [ ! $2 ] && [[ $URL == "" ]] && URL=$(zenity --entry --width 300 --title "URL à convertir en PDF (LAISSER VIDE POUR CHOISIR UN FICHIER LOCAL)" --text "Indiquez le lien (URL)" --entry-text="") if [[ $URL != "" ]]; then ## record one page to PDF @@ -420,7 +420,7 @@ echo '[ [[ ! -s ~/.zen/tmp/output.pdf ]] && espeak "No file Sorry. Exit" && exit 1 - espeak "OK Page copied. Give it a title please" + espeak "OK P D F received" CTITLE=$(echo $URL | rev | cut -d '/' -f 1 | rev) @@ -454,14 +454,14 @@ echo '[ espeak " Youtube music copying. Please help us to make the Web your Web" -# [ ! $2 ] && zenity --warning --width 600 --text 'DEVELOPPEMENT ZONE - https://git.p2p.legal - P2P INTERNET FACTORY' +[ ! $2 ] && zenity --warning --width 600 --text 'DEV-DEBUG : INSCRIVEZ VOUS SUR https://git.p2p.legal' # Create TEMP directory YTEMP="$HOME/.zen/tmp/$(date -u +%s%N | cut -b1-13)" mkdir -p ${YTEMP} YTURL="$URL" -[ ! $2 ] && [[ $YTURL == "" ]] && artist=$(zenity --entry --width 400 --title "Extraction MP3 depuis Youtube" --text "Artiste recherché ou Lien Youtube" --entry-text="") +[ ! $2 ] && [[ $YTURL == "" ]] && artist=$(zenity --entry --width 400 --title "Copie MP3 Youtube" --text "Artiste recherché ou Lien Youtube" --entry-text="") [[ $YTURL == "" ]] && [[ $artist == "" ]] && echo "NO COPY TO MAKE" && exit 1 ## CHECK if artist is LINK or ID @@ -628,7 +628,6 @@ YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la # VIDEO RESOLUTION FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${FILE}" | cut -d "x" -f 2) RES=${FILE_RES%?}0p # Rounding. Replace last digit with 0 -#RES=$(zenity --entry --width 300 --title="Résolution" --text="Résolution de la vidéo" --entry-text="${FILE_RES}" SD HD 4K 360p 480p 720p 1080p) # VIDEO SEASON or SAGA ### CHECK IF PREVIOUS ajouter_video (Serie case) @@ -726,7 +725,7 @@ echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/i espeak "Add your personnal video in TW" - zenity --warning --width 600 --text 'DEV ZONE - HELP US - https://git.p2p.legal' + zenity --warning --width 600 --text 'DEV-DEBUG : REGISTER https://git.p2p.legal' ## GENERAL MEDIAKEY for uploaded video. Title + Decription + hashtag + hashipfs # SELECT FILE TO ADD TO ASTROPORT/KODI diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index 3967c7b0..004bb3f5 100755 --- a/tools/new_file_in_astroport.sh +++ b/tools/new_file_in_astroport.sh @@ -348,7 +348,7 @@ cp ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/.zen/game/p ## TODO : Do we keep that ? # echo "SEND TW LINK to GCHANGE MESSAGE" -[[ $3 ]] && ~/.zen/Astroport.ONE/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" send -d "$3" -t "${TITLE} ${MEDIAKEY}" -m "MEDIA : http://astroport.com:8080/ipfs/${IPFSREPFILEID}" +[[ $3 ]] && ~/.zen/Astroport.ONE/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" send -d "$3" -t "${TITLE} ${MEDIAKEY}" -m "MEDIA : https://ipfs.copylaradio.com/ipfs/${IPFSREPFILEID}" # Couldl be used by caroussel.html template # CAROUSSEL=$(ipfs add -wq ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json | head-n 1)