forked from axiom-team/astrXbian
IPNS KEY "TMDB_$CAT_$TMDB" code simplification
This commit is contained in:
parent
4297df4f7d
commit
f9a0ca7023
|
@ -71,6 +71,7 @@ zenity --warning --width 300 --text "Ajoutez une vidéo à ASTROPORT/KODI"
|
|||
# SELECT FILE TO ADD TO ASTROPORT/KODI
|
||||
FILE=$(zenity --file-selection --title="Sélectionner le fichier à ajouter")
|
||||
echo "${FILE}"
|
||||
[[ $FILE == "" ]] && exit 1
|
||||
|
||||
# Remove file extension to get file name => STITLE
|
||||
FILE_PATH="$(dirname "${FILE}")"
|
||||
|
@ -79,22 +80,26 @@ FILE_EXT="${FILE_NAME##*.}"
|
|||
FILE_TITLE="${FILE_NAME%.*}"
|
||||
|
||||
# OPEN default browser and search TMDB
|
||||
zenity --question --width 300 --text "Ouvrir le site themoviedb pour récuperer son numéro d'identification?"
|
||||
zenity --question --width 300 --text "IMPORTANT! Ouvrir le site themoviedb et récuperez son numéro d'identification"
|
||||
[ $? == 1 ] && exit 1
|
||||
xdg-open "https://www.themoviedb.org/search?query=${FILE_TITLE}"
|
||||
|
||||
TMDB=$(zenity --entry --title="Identification TMDB" --text="Indiquez le numéro de la fiche du film. Exemple: https://www.themoviedb.org/movie/301528-toy-story-4 = 301528" --entry-text="")
|
||||
TMDB=$(zenity --entry --title="Identification TMDB" --text="Indiquez le numéro de la fiche du film. Exemple: https://www.themoviedb.org/movie/301528-toy-story-4 => 301528" --entry-text="")
|
||||
[[ $TMDB == "" ]] && exit 1
|
||||
|
||||
# CHOOSE CATEGORY
|
||||
CHOICE=$(zenity --entry --width 300 --title="Catégorie" --text="Choisissez la catégorie de la vidéo" --entry-text="Film" Serie Anime)
|
||||
[[ $CHOICE == "" ]] && exit 1
|
||||
|
||||
# LOWER CARACTERS
|
||||
CAT=$(echo "${CHOICE}" | awk '{print tolower($0)}')
|
||||
PREFIX=$(echo "${CAT}" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, S, A
|
||||
[[ $PREFIX == "" ]] && exit 1
|
||||
|
||||
# VIDEO TITLE
|
||||
TITLE=$(zenity --entry --width 300 --title "Titre" --text "Indiquez le titre de la vidéo" --entry-text="${FILE_TITLE}")
|
||||
[[ $TITLE == "" ]] && exit 1
|
||||
|
||||
# VIDEO YEAR
|
||||
YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la vidéo. Exemple: 1985" --entry-text="")
|
||||
|
||||
|
@ -160,64 +165,20 @@ GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]"
|
|||
GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="${XZUID}")
|
||||
|
||||
# DEBUG VERIFICATION
|
||||
zenity --question --width ${large} --title "Vérifiez les informations: CAT; TMDB; YEAR; TITLE; SAISON; GENRES; GROUPES; RES"\
|
||||
--text "${CAT}; ${TMDB}; ${YEAR}; ${TITLE}; ${SAISON}; ${GENRES}; ${GROUPES}; ${RES}"
|
||||
zenity --question --width ${large} --title "CONTROLE DES INFORMATIONS - EMBARQUEMENT ASTROPORT! OK?"\
|
||||
--text "${CAT}; ${TMDB}; ${YEAR}; ${TITLE}; ${SAISON}; ${GENRES}; ${GROUPES}; ${RES} = ${FILE_NAME}"
|
||||
[ $? == 1 ] && echo "ANNULATION." && exit 1
|
||||
|
||||
### OK MOVING FILE TO ASTROPORT ####
|
||||
mkdir -p ~/astroport/${CAT}/${TMDB}/
|
||||
echo "${CAT};$TMDB;$YEAR;$TITLE;$SAISON;${GENRES};${GROUPES};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${TMDB}/ajouter_video.txt
|
||||
|
||||
mv ${FILE_PATH}/${FILE_NAME} ~/astroport/${CAT}/${TMDB}/${FILE_NAME}
|
||||
|
||||
########################################################################
|
||||
# ADD $FILE to IPFS / ASTROPORT / KODI
|
||||
~/.zen/astrXbian/zen/new_file_in_astroport.sh "$HOME/astroport/${CAT}/" "${FILE_NAME}"
|
||||
########################################################################
|
||||
IPFSREPFILEID=$(ipfs add -wq "${FILE_PATH}/${FILE_NAME}" | tail -n 1)
|
||||
[[ $IPFSREPFILEID == "" ]] && echo "ipfs add ERROR" && exit 1
|
||||
echo "-----------------------------------------------------------------"
|
||||
echo "CHECK IPFS $FILE_NAME : ipfs ls /ipfs/$IPFSREPFILEID"
|
||||
echo "-----------------------------------------------------------------"
|
||||
echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN "
|
||||
mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
|
||||
|
||||
URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri)
|
||||
zenity --warning --width 300 --text "OK! Vidéo $FILE_NAME transférée dans Kodi/Vstream/Astroport"
|
||||
|
||||
# Init ${PREFIX}ASTRXBIAN header
|
||||
mv ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN # MOVE OLD FS
|
||||
[[ ! -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
|
||||
mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/${G1PUB}/
|
||||
# SIMILAR with "ipfs ls /ipns/${IPFSNODEID}/.${IPFSNODEID}/PIN/ (...)"
|
||||
echo "${CAT};$TMDB;$YEAR;$TITLE;$SAISON;${GENRES};${GROUPES};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
||||
else
|
||||
if [[ $isFILEinMYINDEX ]]; then
|
||||
echo "$FILE_NAME already in index" ## 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. DO NOTHING"
|
||||
fi
|
||||
|
||||
########################################################################
|
||||
echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
|
||||
echo "-----------------------------------------------------------------"
|
||||
echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/.timestamp
|
||||
MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
|
||||
echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/.chain ## THIS SIMPLE LINE IS BLOCKCHAIN POWERING ANY DATA PUBLISHED TO IPFS !!!
|
||||
NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
|
||||
|
||||
echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ~/.zen/ipfs*/xbian/${PREFIX}*"
|
||||
echo "-----------------------------------------------------------------"
|
||||
cat ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
|
||||
echo "NEW $TYPE ($FILE_NAME) ADDED."
|
||||
echo "INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"
|
||||
|
||||
zenity --warning --width 300 --text "Vidéo $FILE_NAME disponible dans Kodi/Vstream/Astroport"
|
||||
|
||||
# OLD FILE STRUCTURE CLEANING
|
||||
rm -f ~/.zen/ipfs/.${IPFSNODEID}/_timestamp
|
||||
rm -f ~/.zen/ipfs/.${IPFSNODEID}/_chain
|
||||
|
|
|
@ -25,8 +25,8 @@ G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
|
|||
########################################################################
|
||||
path="$1"
|
||||
file="$2"
|
||||
fileipfs="$3"
|
||||
echo "~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$path\" \"$file\" \"$fileipfs\""
|
||||
ipns="$3"
|
||||
echo "~/.zen/astrXbian/zen/new_file_in_astroport.sh PATH/ \"$path\" FILE \"$file\" IPNS \"$ipns\""
|
||||
[[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameter missing.file=$file path=$path"
|
||||
|
||||
extension="${file##*.}"
|
||||
|
@ -37,12 +37,14 @@ TITLE="${file%.*}"
|
|||
# GET XZUID
|
||||
[[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(hostname)
|
||||
|
||||
TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/astroport/... films, youtube, mp3
|
||||
type=$(echo "$TYPE" | awk '{ print tolowper($0) }')
|
||||
TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/astroport/... film, youtube, mp3
|
||||
CAT=$(echo "$TYPE" | awk '{ print tolowper($0) }')
|
||||
[[ ! $CAT ]] && echo "CAT est le 5e champs de $path" && exit 1
|
||||
|
||||
PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, Y, M
|
||||
|
||||
TMDB=$(echo "$path" | cut -d '/' -f 6 )
|
||||
[ "$TMDB" -ne "$TMDB" ] && echo "ERROR: $path missing TMDB code. CHECK it https://www.themoviedb.org/ " && exit 1 # $TMDB NOT A NUMBER
|
||||
RES=$(echo "$path" | cut -d '/' -f 7 )
|
||||
[ "$TMDB" -ne "$TMDB" ] && echo "ERROR: $path BAD TMDB code. Get it from https://www.themoviedb.org/ " && exit 1 # $TMDB NOT A NUMBER
|
||||
|
||||
# File is placed in ROOT ~/astroport ?
|
||||
[[ $PREFIX == "" ]] && echo "WARNING. $TYPE is root file UNTREATED" && exit 1
|
||||
|
@ -54,14 +56,37 @@ echo "-----------------------------------------------------------------"
|
|||
IPFSREPFILEID=$(ipfs add -wq "${path}${file}" | tail -n 1)
|
||||
[[ $IPFSREPFILEID == "" ]] && echo "ipfs add ERROR" && exit 1
|
||||
echo "-----------------------------------------------------------------"
|
||||
echo "CHECK IPFS $file : ipfs ls /ipfs/$IPFSREPFILEID"
|
||||
echo "IPFS: $file : ipfs ls /ipfs/$IPFSREPFILEID"
|
||||
echo "-----------------------------------------------------------------"
|
||||
echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN "
|
||||
mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
|
||||
echo "New $TYPE INDEX ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN "
|
||||
[[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/ ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
|
||||
|
||||
########################################################################
|
||||
## CREATE NEW ipns KEY : TMDB_$CAT_$TMDB
|
||||
########################################################################
|
||||
########################################################################
|
||||
[[ ! -d ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB} ]] && mkdir -p ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB} && KEY=$(ipfs key gen "TMDB_$CAT_$TMDB") && KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)
|
||||
## INIT ipns
|
||||
if [[ $KEY ]]; then
|
||||
echo "$KEYFILE" > ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/.ipns.key.keystore_filename
|
||||
echo "$KEY" > ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/.ipns.link
|
||||
touch ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/.zen
|
||||
mv ~/astroport/${CAT}/${TMDB}/ajouter_video.txt ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/
|
||||
# echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipns/$KEY/TMDB_$CAT_$TMDB/${G1PUB}/\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$CAT_$TMDB/ipns.html
|
||||
# $MY_PATH/jaklis/lib/natools.py encrypt -k $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$CAT_$TMDB/.ipns.key.encrypt.natools
|
||||
fi
|
||||
# IPNS index.html Redirect to ipfs streaming link (could be contract or anything !!)
|
||||
echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME\">" > ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/index.html
|
||||
NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/TMDB_$CAT_$TMDB | tail -n 1 )
|
||||
ipfs name publish --key="TMDB_$CAT_$TMDB" $NEWIPFS
|
||||
########################################################################
|
||||
|
||||
########################################################################
|
||||
########################################################################
|
||||
|
||||
URLENCODE_FILE_NAME=$(echo ${file} | jq -Rr @uri)
|
||||
|
||||
# Init ${PREFIX}ASTRXBIAN header
|
||||
# FIRST ${PREFIX}ASTRXBIAN header
|
||||
[[ ! -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?
|
||||
|
@ -73,41 +98,29 @@ isLINKinMYINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kod
|
|||
|
||||
# Is it a new file? Add it to INDEX
|
||||
if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
|
||||
mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/$G1PUB/
|
||||
mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/
|
||||
touch ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/$G1PUB
|
||||
# SIMILAR with "ipfs ls /ipns/${IPFSNODEID}/.${IPFSNODEID}/PIN/ (...)"
|
||||
# TODO: switch case $PREFIX
|
||||
echo "$type;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
||||
[[ -f ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/ajouter_video.txt ]] && line=$(cat ~/.zen/KEY/TMDB_$CAT_$TMDB/${G1PUB}/ajouter_video.txt) || line="$CAT;$TMDB;$YEAR;$TITLE;$SAISON;;${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME"
|
||||
echo "$line" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
||||
else
|
||||
if [[ $isFILEinMYINDEX ]]; then
|
||||
echo "$file already in index" ## File was updated => Change OLDLINK
|
||||
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. DO NOTHING"
|
||||
[[ $isLINKinINDEX ]] && echo "$IPFSREPFILEID already in INDEX $isLINKinINDEX DO NOTHING" && exit 1
|
||||
fi
|
||||
|
||||
echo "($TYPE) => CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"
|
||||
echo "~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"
|
||||
echo "-----------------------------------------------------------------"
|
||||
cat ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
|
||||
echo "--------------- KODI INDEX UPDATED ----------------------"
|
||||
|
||||
# CLEAN all ipns keys except self
|
||||
# for key in $(ipfs key list | grep -Ev 'self'); do ipfs key rm $key; done
|
||||
|
||||
## CREATE NEW ipns KEY
|
||||
[[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB/ && KEY=$(ipfs key gen "$type_$TMDB") && KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)
|
||||
## INIT ipns
|
||||
if [[ $KEY ]]; then
|
||||
echo "$KEYFILE" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB/.ipns.key.keystore_filename
|
||||
echo "$G1PUB" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB/.g1_creator
|
||||
touch ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB/.zen
|
||||
# echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipns/$KEY\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB/ipns.html
|
||||
$MY_PATH/jaklis/lib/natools.py encrypt -k $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB/.ipns.key.encrypt.natools
|
||||
fi
|
||||
# IPNS index.html Redirect to ipfs streaming link (could be contract !!)
|
||||
echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB/index.html
|
||||
NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/$type_$TMDB | tail -n 1 )
|
||||
ipfs name publish --key="$type_$TMDB" $NEWIPFS
|
||||
|
||||
########################################################################
|
||||
# REFRESH IPNS SELF PUBLISH
|
||||
########################################################################
|
||||
|
|
Loading…
Reference in New Issue