diff --git a/ajouter_video.sh b/ajouter_video.sh index 45ef817..df584ba 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -219,9 +219,10 @@ rm -Rf ${YTEMP} FILE_NAME="index.html" REVSOURCE="$(echo "$URL" | rev | sha256sum | cut -d ' ' -f 1)_"; echo $REVSOURCE # URL="https://discuss.ipfs.io/t/limit-ipfs-get-command/3573/6" MEDIAID="$REVSOURCE" # MEDIAID=1252ff59950395070a0cc56bb058cbb1ccfd2f8d8a32476acaf472f62b14d97d_ - MEDIAKEY="PAGE_${MEDIAID}" # MEDIAKEY=PAGE_1252ff59950395070a0cc56bb058cbb1ccfd2f8d8a32476acaf472f62b14d97d_ + MEDIAKEY="WWW_${MEDIAID}" # MEDIAKEY=PAGE_1252ff59950395070a0cc56bb058cbb1ccfd2f8d8a32476acaf472f62b14d97d_ FILE_PATH="$HOME/astroport/web/$MEDIAID"; mkdir -p $FILE_PATH + wget -mpck --user-agent="" -e robots=off --wait 1 "$URL" > ${FILE_PATH}/${FILE_NAME} echo "web;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt @@ -237,17 +238,17 @@ rm -Rf ${YTEMP} ## record one page to PDF [[ ! $(which chromium) ]] && zenity --warning --width ${large} --text "Utilitaire de copie de page web absent.. Lancez la commande 'sudo apt install chromium'" && exit 1 - cd /tmp/ && rm output.pdf && chromium --headless --no-sandbox --print-to-pdf $URL + cd /tmp/ && rm -f output.pdf + chromium --headless --no-sandbox --print-to-pdf $URL - TITLE=$(zenity --entry --width 480 --title "Titre" --text "Indiquez le titre de cette page " --entry-text="${URL}") + TITLE=$(zenity --entry --width 480 --title "Titre" --text "Quel nom de fichier à donner à cette page ? " --entry-text="${URL}") [[ $TITLE == "" ]] && exit 1 FILE_NAME="$(echo "${TITLE}" | detox --inline).pdf" ## TODO make it better MEDIAID="$REVSOURCE$(echo "${TITLE}" | detox --inline)" MEDIAKEY="PAGE_${MEDIAID}" FILE_PATH="$HOME/astroport/page/$MEDIAID" - mkdir -p ${FILE_PATH} && mv -f output.pdf ${FILE_PATH}/${FILE_NAME} - + mkdir -p ${FILE_PATH} && mv output.pdf ${FILE_PATH}/${FILE_NAME} echo "page;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt @@ -547,7 +548,20 @@ echo "new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_N [[ "$CAT" == "film" || "$CAT" == "serie" ]] && CHOICE="TMDB" timestamp=$(date -u +%s%N | cut -b1-13) -echo "MEDIAKEY=${MEDIAKEY} + +## Creation json tiddler +echo '[ + { + "text": "", + "title": "'${TITLE}'", + "type": "video/mp4", + "tags": "$:/isAttachment $:/isIpfs", + "_canonical_uri": "/ipfs/_IPFS_" + } +] +' > ~/astroport/Add_${MEDIAKEY}_tittler.json + +[[ $CHOICE == "TMDB" ]] && echo "MEDIAKEY=${MEDIAKEY} echo \"Encoder ${FILE_NAME} en h265 avant import ? Tapez sur ENTER pour continuer sans...\" read reponse if [[ \$reponse ]]; then @@ -565,6 +579,8 @@ read finish rm ~/astroport/Add_${MEDIAKEY}_script.sh " > ~/astroport/Add_${MEDIAKEY}_script.sh + + chmod +x ~/astroport/Add_${MEDIAKEY}_script.sh ## DELAYED IPFS ADD TO ASTROPORT ... COULD BE MANAGED BY CRON diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index c043d27..c0186af 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -315,8 +315,7 @@ IPNSLINK=$(ipfs key list -l | grep ${MEDIAKEY} | cut -d ' ' -f 1) | sed "s/\${XZUID}/$XZUID/g" \ | sed "s/\${G1PUB}/$G1PUB/g" \ | sed "s/\${TITLE}/$TITLE/g" \ - > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIA - KEY}/index.html + > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/index.html ## SECOND REDIRECT PAGE ${MEDIAKEY}/${G1PUB}/index.html # https://tube.copylaradio.com/ipns/$IPNSLINK/${G1PUB}/