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 29566b5..f11f029 100644 --- a/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py +++ b/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py @@ -16,7 +16,10 @@ SITE_IDENTIFIER = 'astroport' SITE_NAME = 'ASTROPORT _PROFIL_ (_LOGIN_) (_MDP_)' SITE_DESC = 'Partage ~/astroport/films (animes, series) avec ses amis https://gchange.fr (https://cesium.app ) via IPFS' -URL_MAIN = 'http://localhost:10021/' +# URL_MAIN = 'http://localhost:10021/' +# NOT USING nginx relay anymore +URL_MAIN = 'http://127.0.0.1:8181/ipns/_IPFSNODEID_/._IPFSNODEID_' +# FASTRXBIAN / AASTRXBIAN ... KEY_PASTE_ID = 'PASTE_ID' SETTING_PASTE_ID = 'pastebin_id_' diff --git a/ISOconfig.sh b/ISOconfig.sh index 740715e..3791784 100755 --- a/ISOconfig.sh +++ b/ISOconfig.sh @@ -162,6 +162,7 @@ sed -i "s/_IPNSKEY_/$IPNSKEY/g" ~/.bashrc sed -i "s/_PROFIL_/$XZUID/g" ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py sed -i "s/_LOGIN_/$salt/g" ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py sed -i "s/_MDP_/$pepper/g" ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py +sed -i "s/_IPFSNODEID_/$IPFSNODEID/g" ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py #BACKUP source... to restore after Vstream upgrade cp -f ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py ~/.zen/ diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh index a562bf6..11fadfb 100755 --- a/zen/mint_youtube.sh +++ b/zen/mint_youtube.sh @@ -11,7 +11,7 @@ # ipfs add new file # create ASTRXBIAN indexes in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} # unify swarm indexes in /var/www/astrxbian/${PREFIX}ASTRXBIAN -# Vstream/Astroport reads ${PREFIX}ASTRXBIAN through http://localhost:10021/ +# Vstream/Astroport reads ${PREFIX}ASTRXBIAN through http://127.0.0.1:8181/.$IPFNODEID/ # Using 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 ######################################################################## @@ -56,7 +56,7 @@ mkdir -p ~/.zen/ipfs/xbian # Init ${PREFIX}${XZUID} header #[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TITLE;URLS" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID} -[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:10021" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID} +[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ## CHECK IF $NEWSHARE is NEW, or an already existing in SWARMs? isFILEinINDEX=$(grep "$file" ~/.zen/ipfs_swarm/xbian/${PREFIX}*) @@ -94,7 +94,7 @@ echo "-----------------------------------------------------------------" echo "CREATE my local ${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm found indexes" echo "-----------------------------------------------------------------" mkdir -p /tmp/xbian/ -echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:10021" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER +echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET All lines cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN # Publish to localhost ASTROPORT relay @@ -103,4 +103,4 @@ cat ~/.zen/ipfs/xbian/_${XZUID} | uniq > /tmp/xbian/_${XZUID} mv /tmp/xbian/_${XZUID} ~/.zen/ipfs/xbian/_${XZUID} echo "NEW $TYPE ($file) ADDED." -echo "INDEX UPDATED : http://127.0.0.1:10021/${PREFIX}ASTRXBIAN" +echo "INDEX UPDATED : http://127.0.0.1:8181/${PREFIX}ASTRXBIAN"