From 8e00fa276a3f561b0c3a4fd6f3c5a987489aa59e Mon Sep 17 00:00:00 2001 From: qo-op Date: Thu, 4 Mar 2021 20:43:40 +0100 Subject: [PATCH 1/5] install handbrake* --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 49f5d45da..be8924fe2 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ sudo apt-get update sudo apt-get install git fail2ban inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel mpack libssl-dev libffi-dev -y sudo apt-get install build-essential qrencode jq bc gawk ffmpeg sqlite dnsutils vlc mp3info -y [[ ! $(which kodi) ]] && sudo apt-get install kodi -y -[[ "$USER" != "xbian" ]] && sudo apt-get install x11-utils zenity handbrake-gtk -y +[[ "$USER" != "xbian" ]] && sudo apt-get install x11-utils zenity handbrake* -y # [[ ! $(which apache2) ]] && sudo apt-get install mariadb-server nginx python3-certbot-nginx certbot ssl-cert php-imap php-cli php-curl php-sqlite3 php-gd php-json php-xml php-mbstring php-gettext php-mysql php-fpm -y pip3 install cryptography Ed25519 base58 google protobuf duniterpy From 6c98767e6dd69147c649dbb4549e53478c253329 Mon Sep 17 00:00:00 2001 From: qo-op Date: Thu, 4 Mar 2021 20:44:28 +0100 Subject: [PATCH 2/5] fingerprint IPFSREPFILEID. TODO: cut file if too long !! --- zen/new_mp3_in_astroport.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zen/new_mp3_in_astroport.sh b/zen/new_mp3_in_astroport.sh index 69bd3887d..03f2deac1 100755 --- a/zen/new_mp3_in_astroport.sh +++ b/zen/new_mp3_in_astroport.sh @@ -126,9 +126,9 @@ IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS) ## CHECK CONFIANCE and decide to fingerprint if (( $(echo "$CONFIANCE < 0.9" | bc -l) )); then - # USE IPNS KEY for "song_name" - NEWCOG=$(curl -X POST "http://localhost:8600/api/v1/mazash/fingerprint" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"cid\":\"${SAMPLEID}\",\"extension\":\".mp3\",\"song\":\"${IPNS}\"}") - echo "NEWCOG" | jq + # fingerprint track & USE IPNS KEY for "song_name" + NEWCOG=$(curl -X POST "http://localhost:8600/api/v1/mazash/fingerprint" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"cid\":\"${IPFSREPFILEID}\",\"extension\":\".mp3\",\"song\":\"${IPNS}\"}") + echo "$NEWCOG" | jq fi # MEMORIZE NEW PIN @@ -142,5 +142,7 @@ touch ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/${G1PUB} ######################################################################## rm -Rf ${YTEMP} +echo "NEW ($file) ADDED." +echo "IPNS LINK : http://127.0.0.1:8181/ipns/$KEY/$G1PUB/" exit 0 From f2877395dba359b0e4ef14983f3468a32f2d2439 Mon Sep 17 00:00:00 2001 From: qo-op Date: Thu, 4 Mar 2021 21:34:46 +0100 Subject: [PATCH 3/5] CAT collision between youtube and film --- ajouter_video.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ajouter_video.sh b/ajouter_video.sh index 4bf15dfa9..3c0e6d550 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -85,14 +85,17 @@ FILE_PATH="$HOME/astroport/youtube/$YID" mkdir -p ${FILE_PATH} && mv -f ${YTEMP}/* ${FILE_PATH}/ ## CORRECT PARAMETERS to Make Kodi compatible YASTRXBIAN FILE -CAT="film" -PREFIX="Y" TITLE="${YNAME%.*}" GENRES="[Youtube]" GROUPES="${XZUID}" 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 +## CREATE "~/astroport/${CAT}/${TMDB}/ajouter_video.txt" (with film CAT !!!) +URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri) +echo "film;${TMDB};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${TMDB}/ajouter_video.txt +# _IPFSREPFILEID_ is replaced later + rm -Rf ${YTEMP} ;; @@ -261,6 +264,12 @@ mkdir -p ~/astroport/${CAT}/${TMDB}/ mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${TMDB}/${TITLE}.${FILE_EXT}" && zenity --warning --width ${large} --text "Votre fichier ~/astroport/${CAT}/${TMDB}/${TITLE}.${FILE_EXT} est prêt à embarquer. Cliquez sur OK puis patientez quelques minutes..." FILE_NAME="${TITLE}.${FILE_EXT}" + +## CREATE "~/astroport/${CAT}/${TMDB}/ajouter_video.txt" +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 +# _IPFSREPFILEID_ is replaced later + ;; ######################################################################## @@ -276,13 +285,6 @@ FILE_NAME="${TITLE}.${FILE_EXT}" esac ######################################################################## -## CREATE "~/astroport/${CAT}/${TMDB}/ajouter_video.txt" -######################################################################## -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 -# _IPFSREPFILEID_ is replaced later - -######################################################################## # ADD $FILE to IPFS / ASTROPORT / KODI ######################################################################## ~/.zen/astrXbian/zen/new_file_in_astroport.sh "$HOME/astroport/${CAT}/${TMDB}/" "${FILE_NAME}" > /tmp/${CAT}_${TMDB}.log 2>&1 From b6d02f85015343a0af1b564879c076e0edc19fae Mon Sep 17 00:00:00 2001 From: qo-op Date: Thu, 4 Mar 2021 21:39:00 +0100 Subject: [PATCH 4/5] debug youtube copy --- ajouter_video.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ajouter_video.sh b/ajouter_video.sh index 3c0e6d550..6a73e24ca 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -87,7 +87,7 @@ mkdir -p ${FILE_PATH} && mv -f ${YTEMP}/* ${FILE_PATH}/ ## CORRECT PARAMETERS to Make Kodi compatible YASTRXBIAN FILE TITLE="${YNAME%.*}" GENRES="[Youtube]" -GROUPES="${XZUID}" +GROUPES="_IPNSKEY_" 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 From 9ac2c8a07bc7f6d7bb16f1b0bff24cda825d2822 Mon Sep 17 00:00:00 2001 From: qo-op Date: Thu, 4 Mar 2021 21:56:36 +0100 Subject: [PATCH 5/5] check if TMDB / REFERENCE is a number --- ajouter_video.sh | 7 ++++++- zen/new_file_in_astroport.sh | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ajouter_video.sh b/ajouter_video.sh index 6a73e24ca..ff595d898 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -182,8 +182,13 @@ zenity --question --width 300 --text "IMPORTANT! Nous allons ouvrir le site them [ $? == 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: 301528 (à extraire du lien https://www.themoviedb.org/movie/301528-toy-story-4)" --entry-text="") [[ $TMDB == "" ]] && exit 1 +if ! [[ "$TMDB" =~ ^[0-9]+$ ]] +then + zenity --warning --width ${large} --text "Vous devez renseigner un numéro! Merci de recommencer..." && exit 1 +fi + # VIDEO TITLE TITLE=$(zenity --entry --width 300 --title "Titre" --text "Indiquez le titre de la vidéo" --entry-text="${FILE_TITLE}") diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index 4ef92ebe1..67f41c78d 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -72,7 +72,11 @@ case ${CAT} in film | serie | anime) INDEXPREFIX="TMDB_" REFERENCE=$(echo "$path" | cut -d '/' -f 6 ) # Path contains TMDB id - [ "${REFERENCE}" -ne "${REFERENCE}" ] && echo "ERROR: $path BAD TMDB code. Get it from https://www.themoviedb.org/ " && exit 1 # ${REFERENCE} NOT A NUMBER + if ! [[ "$REFERENCE" =~ ^[0-9]+$ ]] # ${REFERENCE} NOT A NUMBER + then + echo "ERROR: $path BAD TMDB code. Get it from https://www.themoviedb.org/ " + exit 1 + fi ;; *) echo "$CAT inconnu" && exit 1