diff --git a/ajouter_video.sh b/ajouter_video.sh index 1e280ec..bef8d1a 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -167,7 +167,7 @@ zenity --question --width ${large} --title "Vérifiez les informations: CAT; TMD ######################################################################## # ADD $FILE to IPFS / ASTROPORT / KODI ######################################################################## -IPFSREPFILEID=$(ipfs add -wq "${FILE_PATH}${FILE_NAME}" | tail -n 1) +IPFSREPFILEID=$(ipfs add -wq "${FILE_PATH}/${FILE_NAME}" | tail -n 1) [[ $IPFSREPFILEID == "" ]] && echo "ipfs add ERROR" && exit 1 echo "-----------------------------------------------------------------" echo "CHECK IPFS $FILE_NAME : ipfs ls /ipfs/$IPFSREPFILEID" @@ -192,7 +192,7 @@ isLINKinMYINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kod if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/$G1PUB/ # SIMILAR with "ipfs ls /ipns/${IPFSNODEID}/.${IPFSNODEID}/PIN/ (...)" - echo "${CAT};$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN + echo "${CAT};$TMDB;$YEAR;\"$TITLE\";\"$SAISON\";${GENRES};${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN else if [[ $isFILEinMYINDEX ]]; then echo "$FILE_NAME already in index" ## File was updated => Change OLDLINK @@ -217,6 +217,8 @@ NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS) echo "NEW $TYPE ($FILE_NAME) ADDED." echo "INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN" +zenity --warning --text "Vidéo $FILE_NAME ajoutée http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN" + # OLD FILE STRUCTURE CLEANING rm -f ~/.zen/ipfs/.${IPFSNODEID}/_timestamp rm -f ~/.zen/ipfs/.${IPFSNODEID}/_chain diff --git a/zen/refresh_ASTRXBIAN_index.sh b/zen/refresh_ASTRXBIAN_index.sh index 9761f9f..5351d8e 100755 --- a/zen/refresh_ASTRXBIAN_index.sh +++ b/zen/refresh_ASTRXBIAN_index.sh @@ -1,14 +1,37 @@ #!/bin/bash ######################################################################## # Author: Fred (support@qo-op.com) -# Version: 2020.12.15 +# Version: 0.1 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) ######################################################################## # REFRESH ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ######################################################################## -[[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(hostname) +export YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) +[[ $IPFSNODEID ]] && export IPFSNODEID=$IPFSNODEID || export IPFSNODEID=$(ipfs id -f='\n') +[[ -f ~/.zen/ipfs/.${IPFSNODEID}/G1SSB/_g1.gchange_title ]] && XZUID="$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title)" || XZUID="$(hostname)" + +rm -Rf ~/.zen/ipfs/astroport # Correct old bug ${IPFSNODEID} empty mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/ -cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN -echo "INDEX UPDATED : http://127.0.0.1:10021/${PREFIX}ASTRXBIAN" + +# REFRESH INDEX Films Animes Series ... +for PREFIX in F A S +do + [[ -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && mv ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN + cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN + echo "${PREFIX} INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN" +done + +######################################################################## +echo "PUBLISHING ~/.zen/ipfs SELF /ipns/$IPFSNODEID" +MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1) +OLDCHAIN=$(cat ~/.zen/ipfs/.${IPFSNODEID}/.chain) +if [[ "$OLDCHAIN" != "$MIPFS" ]] # MODIFY CHAIN only if something was changed +then + echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/.timestamp + echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/.chain +fi +NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS) + +exit 0