diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index 805268e..3c3884f 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -79,7 +79,8 @@ esac ######################################################################## ## CHECK if ${INDEXPREFIX}${REFERENCE} KEY exists ######################################################################## -isREFERENCEinINDEX=$(grep ";$REFERENCE;" ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN) +echo "SEARCH for ;$REFERENCE; in ${PREFIX}ASTRXBIAN" +isREFERENCEinINDEX=$(grep ";$REFERENCE;" ~/.zen/ipfs*/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN) if [[ ${isREFERENCEinINDEX} ]] then if [[ -d ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB} ]] @@ -97,11 +98,11 @@ then sed -i "/;$REFERENCE;/d" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN else - echo "FILE IS FROM ANOTHER" + echo "FILE IS ALREADY EXISTING FROM ANOTHER FRIEND" echo ${isREFERENCEinINDEX} # I could send message to my friend, PIN, exchange contract... TODO fi - [[ "$USER" != "xbian" ]] && zenity --warning --width 300 --text "DOUBLON ${isREFERENCEinINDEX}" + # [[ "$USER" != "xbian" ]] && zenity --warning --width 300 --text "DOUBLON ${isREFERENCEinINDEX}" fi ######################################################################## @@ -134,6 +135,9 @@ if [[ $KEY ]]; then touch ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.zen ################ ENCRYPT keystore/$KEYFILE $MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.key.natools.encrypt +else + KEY=$(cat ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.link) + KEYFILE=$(cat ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.key.keystore_filename) fi # CLEAR ipfs link (is then cyphered to manage exchange regulation) @@ -147,10 +151,14 @@ echo "${file}" > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfs.filename # TRANSFERT "ajouter_video.txt" later used [[ -f ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt ]] && mv ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ -# IPNS index.html Redirect to ipfs streaming link (could be contract or anything !!) +# IPNS index.html Redirect to ipfs streaming link (could be contract or anything else !!) echo "" > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/index.html + +IPNSLINK=$(ipfs key list -l | grep ${INDEXPREFIX}${REFERENCE} | cut -d ' ' -f 1) echo " -

Vidéo Club ASTROPORT/KODI

" > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/index.html +

ASTROPORT/KODI

+pour regarder ce film, rejoignez notre video-club des amis..." > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/index.html + NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/ | tail -n 1 ) IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS) ######################################################################## @@ -172,32 +180,25 @@ echo "Annonce gchange : $(cat ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gc [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ## CHECK IF $IPFSREPFILEID is NEW, or an already existing in SWARMs? -isFILEinINDEX=$(grep "$URLENCODE_FILE_NAME" ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/*ASTRXBIAN) -isLINKinINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/*ASTRXBIAN) isFILEinMYINDEX=$(grep "$URLENCODE_FILE_NAME" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN) isLINKinMYINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN) # Is it a new file? Add it to INDEX -if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then +if [[ ! $isFILEinMYINDEX && ! $isLINKinMYINDEX ]]; then mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/ - touch ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/$G1PUB + touch ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/${G1PUB} # SIMILAR with "ipfs ls /ipns/${IPFSNODEID}/.${IPFSNODEID}/PIN/ (...)" # TODO: switch case $PREFIX if [[ -f ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ajouter_video.txt ]] then line=$(cat ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ajouter_video.txt | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g") else + FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${path}${file}" | cut -d "x" -f 2) + RES=${FILE_RES%?}0p line="$CAT;${REFERENCE};$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" fi echo "$line" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN -else - if [[ $isFILEinMYINDEX ]]; then - echo "$file already in INDEX, updating IPFS link" ## File was updated => Change OLDLINK - OLDLINK=$(echo $isFILEinMYINDEX | cut -d ";" -f 9 | cut -d "/" -f 3 | tail -n 1) # GRAB old ipfs id - sed -i "s/$OLDLINK/$IPFSREPFILEID/g" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN - fi - [[ $isLINKinINDEX ]] && echo "$IPFSREPFILEID already in INDEX $isLINKinINDEX DO NOTHING" fi echo "~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"