diff --git a/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py b/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py index 2f6e81a..4fbaa9f 100644 --- a/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py +++ b/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py @@ -14,7 +14,7 @@ import random SITE_IDENTIFIER = 'astroport' SITE_NAME = 'ASTROPORT' -SITE_DESC = 'Astroport permet de partager le contenu du répertoire ~/astroport avec tous ses amis https://gchange.fr' +SITE_DESC = 'Astroport permet de partager le contenu du répertoire ~/astroport avec ses amis https://gchange.fr' URL_MAIN = 'http://localhost:8080/ipns/_IPNSKEY_/xbian/' diff --git a/zen/xbian_vstream.sh b/zen/xbian_vstream.sh index 812cadb..8045651 100755 --- a/zen/xbian_vstream.sh +++ b/zen/xbian_vstream.sh @@ -8,42 +8,57 @@ ######################################################################## [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && echo "ERROR no _xbian.zuid" && exit 1 -mkdir -p ~/astroport/ +mkdir -p ~/astroport/films +mkdir -p ~/astroport/series +mkdir -p ~/astroport/animes + # GET xbian-ZUID XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid) -echo "CREATE ~/.zen/ipfs/xbian/$XZUID FROM ~/astroport/" +echo "CREATE ~/.zen/ipfs/xbian/F$XZUID FROM ~/astroport/" +echo "-----------------------------------------------------------------" # CREATE Vstream/Pastebin file format # https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films -ASHARE=$(ipfs add -rq ~/astroport/ | tail -n 1) - -[[ $ASHARE == "" ]] && echo "ERROR adding ~/astroport to IPFS" && exit 1 +echo "ADDING ~/astroport/films/ to IPFS" +echo "-----------------------------------------------------------------" +AFSHARE=$(ipfs add -rq ~/astroport/films/ | tail -n 1) +[[ $AFSHARE == "" ]] && echo "ipfs add ERROR" && exit 1 +echo "WRITE ~/.zen/ipfs/xbian/F$XZUID Films index" +echo "-----------------------------------------------------------------" mkdir -p ~/.zen/ipfs/xbian echo "TITLE;URLS" > ~/.zen/ipfs/xbian/$XZUID -for file in ~/astroport/* +for file in ~/astroport/films/* do filename=$(basename -- "$file") extension="${filename##*.}" filena="${filename%.*}" - echo "$filena;http://localhost:8080/ipfs/$ASHARE/$filename" >> ~/.zen/ipfs/xbian/$XZUID + echo "$filena;http://localhost:8080/ipfs/$AFSHARE/$filename" >> ~/.zen/ipfs/xbian/F$XZUID done -## SHARE ~/.zen/ipfs to my SWARM -IWALLETS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1) -NODEIPNS=$(ipfs name publish --quieter /ipfs/$IWALLETS) +### TODO +### ADD Animes +### ADD Series -ipfs cat /ipns/$NODEIPNS/xbian/$XZUID +echo "PUBLISH ~/.zen/ipfs to IPNS self" +echo "-----------------------------------------------------------------" +MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1) +NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS) +ipfs cat /ipns/$NODEIPNS/xbian/F$XZUID + +echo "SYNCing SWARM..." +echo "-----------------------------------------------------------------" ~/.zen/astroport/zen/ipfs_SWARM_refresh.sh -# PREPARE local AstrXbian list -mkdir -p /tmp/xbian/ -echo 'TITLE;URL' > /tmp/xbian/ASTRXBIAN -cat ~/.zen/ipfs_swarm/xbian/*-* | grep -v -E 'TITLE;URL' >> /tmp/xbian/ASTRXBIAN -ISTREAM=$(ipfs add -qrw /tmp/xbian/ | tail -n 1) +echo "PREPARE my local FASTRXBIAN (films) list from ipfs_swarm" +echo "-----------------------------------------------------------------" +mkdir -p /tmp/xbian/films/ +echo 'TITLE;URL' > /tmp/xbian/films/FASTRXBIAN +cat ~/.zen/ipfs_swarm/xbian/F*-* | grep -v -E 'TITLE;URL' >> /tmp/xbian/films/FASTRXBIAN +echo "PUBLISH IPNS with 'xbian' key" +echo "-----------------------------------------------------------------" +ISTREAM=$(ipfs add -qrw /tmp/xbian/films/ | tail -n 1) ipfs name publish -k xbian $ISTREAM - -## TODO or NOT ipfs pin files !!??