diff --git a/ajouter_video.sh b/ajouter_video.sh index f6335de..9283c93 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -349,9 +349,11 @@ echo "${CAT};${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipf ;; video) + + ## GENERAL MEDIAKEY for uploaded video. Title + Decription + hashtag + hashipfs # SELECT FILE TO ADD TO ASTROPORT/KODI - FILE=$(zenity --file-selection --title="Sélectionner le fichier à ajouter") + FILE=$(zenity --file-selection --title="Sélectionner le fichier vidéo à ajouter") echo "${FILE}" [[ $FILE == "" ]] && exit 1 @@ -364,7 +366,21 @@ echo "${CAT};${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipf TITLE=$(zenity --entry --width 300 --title "Titre" --text "Indiquez le titre de la vidéo" --entry-text="${FILE_TITLE}") [[ $TITLE == "" ]] && exit 1 TITLE=$(echo "${TITLE}" | sed "s/[(][^)]*[)]//g" | sed -e 's/;/_/g' ) # Clean TITLE (NO ;) + + OUTPUT=$(zenity --forms --width ${large} --title="METADATA" --text="Ajouter des métadonnées" --separator=";" --add-entry="Sous titres" --add-entry="Hashtag(s)") + [[ $? != 0 ]] && echo "FAIL" && exit 1 + DESCRIPTION=$(awk -F ';' '{print $1}' <<<$OUTPUT) + HASHTAG=$(awk -F ';' '{print $2}' <<<$OUTPUT) + + ## SIMPLE JSON + jq -n --arg title "$TITLE" --arg desc "$DESCRIPTON" --arg htag "$HASHTAG" '{"ipfs":"_IPFSREPFILEID_","ipns":"_IPNSKEY_","title":$title,"desc":$desc,"htag":$htag}' > ~/astroport/${CAT}/${TMDB}/video.json + + ## MOVE FILE TO IMPORT ZONE + mkdir -p ~/astroport/${CAT}/${TMDB}/ + mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${TMDB}/${TITLE}.${FILE_EXT}" + FILE_NAME="${TITLE}.${FILE_EXT}" + ;; kodi) @@ -378,7 +394,7 @@ echo "${CAT};${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipf cp download_from_kodi_log.sh $HOME/.local/bin/ else ## UTILISEZ $HOME/.local/bin/download_from_kodi_log.sh - zenity --warning --width ${large} --text "UTILISEZ $HOME/.local/bin/download_from_kodi_log.sh en ligne de commande !!" + zenity --warning --width ${large} --text "UTILISEZ download_from_kodi_log.sh en ligne de commande !!" exit 0 fi diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index dfb3a27..165597d 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -347,6 +347,16 @@ then 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 fi +######################################################################## +# PUBLISH GENERAL video +######################################################################## +if [[ "${CAT}" == "video" ]] +then + ## REPLACE IPFS / IPNS REFERENCE IN video.json (Maybe cyphered later) + cat ~/astroport/${CAT}/${INDEXPREFIX}${REFERENCE}/video.json | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g" | sed "s/_IPNSKEY_/$IPNS/g" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN + +fi + ######################################################################## # PUBLISH YOUTUBE video to /astroport/wordpress/ ########################################################################