Boris
/
astrXbian_UX-et-webUI
forked from axiom-team/astrXbian
0
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

corrections

This commit is contained in:
qo-op 2021-07-01 23:50:02 +02:00
parent a079c69e54
commit d6816f1e26
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
ajouter_video.sh
View File

@ -125,7 +125,7 @@ JSON_FILE=$(echo ${FILE_NAME} | sed "s/${FILE_EXT}/json/g")
YID=$(echo "${FILE_NAME}" | cut -d "&" -f 1) YID=$(echo "${FILE_NAME}" | cut -d "&" -f 1)
YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | sed "s/[(][^)]*[)]//g" | sed -e 's/[^A-Za-z0-9._-]/_/g' | sed -e 's/__/_/g' ) # Remove YoutubeID_ and (what is in perentheses) YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | sed "s/[(][^)]*[)]//g" | sed -e 's/[^A-Za-z0-9._-]/_/g' | sed -e 's/__/_/g' ) # Remove YoutubeID_ and (what is in perentheses)
[[ $(which detox) ]] && YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | detox --inline) [[ $(which detox) ]] && YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | detox --inline)
TMDB="${YID}" MEDIAID="${YID}"
TITLE="${YNAME%.*}" TITLE="${YNAME%.*}"
## CORRECT PARAMETERS to Make Kodi compatible YASTRXBIAN FILE ## CORRECT PARAMETERS to Make Kodi compatible YASTRXBIAN FILE
@ -164,9 +164,9 @@ GROUPES="_IPNSKEY_" # USE GROUPS TO RECORD IPNS MEDIAKEY
FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${FILE_PATH}/${FILE_NAME}" | cut -d "x" -f 2) FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${FILE_PATH}/${FILE_NAME}" | cut -d "x" -f 2)
RES=${FILE_RES%?}0p RES=${FILE_RES%?}0p
## CREATE "~/astroport/${CAT}/${TMDB}/ajouter_video.txt" and video.json ## CREATE "~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt" and video.json
URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri) URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri)
echo "youtube;${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${TMDB}/ajouter_video.txt echo "youtube;${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt
# _IPFSREPFILEID_ is replaced later # _IPFSREPFILEID_ is replaced later
@ -230,7 +230,7 @@ mkdir -p "${FILE_PATH}" && mv -f ${YTEMP}/* "${FILE_PATH}/"
# Remove "&" from FILE_NAME rename to YNAME # Remove "&" from FILE_NAME rename to YNAME
mv "${FILE_PATH}/${FILE_NAME}" "${FILE_PATH}/${YNAME}" && FILE_NAME="${YNAME}" mv "${FILE_PATH}/${FILE_NAME}" "${FILE_PATH}/${YNAME}" && FILE_NAME="${YNAME}"
TMDB="${YID}" MEDIAID="${YID}"
TITLE="${YNAME%.*}" TITLE="${YNAME%.*}"
GENRES="[\"$AXID\"]" GENRES="[\"$AXID\"]"
GROUPES="_IPNSKEY_" # USE GROUPS TO RECORD IPNS MEDIAKEY GROUPES="_IPNSKEY_" # USE GROUPS TO RECORD IPNS MEDIAKEY
@ -238,9 +238,9 @@ GROUPES="_IPNSKEY_" # USE GROUPS TO RECORD IPNS MEDIAKEY
rm -Rf ${YTEMP} rm -Rf ${YTEMP}
# zenity --warning --width ${large} --text "MP3 copié" # zenity --warning --width ${large} --text "MP3 copié"
echo "~/.zen/astrXbian/zen/new_mp3_in_astroport.sh \"${FILE_PATH}/\" \"${FILE_NAME}\"" echo "~/.zen/astrXbian/zen/new_mp3_in_astroport.sh \"${FILE_PATH}/\" \"${FILE_NAME}\""
~/.zen/astrXbian/zen/new_mp3_in_astroport.sh "${FILE_PATH}/" "${FILE_NAME}" > /tmp/${CAT}_${TMDB}.log 2>&1 ~/.zen/astrXbian/zen/new_mp3_in_astroport.sh "${FILE_PATH}/" "${FILE_NAME}" > /tmp/${CHOICE}_${MEDIAID}.log 2>&1
cat /tmp/${CAT}_${TMDB}.log cat /tmp/${CHOICE}_${MEDIAID}.log
exit 0 exit 0
@ -272,9 +272,9 @@ zenity --question --width 300 --text "IMPORTANT! Vous devez indiquer le numéro
[ $? == 1 ] && exit 1 [ $? == 1 ] && exit 1
xdg-open "https://www.themoviedb.org/search?query=$(echo ${FILE_TITLE} | sed 's/_/%20/g')" xdg-open "https://www.themoviedb.org/search?query=$(echo ${FILE_TITLE} | sed 's/_/%20/g')"
TMDB=$(zenity --entry --title="Identification TMDB" --text="Indiquez le numéro de la fiche du film. Exemple: 301528 (à extraire du lien https://www.themoviedb.org/movie/301528-toy-story-4)" --entry-text="") MEDIAID=$(zenity --entry --title="Identification TMDB" --text="Indiquez le numéro de la fiche du film. Exemple: 301528 (à extraire du lien https://www.themoviedb.org/movie/301528-toy-story-4)" --entry-text="")
[[ $TMDB == "" ]] && exit 1 [[ $MEDIAID == "" ]] && exit 1
if ! [[ "$TMDB" =~ ^[0-9]+$ ]] if ! [[ "$MEDIAID" =~ ^[0-9]+$ ]]
then then
zenity --warning --width ${large} --text "Vous devez renseigner un numéro! Merci de recommencer... Seules les vidéos référencées sur The Movie Database sont acceptées." && exit 1 zenity --warning --width ${large} --text "Vous devez renseigner un numéro! Merci de recommencer... Seules les vidéos référencées sur The Movie Database sont acceptées." && exit 1
fi fi
@ -351,25 +351,25 @@ GROUPES="_IPNSKEY_" # USE GROUPES TO RECORD MEDIAKEY
# DEBUG VERIFICATION # DEBUG VERIFICATION
# zenity --question --width ${large} --title "EMBARQUEMENT ASTROPORT! OK?"\ # zenity --question --width ${large} --title "EMBARQUEMENT ASTROPORT! OK?"\
# --text "${FILE_NAME} (${CAT};${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES})" # --text "${FILE_NAME} (${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES})"
# [ $? == 1 ] && echo "ANNULATION." && exit 1 # [ $? == 1 ] && echo "ANNULATION." && exit 1
################################### ###################################
### MOVING FILE TO ~/astroport #### ### MOVING FILE TO ~/astroport ####
################################### ###################################
mkdir -p ~/astroport/${CAT}/${TMDB}/ mkdir -p ~/astroport/${CAT}/${MEDIAID}/
mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${TMDB}/${TITLE}.${FILE_EXT}" mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${MEDIAID}/${TITLE}.${FILE_EXT}"
if [ $? == 0 ]; then if [ $? == 0 ]; then
zenity --warning --width ${large} --text "Votre fichier ~/astroport/${CAT}/${TMDB}/${TITLE}.${FILE_EXT} est prêt à embarquer. Cliquez sur OK puis patientez quelques minutes..." zenity --warning --width ${large} --text "Votre fichier ~/astroport/${CAT}/${MEDIAID}/${TITLE}.${FILE_EXT} est prêt à embarquer. Cliquez sur OK puis patientez quelques minutes..."
else else
zenity --warning --width ${large} --text "Impossible de déplacer votre fichier ${FILE_PATH}/${FILE_NAME} vers ~/astroport - EXIT -" zenity --warning --width ${large} --text "Impossible de déplacer votre fichier ${FILE_PATH}/${FILE_NAME} vers ~/astroport - EXIT -"
exit 1 exit 1
fi fi
FILE_NAME="${TITLE}.${FILE_EXT}" FILE_NAME="${TITLE}.${FILE_EXT}"
## CREATE "~/astroport/${CAT}/${TMDB}/ajouter_video.txt" ## CREATE "~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt"
URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri) URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri)
echo "${CAT};${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${TMDB}/ajouter_video.txt echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt
# _IPFSREPFILEID_ is replaced later # _IPFSREPFILEID_ is replaced later
;; ;;
@ -407,12 +407,12 @@ echo "${CAT};${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipf
HASHTAG=$(awk -F ';' '{print $2}' <<<$OUTPUT) HASHTAG=$(awk -F ';' '{print $2}' <<<$OUTPUT)
## video_timestamp INDEX ## video_timestamp INDEX
TMDB="$(date -u +%s%N | cut -b1-13)" MEDIAID="$(date -u +%s%N | cut -b1-13)"
mkdir -p ~/astroport/${CAT}/${TMDB}/ mkdir -p ~/astroport/${CAT}/${MEDIAID}/
## CREATE SIMPLE JSON ## CREATE SIMPLE JSON
jq -n --arg ts "$TMDB" --arg title "$TITLE" --arg desc "$DESCRIPTION" --arg htag "$HASHTAG" '{"timestamp":$ts,"ipfs":"_IPFSREPFILEID_","ipns":"_IPNSKEY_","title":$title,"desc":$desc,"htag":$htag}' > ~/astroport/${CAT}/${TMDB}/video.json jq -n --arg ts "$MEDIAID" --arg title "$TITLE" --arg desc "$DESCRIPTION" --arg htag "$HASHTAG" '{"timestamp":$ts,"ipfs":"_IPFSREPFILEID_","ipns":"_IPNSKEY_","title":$title,"desc":$desc,"htag":$htag}' > ~/astroport/${CAT}/${MEDIAID}/video.json
## MOVE FILE TO IMPORT ZONE ## MOVE FILE TO IMPORT ZONE
mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${TMDB}/${TITLE}.${FILE_EXT}" mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${MEDIAID}/${TITLE}.${FILE_EXT}"
FILE_NAME="${TITLE}.${FILE_EXT}" FILE_NAME="${TITLE}.${FILE_EXT}"
;; ;;
@ -456,34 +456,34 @@ esac
######################################################################## ########################################################################
# ADD $FILE to IPFS / ASTROPORT / KODI # ADD $FILE to IPFS / ASTROPORT / KODI
echo "new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${TMDB}/\" \"${FILE_NAME}\"" echo "new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\""
[[ -f ~/astroport/${CAT}/${TMDB}/ajouter_video.txt ]] && cat ~/astroport/${CAT}/${TMDB}/ajouter_video.txt [[ -f ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt ]] && cat ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt
[[ -f ~/astroport/${CAT}/${TMDB}/video.json ]] && cat ~/astroport/${CAT}/${TMDB}/video.json [[ -f ~/astroport/${CAT}/${MEDIAID}/video.json ]] && cat ~/astroport/${CAT}/${MEDIAID}/video.json
########################################################################
########################################################################
########################################################################
########################################################################
########################################################################
~/.zen/astrXbian/zen/new_file_in_astroport.sh "$HOME/astroport/${CAT}/${TMDB}/" "${FILE_NAME}" > /tmp/${CAT}_${TMDB}.log 2>&1
######################################################################## ########################################################################
######################################################################## ########################################################################
######################################################################## ########################################################################
######################################################################## ########################################################################
######################################################################## ########################################################################
[[ "$CHOICE" == "film" || "$CHOICE" == "serie" ]] && CHOICE="TMDB" [[ "$CHOICE" == "film" || "$CHOICE" == "serie" ]] && CHOICE="TMDB"
~/.zen/astrXbian/zen/new_file_in_astroport.sh "$HOME/astroport/${CAT}/${MEDIAID}/" "${FILE_NAME}" > /tmp/${CHOICE}_${MEDIAID}.log 2>&1
########################################################################
########################################################################
########################################################################
########################################################################
########################################################################
MEDIAPUBKEY=$(cat $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${CHOICE}_${TMDB}/MEDIAPUBKEY) MEDIAPUBKEY=$(cat $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${CHOICE}_${MEDIAID}/MEDIAPUBKEY)
[ $? == 0 ] && zenity --warning --width 300 --text "Désolé une erreur est survenue... LOG: cat /tmp/${CAT}_${TMDB}.log" && exit 1 [ $? == 0 ] && zenity --warning --width 300 --text "Désolé une erreur est survenue... LOG: cat /tmp/${CHOICE}_${MEDIAID}.log" && exit 1
######################################################################## ########################################################################
echo "# ZENBALANCE for ${CHOICE}_${TMDB} , WALLET $MEDIAPUBKEY" echo "# ZENBALANCE for ${CHOICE}_${MEDIAID} , WALLET $MEDIAPUBKEY"
######################################################################## ########################################################################
G1BALANCE=$(~/.zen/astrXbian/zen/jaklis/jaklis.py balance -p $G1PUB) && [[ "$G1BALANCE" == "null" ]] && G1BALANCE = 0 G1BALANCE=$(~/.zen/astrXbian/zen/jaklis/jaklis.py balance -p $G1PUB) && [[ "$G1BALANCE" == "null" ]] && G1BALANCE=0 || G1BALANCE=$(echo "$G1BALANCE" | cut -d '.' -f 1)
if [[ $G1BALANCE >= 0 ]]; then if [[ $G1BALANCE -gt 0 ]]; then
G1AMOUNT=$(zenity --entry --width 400 --title "VIRER DE LA MONNAIE LIBRE AU MEDIAKEY (MAX $G1BALANCE)" --text "Combien de JUNE (G1) souhaitez-vous offrir à ce MEDIA" --entry-text="") G1AMOUNT=$(zenity --entry --width 400 --title "VIRER DE LA MONNAIE LIBRE AU MEDIAKEY (MAX $G1BALANCE)" --text "Combien de JUNE (G1) souhaitez-vous offrir à ce MEDIA" --entry-text="")
[[ ! "$G1AMOUNT" =~ ^[0-9]+$ ]] && G1AMOUNT=0 [[ ! "$G1AMOUNT" =~ ^[0-9]+$ ]] && G1AMOUNT=0
~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey pay -p ${MEDIAPUBKEY} -a $G1AMOUNT -c "INIT ASTROPORT MEDIA ${CHOICE}_${TMDB}" ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey pay -p ${MEDIAPUBKEY} -a $G1AMOUNT -c "#ASTROPORT:${CHOICE}_${MEDIAID} DON"
ZENBALANCE=$(echo "100 * $G1AMOUNT" | bc -l | cut -d '.' -f 1) ZENBALANCE=$(echo "100 * $G1AMOUNT" | bc -l | cut -d '.' -f 1)
else else
ZENBALANCE=0 ZENBALANCE=0
@ -492,13 +492,13 @@ fi
######################################################################## ########################################################################
zenity --width=500 --height=500 --text-info \ zenity --width=500 --height=500 --text-info \
--title="QR CODE MEDIA ${CHOICE}_${TMDB} (PASS=$(cat /tmp/${CHOICE}_${TMDB}.pass)) = $ZENBALANCE ZEN" \ --title="QR CODE MEDIA ${CHOICE}_${MEDIAID} (PASS=$(cat /tmp/${CHOICE}_${MEDIAID}.pass)) = $ZENBALANCE ZEN" \
--html \ --html \
--url="http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/KEY/${CHOICE}_${TMDB}/QR.png" \ --url="http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/KEY/${CHOICE}_${MEDIAID}/QR.png" \
--checkbox="Je m'engage à respecter les auteurs et promet d'offrir la Monnaie Libre collectée à qui de droit." --checkbox="Je m'engage à respecter les auteurs et promet d'offrir la Monnaie Libre collectée à qui de droit."
rm -f /tmp/${CHOICE}_${TMDB}.pass rm -f /tmp/${CHOICE}_${MEDIAID}.pass
rm -f /tmp/${CHOICE}_${TMDB}.dunikey ## REMOVE KEYS rm -f /tmp/${CHOICE}_${MEDIAID}.dunikey ## REMOVE KEYS
[ $? == 0 ] && zenity --warning --width 300 --text "OK! MEDIA transféré. URL LOCALHOST prête à coller (/tmp/${CAT}_${TMDB}.log)" && exit 0 \ [ $? == 0 ] && zenity --warning --width 300 --text "OK! MEDIA transféré. URL LOCALHOST prête à coller (/tmp/${CHOICE}_${MEDIAID}.log)" && exit 0 \
|| zenity --warning --width 300 --text "Désolé une erreur est survenue... LOG: cat /tmp/${CAT}_${TMDB}.log" && exit 1 || zenity --warning --width 300 --text "Désolé une erreur est survenue... LOG: cat /tmp/${CHOICE}_${MEDIAID}.log" && exit 1