some fixing

This commit is contained in:
qo-op 2021-01-11 22:33:23 +01:00
parent b3d1a1d58f
commit d60021a51c
2 changed files with 12 additions and 11 deletions

View File

@ -46,3 +46,8 @@ NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
Pour partager les fichiers avec ses amis.
Chaque noeud synchronise la publication IPNS de tous les membres de son "ipfs swarm peers" vers ~/.zen/ipfs_swarm/ pour complêter son fichier FASTRXBIAN des index de chacun.
```
ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid
```

View File

@ -25,18 +25,14 @@ echo "~/.zen/astrXbian/zen/mint_youtube.sh \"$path\" \"$file\""
[[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameters missing. xbian_vstream.sh file=$file? path=$path?"
extension="${file##*.}"
TITLE="${file%.*}"
if [[ ! -f ${path}${file} ]]; then
file="${TITLE%.*}"
extension="${TITLE##*.}"
fi
[[ ! -f "${path}${file}" ]] && file="${TITLE%.*}" && extension="${TITLE##*.}"
# GET XZUID
[[ -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID="$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)" || XZUID="$(hostname)"
# TODO use ~/.zen/ipfs/.$IPFSNODEID/
[[ -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid) || XZUID=$(hostname)
TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/astroport/... films, youtube, mp3
PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, Y, M
YEAR=$(echo "$path" | cut -d '/' -f 6 )
TMDB=$(echo "$path" | cut -d '/' -f 6 )
RES=$(echo "$path" | cut -d '/' -f 7 )
# file is placed in ROOT ~/astroport
@ -68,15 +64,15 @@ isLINKinMYINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
# Is it a new file? Add it to INDEX
if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
echo "ipfs get -o ~/astroport/$TYPE/ \"/ipfs/$NEWSHARE/$file\"" >> ~/.zen/ipfs/xbian/_${XZUID} # "_ASTRXBIAN" is special ipfs get commands
echo "films;$TMDB;$YEAR;$TITLE;$SAISON;${TYPE};${XZUID};$RES;/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
echo "ipfs get -o ~/astroport/$TYPE/ \"/ipfs/$NEWSHARE/$file\"" >> ~/.zen/ipfs/xbian/_${XZUID} # "_ASTRXBIAN" is listing ipfs get commands
echo "film;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
else
if [[ $isFILEinMYINDEX ]]; then
echo "$file already in index" ## File was updated => Change OLDLINK
OLDLINK=$(echo $isFILEinMYINDEX | cut -d "/" -f 3 | tail -n 1) # GRAB old ipfs id
sed -i "s/$OLDLINK/$NEWSHARE/g" ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
fi
[[ $isLINKinINDEX ]] && echo "$NEWSHARE already in index. DO NOTHING" ## should not happen
[[ $isLINKinINDEX ]] && echo "$NEWSHARE already in index. DO NOTHING"
fi
### REFRESH ~/.zen/ipfs_swarm/
@ -104,4 +100,4 @@ echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain ## THIS SIMPLE LINE IS BLOCKCHAI
NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
echo "NEW $TYPE ($file) ADDED."
echo "INDEX UPDATED : http://127.0.0.1:8181/${PREFIX}ASTRXBIAN"
echo "INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"