diff --git a/ajouter_video.sh b/ajouter_video.sh index 4491cbe..08b0765 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -560,7 +560,7 @@ if [[ \$reponse ]]; then ~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}.mp4\" else" >> ~/astroport/Add_${MEDIAKEY}_script.sh -echo " ~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\" " >> ~/astroport/Add_${MEDIAKEY}_script.sh +echo "~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\" " >> ~/astroport/Add_${MEDIAKEY}_script.sh [[ $CHOICE == "TMDB" ]] && echo "fi" >> ~/astroport/Add_${MEDIAKEY}_script.sh @@ -614,6 +614,8 @@ cat /tmp/${MEDIAKEY}.log if [ ! $2 ]; then - [ $? == 0 ] && zenity --warning --width 300 --text "OK! script de transfert ~/astroport/Add_${MEDIAKEY}_script.sh créé. Lancez le pour terminer l'ajout à Astroport" && exit 0 \ + [ $? == 0 ] && \ + zenity --question --width 300 --text "OK! ~/astroport/Add_${MEDIAKEY}_script.sh prêt. Voulez-vous lancer immédiatement l'ajout dans Astroport ?"; \ + [ $? == 0 ] && bash ~/astroport/Add_${MEDIAKEY}_script.sh || exit 0 \ || zenity --warning --width 300 --text "Désolé une erreur est survenue... /tmp/${MEDIAKEY}.log" && exit 1 fi diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index e51efb1..11213d3 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -360,7 +360,7 @@ NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1 echo $NEWIPFS > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/.chain IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS) -[[ "$IPNS" == "" ]] && echo "~~~ PROBLEM ~~~ ipfs name publish --quieter --key=${MEDIAKEY} $NEWIPFS" +[[ "$IPNS" == "" ]] && echo "~~~ PROBLEM ~~~ ipfs name publish --quieter --key=${MEDIAKEY} $NEWIPFS" && IPNS="$(ipfs key list -l | grep -w ${MEDIAKEY} | cut -f 1 -d ' ')" ######################################################################## ######################################################################## @@ -412,7 +412,10 @@ then echo "----------------- REFRESH LOCAL KODI INDEX ----------------------" cat ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN -MIME=$(file --mime-type "${path}${file}" | cut -d ' ' -f 2) + +MIME=$(file --mime-type "$HOME/astroport/${TYPE}/${REFERENCE}/${file}" | cut -d ' ' -f 2) +echo "pause ${IPNS} ${MIME}" && read + echo "## Creation json tiddler" echo '[ { @@ -420,8 +423,10 @@ echo '[ "title": "'${TITLE}'", "type": "'${MIME}'", "cat": "'${CAT}'", + "file": "'${file}'", "mediakey": "'${MEDIAKEY}'", "ipns": "'${IPNS}'", + "tmdb": "'${REFERENCE}'", "tags": "$:/isAttachment $:/isIpfs", "_canonical_uri": "/ipfs/'${IPFSREPFILEID}'/'${URLENCODE_FILE_NAME}'" }