forked from axiom-team/astrXbian
FILM_GENRES list enhance
This commit is contained in:
parent
2b4652ea6c
commit
49bd5dc6d4
|
|
@ -40,6 +40,7 @@ haut=$((height-200))
|
|||
|
||||
########################################################################
|
||||
# CHECK for Kodi + astroport.py
|
||||
IPFSNODEID=$(ipfs id -f='<id>\n')
|
||||
if [[ -f ~/.zen/astroport.py ]]
|
||||
then
|
||||
## NORMAL behaviour (ISOConfig.sh made the Job)
|
||||
|
|
@ -57,7 +58,6 @@ else
|
|||
#sed -i "s/_PROFIL_/$XZUID/g" ~/.zen/astroport.py
|
||||
#sed -i "s/_LOGIN_/$salt/g" ~/.zen/astroport.py
|
||||
#sed -i "s/_MDP_/$pepper/g" ~/.zen/astroport.py
|
||||
IPFSNODEID=$(ipfs id -f='<id>\n')
|
||||
sed -i "s/_IPFSNODEID_/$IPFSNODEID/g" ~/.zen/astroport.py
|
||||
cp ~/.zen/astroport.py ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py
|
||||
fi
|
||||
|
|
@ -97,7 +97,7 @@ YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la
|
|||
|
||||
# VIDEO RESOLUTION
|
||||
FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${FILE}" | cut -d "x" -f 2)p
|
||||
RES=$(zenity --entry --width 300 --title="Résolution" --text="Indiquez la résolution de la vidéo" --entry-text="${FILE_RES}" 720p 1080p SD HD 4K)
|
||||
RES=$(zenity --entry --width 300 --title="Résolution" --text="Indiquez la résolution de la vidéo" --entry-text="${FILE_RES}" SD HD 4K 360p 480p 720p 1080p)
|
||||
|
||||
# VIDEO SEASON or SAGA
|
||||
[[ "${CAT}" == "serie" || "${CAT}" == "anime" ]] && SAISON=$(zenity --entry --width 300 --title "${CHOICE} Saison" --text "Indiquez SAISON et EPISODE. Exemple: S02E05" --entry-text="")
|
||||
|
|
@ -113,6 +113,7 @@ FILM_GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut}\
|
|||
FALSE Animation\
|
||||
FALSE 'Arts martiaux'\
|
||||
FALSE Aventure\
|
||||
FALSE Autre\
|
||||
FALSE Biographie\
|
||||
FALSE Biopic\
|
||||
FALSE Comedie\
|
||||
|
|
@ -122,6 +123,7 @@ FILM_GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut}\
|
|||
FALSE Documentaire\
|
||||
FALSE Drame\
|
||||
FALSE Divers\
|
||||
FALSE Educatif\
|
||||
FALSE Enfant\
|
||||
FALSE 'Epouvante horreur'\
|
||||
FALSE Espionnage\
|
||||
|
|
@ -132,8 +134,9 @@ FILM_GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut}\
|
|||
FALSE Historique\
|
||||
FALSE Judiciaire\
|
||||
FALSE Opera\
|
||||
FALSE Musique\
|
||||
FALSE Medical\
|
||||
FALSE Musique\
|
||||
FALSE Mystere\
|
||||
FALSE Peplum\
|
||||
FALSE Policier\
|
||||
FALSE Romance\
|
||||
|
|
@ -145,10 +148,11 @@ FILM_GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut}\
|
|||
FALSE Thriller\
|
||||
FALSE Western)
|
||||
|
||||
# FORMAT GENRES ["genre1","genre2"]
|
||||
GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]"
|
||||
|
||||
# VIDEO GROUP
|
||||
GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="")
|
||||
GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="${XZUID}")
|
||||
|
||||
# VERIFICATION
|
||||
zenity --question --width ${large} --title "Vérifiez les informations: CAT; TMDB; YEAR; TITLE; SAISON; GENRES; GROUPES; RES"\
|
||||
|
|
@ -159,13 +163,43 @@ zenity --question --width ${large} --title "Vérifiez les informations: CAT; TMD
|
|||
########################################################################
|
||||
if [ $? = 0 ]
|
||||
then
|
||||
echo "OK! C'est parti... ajout de ${TITLE} dans ASTROPORT/KODI"
|
||||
echo "OK! Ajout de ${TITLE} dans ASTROPORT/KODI"
|
||||
zenity --warning --width 300 --text "Ajout de votre ${CAT} ${TITLE} dans ASTROPORT"
|
||||
NEWSHARE=$(ipfs add -wq "${FILE}" | tail -n 1)
|
||||
[[ $NEWSHARE == "" ]] && echo "ipfs add ERROR" && exit 1
|
||||
echo "ipfs ls /ipfs/$NEWSHARE"
|
||||
|
||||
mkdir -p ~/.zen/ipfs/xbian
|
||||
|
||||
## FIRST FILE ADDED: Create ~/.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 DUPLICATE
|
||||
isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs_swarm/xbian/${PREFIX}*)
|
||||
isLINKinMYINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
|
||||
# ADD FILE TO INDEX
|
||||
if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
|
||||
echo "${CAT};${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/${NEWSHARE}/${FILE_NAME}" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
|
||||
else
|
||||
echo "$NEWSHARE already in ASTROPORT. DO NOTHING"
|
||||
fi
|
||||
|
||||
echo "SYNCing with SWARM..."
|
||||
~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh
|
||||
echo "CREATE ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm INDEXES"
|
||||
echo "-----------------------------------------------------------------"
|
||||
mkdir -p /tmp/xbian/
|
||||
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 without header
|
||||
cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE
|
||||
mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN # Publish ASTROPORT/KODI INDEX
|
||||
|
||||
echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
|
||||
echo "-----------------------------------------------------------------"
|
||||
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 "$CAT ${FILE_NAME} ADDED"
|
||||
echo "CHECK INDEX : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"
|
||||
else
|
||||
echo "NON ! ANNULATION."
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue