Merge pull request 'master' (#2) from armust/astrXbian:master into master
Reviewed-on: #2
This commit is contained in:
commit
0a09a310a3
|
|
@ -163,6 +163,9 @@ sed -i "s/_PROFIL_/$XZUID/g" ~/.kodi/addons/plugin.video.vstream/resources/sites
|
|||
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
|
||||
|
||||
#BACKUP source... to restore after Vstream upgrade
|
||||
cp -f ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py ~/.zen/
|
||||
|
||||
~/.zen/astrXbian/zen/gchange_IPFS_swarm.sh
|
||||
~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ fi
|
|||
|
||||
if [[ ! $isinotifywaitRunning ]]; then
|
||||
mkdir -p /home/$YOU/astroport
|
||||
[[ $YOU == "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/xbian_vstream.sh "$dir" "$file"; done &
|
||||
[[ $YOU != "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/mint_youtube.sh "$dir" "$file"; done &
|
||||
#[[ $YOU == "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/xbian_vstream.sh "$dir" "$file"; done &
|
||||
/usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/mint_youtube.sh "$dir" "$file"; done &
|
||||
fi
|
||||
|
||||
# restart inotifywait (may be useless)
|
||||
|
|
|
|||
|
|
@ -114,16 +114,25 @@ if [[ $g1node != "" ]]; then
|
|||
echo "LIKING my BOOTSTRAP node : $g1node"
|
||||
# ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.le-sou.org" send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr
|
||||
~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr
|
||||
|
||||
/home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py unlike -p $g1node
|
||||
/home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py like -p $g1node -s 3
|
||||
|
||||
isG1PUBoot=$(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep "$G1PUB") # search my G1PUB ?
|
||||
if [[ $isG1PUBoot == "$G1PUB" ]]; then
|
||||
for liking_me in $(/home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py like | jq -r '.likes[].issuer')
|
||||
do
|
||||
echo "SENDING 3 STARS to $liking_me"
|
||||
/home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py unlike -p $liking_me
|
||||
/home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py like -p $liking_me -s 3
|
||||
done
|
||||
#$(cat ~/.zen/ipfs_swarm/xbian/_*) # ACTIVATE AUTO FULL RESTORE
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# RESTORE Vstream astroport.py source
|
||||
if [[ -f ~/.zen/astroport.py ]]; then
|
||||
cp -f ~/.zen/astroport.py ~/.kodi/addons/plugin.video.vstream/resources/sites/
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -25,17 +25,22 @@ 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
|
||||
|
||||
# GET XZUID
|
||||
[[ -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID="$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)" || XZUID="$(hostname)"
|
||||
# TODO use ~/.zen/ipfs/.$IPFSNODEID/
|
||||
|
||||
TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: youtube, mp3
|
||||
PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: Y, M
|
||||
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 )
|
||||
RES=$(echo "$path" | cut -d '/' -f 7 )
|
||||
|
||||
# file is placed in ROOT ~/astroport
|
||||
[[ $PREFIX != "Y" || $PREFIX != "Y" ]] && echo "WARNING. $TYPE unrecognize, please add code for it ${path}${file}" && exit 1
|
||||
[[ $PREFIX == "" ]] && echo "WARNING. $TYPE root files untreated" && exit 1
|
||||
|
||||
|
||||
echo "ADDING ${path}${file} IPFS INDEX to ~/.zen/ipfs/xbian/${PREFIX}${XZUID}"
|
||||
|
|
@ -51,20 +56,24 @@ 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://localhost: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:10021" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
|
||||
|
||||
rm ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
|
||||
## CHECK IF $NEWSHARE is NEW, or an already existing file to upgrade?
|
||||
isFILEinINDEX=$(grep "$file" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
|
||||
isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
|
||||
## CHECK IF $NEWSHARE is NEW, or an already existing in SWARMs?
|
||||
isFILEinINDEX=$(grep "$file" ~/.zen/ipfs_swarm/xbian/${PREFIX}*)
|
||||
isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs_swarm/xbian/${PREFIX}*)
|
||||
|
||||
|
||||
isFILEinMYINDEX=$(grep "$file" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
|
||||
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/${PREFIX}${XZUID}
|
||||
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}
|
||||
else
|
||||
if [[ $isFILEinINDEX ]]; then
|
||||
echo "$file already in index" ## File was updated => Change OLDLINK
|
||||
OLDLINK=$(echo $isFILEinINDEX | cut -d "/" -f 5 | tail -n 1)
|
||||
OLDLINK=$(echo $isFILEinINDEX | 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
|
||||
|
|
@ -84,10 +93,13 @@ 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://localhost:10021" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER
|
||||
cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' | cut -d ';' -f 9 >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET ipfs get commands
|
||||
cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE INDEX
|
||||
mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN
|
||||
echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:10021" > /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
|
||||
|
||||
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://localhost:10021/${PREFIX}ASTRXBIAN"
|
||||
echo "INDEX UPDATED : http://127.0.0.1:10021/${PREFIX}ASTRXBIAN"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,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:10021/
|
||||
# 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
|
||||
########################################################################
|
||||
|
|
@ -66,7 +66,7 @@ isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
|
|||
|
||||
# Is it a new file? Add it to INDEX
|
||||
if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
|
||||
echo "$TYPE;$TMDB;$YEAR;$TITLE;$SAISON;$GENRES;${XZUID};$RES;http://localhost:10021/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
|
||||
echo "$TYPE;$TMDB;$YEAR;$TITLE;$SAISON;$GENRES;${XZUID};$RES;http://127.0.0.1:10021/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
|
||||
else
|
||||
if [[ $isFILEinINDEX ]]; then
|
||||
echo "$file already in index" ## File was updated => Change OLDLINK
|
||||
|
|
@ -96,4 +96,4 @@ cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq #
|
|||
mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN
|
||||
|
||||
echo "NEW $TYPE ($file) ADDED."
|
||||
echo "INDEX UPDATED : http://localhost:10021/${PREFIX}ASTRXBIAN"
|
||||
echo "INDEX UPDATED : http://127.0.0.1:10021/${PREFIX}ASTRXBIAN"
|
||||
|
|
|
|||
Loading…
Reference in New Issue