diff --git a/ajouter_media.sh b/ajouter_media.sh index 29b10fbe..90478861 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -220,6 +220,8 @@ case ${CAT} in ######################################################################## vlog) + mkdir -p ~/Astroport/${PLAYER}/vlog + espeak "Ready to record your webcam" [ ! $2 ] && zenity --warning --width 300 --text "${PLAYER}. Prêt à enregistrer votre video ?" @@ -242,6 +244,8 @@ case ${CAT} in ######################################################################## youtube) + mkdir -p ~/Astroport/${PLAYER}/youtube + espeak "youtube : video copying" YTURL="$URL" @@ -294,17 +298,17 @@ espeak "OK $TITLE copied" MEDIAID="$REVSOURCE${YID}" MEDIAKEY="YOUTUBE_${MEDIAID}" -FILE_PATH="$HOME/Astroport/youtube/$MEDIAID" +FILE_PATH="$HOME/Astroport/${PLAYER}/youtube/$MEDIAID" mkdir -p ${FILE_PATH} && mv -f ${YTEMP}/* ${FILE_PATH}/ 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}/${MEDIAID}/ajouter_video.txt" and video.json +## CREATE "~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt" and video.json URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri) ## KEEPS KODI COMPATIBILITY (BROKEN astroport.py !! ) : TODO DEBUG -echo "youtube;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt +echo "youtube;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt # _IPFSREPFILEID_ is replaced later @@ -323,6 +327,8 @@ rm -Rf ${YTEMP} web) + mkdir -p ~/Astroport/${PLAYER}/web + # URL="https://discuss.ipfs.io/t/limit-ipfs-get-command/3573/6" espeak "Mirror web site" cd ~/.zen/tmp/ @@ -354,7 +360,7 @@ rm -Rf ${YTEMP} MEDIAID="WEB_${NIAMOD}" # MEDIAID=WEB_io.ipfs.discuss. - FILE_PATH="$HOME/Astroport/web/$MEDIAID"; # FILE_PATH=/home/fred/Astroport/web/WEB_io.ipfs.discuss. + FILE_PATH="$HOME/Astroport/${PLAYER}/web/$MEDIAID"; # FILE_PATH=/home/fred/Astroport/${PLAYER}/web/WEB_io.ipfs.discuss. start=`date +%s` @@ -385,7 +391,7 @@ rm -Rf ${YTEMP} ipfs name publish -k $MEDIAKEY /ipfs/$IPFSREPFILEID # PUBLISH $MEDIAKEY ## CREATE ajouter_video.txt - echo "web;${MEDIAID};${MOATS};${TITLE};${SAISON};${GENRES};$IPNSKEY;${RES};/ipfs/$IPFSREPFILEID" > ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt + echo "web;${MEDIAID};${MOATS};${TITLE};${SAISON};${GENRES};$IPNSKEY;${RES};/ipfs/$IPFSREPFILEID" > ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt ## DURATION LOG end=`date +%s` @@ -420,7 +426,7 @@ echo '[ "tags": "'ipfs G1Web $PLAYER webmaster@$DOMAIN'" } ] -' > ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json +' > ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json # zenity --warning --width ${large} --text "Copie $URL dans ${FILE_PATH}/ et /ipns/$IPNSKEY" @@ -440,6 +446,8 @@ echo '[ pdf) + mkdir -p ~/Astroport/${PLAYER}/pdf + espeak "Importing file or web page to P D F" ## EVOLVE TO ARTICLE # httrack --mirror --ext-depth=0 --depth=1 --near --stay-on-same-address --keep-links=0 --path article-x --quiet https://example.com/article-x/ @@ -488,10 +496,10 @@ echo '[ MEDIAID="$REVSOURCE$(echo "${TITLE}" | detox --inline)" MEDIAKEY="PDF_${MEDIAID}" - FILE_PATH="$HOME/Astroport/pdf/$MEDIAID" + FILE_PATH="$HOME/Astroport/${PLAYER}/pdf/$MEDIAID" mkdir -p ${FILE_PATH} && mv ~/.zen/tmp/output.pdf ${FILE_PATH}/${FILE_NAME} - echo "pdf;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt + echo "pdf;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt espeak 'Document ready' @@ -508,9 +516,11 @@ echo '[ ######################################################################## mp3) + mkdir -p ~/Astroport/${PLAYER}/mp3 + [[ $URL == "" ]] && URL=$(zenity --entry --width 500 --title "Lien Youtube à convertir en MP3" --text "Indiquez le lien (URL)" --entry-text="") espeak "OK." - yt-dlp -x --no-mtime --audio-format mp3 --embed-thumbnail --add-metadata -o "$HOME/Astroport/mp3/%(autonumber)s_%(title)s.%(ext)s" "$URL" + yt-dlp -x --no-mtime --audio-format mp3 --embed-thumbnail --add-metadata -o "$HOME/Astroport/${PLAYER}/mp3/%(autonumber)s_%(title)s.%(ext)s" "$URL" espeak "Ready. check your home Astoport mp3 directory" break @@ -527,6 +537,9 @@ echo '[ ######################################################################## film | serie) + mkdir -p ~/Astroport/${PLAYER}/film + mkdir -p ~/Astroport/${PLAYER}/serie + espeak "please select your file" # SELECT FILE TO ADD TO ASTROPORT/KODI @@ -552,15 +565,15 @@ TMTL=$(echo $MEDIAID | cut -d '-' -f 2-) # contient la fin du nom de fichier tmd if ! [[ "$CMED" =~ ^[0-9]+$ ]] 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. Sinon importez en mode 'Video'" && exit 1 fi MEDIAID=$CMED MEDIAKEY="TMDB_$MEDIAID" # VIDEO TITLE ### CHECK IF PREVIOUS ajouter_video (usefull for Serie) -[[ -f ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ -&& PRE=$(cat ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 4) \ +[[ -f ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ +&& PRE=$(cat ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 4) \ || PRE=${FILE_TITLE} ### TITLE=$(zenity --entry --width 300 --title "Titre" --text "Indiquez le titre de la vidéo" --entry-text="${PRE}") @@ -569,8 +582,8 @@ TITLE=$(echo "${TITLE}" | detox --inline ) # Clean TITLE (NO ;) # VIDEO YEAR ### CHECK IF PREVIOUS ajouter_video (Serie case) -[[ -f ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ -&& PRE=$(cat ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 3) \ +[[ -f ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ +&& PRE=$(cat ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 3) \ || PRE="" YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la vidéo. Exemple: 1985" --entry-text="${PRE}") @@ -580,8 +593,8 @@ RES=${FILE_RES%?}0p # Rounding. Replace last digit with 0 # VIDEO SEASON or SAGA ### CHECK IF PREVIOUS ajouter_video (Serie case) -[[ -f ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ -&& PRE=$(cat ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 5 | cut -d '_' -f 2) +[[ -f ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ +&& PRE=$(cat ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 5 | cut -d '_' -f 2) [[ "${CAT}" == "serie" ]] && SAISON=$(zenity --entry --width 300 --title "${CHOICE} Saison" --text "Indiquez SAISON et EPISODE. Exemple: S02E05" --entry-text="${PRE}") [[ "${CAT}" == "film" ]] && SAISON=$(zenity --entry --width 300 --title "${CHOICE} Saga" --text "Indiquez une SAGA (optionnel). Exemple: James Bond" --entry-text="") [[ $SAISON ]] && SAISON="_$SAISON" @@ -643,18 +656,18 @@ GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]" && FILE_EXT="mp4" && FILE_NAME="$FILE_TITLE.mp4" \ && espeak "M P 4 ready" -mkdir -p ~/Astroport/${CAT}/${MEDIAID}/ +mkdir -p ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ -[[ ! -s "$HOME/Astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" ]] \ -&& cp "${FILE_PATH}/${FILE_NAME}" "$HOME/Astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" \ +[[ ! -s "$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" ]] \ +&& cp "${FILE_PATH}/${FILE_NAME}" "$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" \ && [ $? != 0 ] \ && zenity --warning --width ${large} --text "(☓‿‿☓) ${FILE_PATH}/${FILE_NAME} vers ~/Astroport - EXIT -" && exit 1 FILE_NAME="${TITLE}${SAISON}.${FILE_EXT}" -## CREATE "~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt" +## CREATE "~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt" URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri) -echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt +echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt # _IPFSREPFILEID_ is replaced later ####################################################### ######## NOT CREATING TIDDLER JSON... SWALLOW IS POST-PROCESSED @@ -672,6 +685,8 @@ echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/i video) + mkdir -p ~/Astroport/${PLAYER}/video + espeak "Add your personnal video in TW" #~ zenity --warning --width 600 --text 'DEV-DEBUG : REGISTER https://git.p2p.legal' @@ -700,15 +715,15 @@ echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/i ## video_timestamp INDEX MEDIAID="$(date -u +%s%N | cut -b1-13)" - mkdir -p ~/Astroport/${CAT}/${MEDIAID}/ + mkdir -p ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ MEDIAKEY="VIDEO_${MEDIAID}" ## CREATE SIMPLE JSON (EXPERIENCE WITH it) - jq -n --arg ts "$MEDIAID" --arg title "$TITLE" --arg desc "$DESCRIPTION" --arg htag "$HASHTAG" '{"timestamp":$ts,"ipfs":"_IPFSREPFILEID_","ipns":"_IPNSKEY_","title":$title,"desc":$desc,"tag":$htag}' > ~/Astroport/${CAT}/${MEDIAID}/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,"tag":$htag}' > ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/video.json ## MOVE FILE FOR new_file_in_astroport POST TREATMENT - [[ ! -s "$HOME/Astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" ]] \ - && cp "${FILE_PATH}/${FILE_NAME}" "$HOME/Astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" + [[ ! -s "$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" ]] \ + && cp "${FILE_PATH}/${FILE_NAME}" "$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" FILE_NAME="${TITLE}.${FILE_EXT}" @@ -750,50 +765,50 @@ fi ################################### ### MOVING FILE TO ~/astroport #### ################################### -mkdir -p ~/Astroport/${CAT}/${MEDIAID}/ -mv ~/.zen/tmp/screen.png ~/Astroport/${CAT}/${MEDIAID}/screen.png +mkdir -p ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ +mv ~/.zen/tmp/screen.png ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/screen.png ######################################################################## # ADD $FILE to IPFS / ASTROPORT / KODI -echo "(♥‿‿♥) new_file_in_astroport.sh \"$HOME/Astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\"" "$3" -[[ -f ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt ]] && cat ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt -# LOG NOISE # [[ -f ~/Astroport/${CAT}/${MEDIAID}/video.json ]] && cat ~/Astroport/${CAT}/${MEDIAID}/video.json +echo "(♥‿‿♥) new_file_in_astroport.sh \"$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\"" "$3" +[[ -f ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt ]] && cat ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/ajouter_video.txt +# LOG NOISE # [[ -f ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/video.json ]] && cat ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/video.json ######################################################################## -## CREATION DU FICHIER ~/Astroport/Add_${MEDIAKEY}_script.sh +## CREATION DU FICHIER ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh ######################################################################## ### AJOUT DANS IPFS ####################################################### ######################################################################## ####################################new_file_in_astroport.sh################## ######################################################################## -if [[ ! -s ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; then +if [[ ! -s ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; then [[ "$CAT" == "film" || "$CAT" == "serie" ]] && CHOICE="TMDB" timestamp=$(date -u +%s%N | cut -b1-13) ## CREATE BASH SCRIPT - echo "MEDIAKEY=${MEDIAKEY}" > ~/Astroport/Add_${MEDIAKEY}_script.sh + echo "MEDIAKEY=${MEDIAKEY}" > ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh ## ACTIVATE h265 conversion .? #[[ $CHOICE == "TMDB" ]] && echo "echo \"Encoder ${FILE_NAME} en h265 avant import ? Tapez sur ENTER.. Sinon saisissez qqch avant...\" #reponse=\$1 #[[ ! \$reponse ]] && read reponse #if [[ ! \$reponse ]]; then - # ffmpeg -i \"$HOME/Astroport/${CAT}/${MEDIAID}/${FILE_NAME}\" -vcodec libx265 -crf 28 $HOME/Astroport/${MEDIAID}.mp4 - # mv \"$HOME/Astroport/${CAT}/${MEDIAID}/${FILE_NAME}\" \"$HOME/Astroport/${CAT}/${MEDIAID}/${FILE_NAME}.old\" - # mv $HOME/Astroport/${MEDIAID}.mp4 \"$HOME/Astroport/${CAT}/${MEDIAID}/${FILE_NAME}.mp4\" - # ${MY_PATH}/tools/new_file_in_astroport.sh \"$HOME/Astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}.mp4\" - #else" >> ~/Astroport/Add_${MEDIAKEY}_script.sh + # ffmpeg -i \"$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${FILE_NAME}\" -vcodec libx265 -crf 28 $HOME/Astroport/${PLAYER}/${MEDIAID}.mp4 + # mv \"$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${FILE_NAME}\" \"$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${FILE_NAME}.old\" + # mv $HOME/Astroport/${PLAYER}/${MEDIAID}.mp4 \"$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${FILE_NAME}.mp4\" + # ${MY_PATH}/tools/new_file_in_astroport.sh \"$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/\" \"${FILE_NAME}.mp4\" + #else" >> ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh # $3 is the G1PUB of the PLAYER - echo "${MY_PATH}/tools/new_file_in_astroport.sh \"$HOME/Astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\" \"$G1PUB\"" >> ~/Astroport/Add_${MEDIAKEY}_script.sh + echo "${MY_PATH}/tools/new_file_in_astroport.sh \"$HOME/Astroport/${PLAYER}/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\" \"$G1PUB\"" >> ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh - #[[ $CHOICE == "TMDB" ]] && echo "fi" >> ~/Astroport/Add_${MEDIAKEY}_script.sh + #[[ $CHOICE == "TMDB" ]] && echo "fi" >> ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh - echo "mv ~/Astroport/Add_${MEDIAKEY}_script.sh \"$HOME/Astroport/${FILE_NAME}_DONE.sh\" - " >> ~/Astroport/Add_${MEDIAKEY}_script.sh + echo "mv ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh \"$HOME/Astroport/${PLAYER}/${FILE_NAME}_DONE.sh\" + " >> ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh - chmod +x ~/Astroport/Add_${MEDIAKEY}_script.sh + chmod +x ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh ######################################################################## echo "(♥‿‿♥) $MEDIAKEY IPFS MIAM (ᵔ◡◡ᵔ)" @@ -802,7 +817,7 @@ if [[ ! -s ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; then espeak "Adding $CAT to I P F S. Please Wait" ## RUN BASH SCRIPT - bash ~/Astroport/Add_${MEDIAKEY}_script.sh "noh265" + bash ~/Astroport/${PLAYER}/Add_${MEDIAKEY}_script.sh "noh265" ## OR PUT IN YOUR QUEUE ## CREATING TIMELINE FOR BATCH TREATMENT @@ -817,7 +832,7 @@ fi ####################################### ########################## TIDDLER JSON READY ####################################### -if [[ -s ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; then +if [[ -s ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; then espeak "Updating T W" ######################################################################## @@ -842,7 +857,7 @@ if [[ -s ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; then echo "Nouveau MEDIAKEY dans TW $PSEUDO / ${PLAYER} : $myIPFS/ipns/$ASTRONAUTENS" tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \ - --import ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json "application/json" \ + --import ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json "application/json" \ --output ~/.zen/tmp --render "$:/core/save/all" "newindex.html" "text/plain" if [[ -s ~/.zen/tmp/newindex.html ]]; then @@ -862,7 +877,7 @@ if [[ -s ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; then && sed -i "s~$CURCHAIN~$ZCHAIN~g" ~/.zen/tmp/newindex.html ################################################ - mv ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ~/Astroport/${CAT}/${MEDIAID}/${MOATS}.dragdrop.json + mv ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MOATS}.dragdrop.json espeak "I P N S Publishing. Please wait..." cp ~/.zen/tmp/newindex.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html [[ $DIFF ]] && cp ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain \ diff --git a/rec.desktop b/rec.desktop new file mode 100644 index 00000000..5b2c0dd6 --- /dev/null +++ b/rec.desktop @@ -0,0 +1,7 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Name=REC +Exec=/home/_USER_/.zen/Astroport.ONE/ajouter_media.sh +Icon=/home/_USER_/.zen/Astroport.ONE/rec.png +Type=Application +Categories=Utility diff --git a/setup.sh b/setup.sh index 2271adb6..5a11b0cf 100755 --- a/setup.sh +++ b/setup.sh @@ -26,13 +26,13 @@ mkdir -p ~/.zen/tmp ######################################################################## # CREATE ~/astroport FILESYSTEM GATE -mkdir -p ~/Astroport/film -mkdir -p ~/Astroport/serie -mkdir -p ~/Astroport/anime -mkdir -p ~/Astroport/page -mkdir -p ~/Astroport/web -mkdir -p ~/Astroport/video -echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME' > ~/Astroport/ajouter_video.modele.txt +mkdir -p ~/Astroport/${PLAYER}/film +mkdir -p ~/Astroport/${PLAYER}/serie +mkdir -p ~/Astroport/${PLAYER}/anime +mkdir -p ~/Astroport/${PLAYER}/page +mkdir -p ~/Astroport/${PLAYER}/web +mkdir -p ~/Astroport/${PLAYER}/video +echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME' > ~/Astroport/${PLAYER}/ajouter_video.modele.txt ####################################################################### diff --git a/tools/FR_AssembleeNationale.sh b/tools/FR_AssembleeNationale.sh new file mode 100755 index 00000000..f78872ad --- /dev/null +++ b/tools/FR_AssembleeNationale.sh @@ -0,0 +1,143 @@ +#!/usr/bin/env bash + +set -e + +function trap_errors() { + echo "" + echo "Debbuging:" + echo " pwd: $(pwd)" + echo " MAIN_DIR: ${MAIN_DIR}" + clean_on_exit +} + +trap trap_errors ERR + +MAIN_DIR=~/.zen/FR +mkdir -p ~/.zen/FR + +USER_AGENT="Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/109.0" + +cd "${MAIN_DIR}" + +echo -n "Creating directories..." +TMP_DIR=$(mktemp -d) +mkdir -p "${MAIN_DIR}/data/" +mkdir -p "data/gen/an/images/" +echo " done." + + +if [[ ! -s "${MAIN_DIR}/data/an.zip" ]]; then + echo -n "Downloading data..." + wget -q -U "${USER_AGENT}" "https://data.assemblee-nationale.fr/static/openData/repository/16/amo/deputes_actifs_mandats_actifs_organes/AMO10_deputes_actifs_mandats_actifs_organes.json.zip" -O "${MAIN_DIR}/data/an.zip" + cd "${MAIN_DIR}/data/" + echo " done." + + echo -n "Extracting data..." + unzip an.zip + echo " done. " +fi + +cd "${MAIN_DIR}/data/" + +find json/acteur/ -type f | sed 's/\.json//i' | sed 's/json\/acteur\///i' | while read -r key; do + echo -n "Parsing ${key}" + + first_name=$(jq -r .acteur.etatCivil.ident.prenom "json/acteur/${key}.json") + echo -n " (${first_name} " + last_name=$(jq -r .acteur.etatCivil.ident.nom "json/acteur/${key}.json") + echo "${last_name})" + + email=$(jq -r '.acteur.adresses.adresse | map(. | select(.type=="15")) | .[].valElec' "json/acteur/${key}.json" | tac | awk '{print tolower($0)}') + phoneRaw=$(jq -r '.acteur.adresses.adresse | map(. | select(.type=="11")) | .[].valElec' "json/acteur/${key}.json" | tac) + + IFS=$'\n' + phone="" + if [ ! -z "$phoneRaw" ]; then + for i in $phoneRaw; do + phone="$(echo ${i} | tr -d ' .' | sed 's/(0)//i' | sed 's/^00/\+/i' | sed 's/^0590/\+590/i' | sed 's/^0596/\+596/i' | sed 's/^0594/\+594/i' | sed 's/^0262/\+262/i' | sed 's/^0508/\+508/i' | sed 's/^0269/\+262269/i' )"$'\n'"${phone}" + done + fi + + phonesChamber=$(jq -r "map(select(.name==\"${first_name} ${last_name}\")) | .[].phone" "json/acteur/${key}.json" | tr -d ' .' 2>/dev/null) + + if [ ! -z "$phonesChamber" ]; then + for i in $phonesChamber; do + phone=$(echo "${phone}" | sed "s/${i}//g" | sort -u) + phone="${i}"$'\n'"${phone}" + done + fi + + twitter=$(jq -r '.acteur.adresses.adresse | map(. | select(.type=="24")) | .[].valElec' "json/acteur/${key}.json" | sed 's/\@//i') + facebook=$(jq -r '.acteur.adresses.adresse | map(. | select(.type=="25")) | .[].valElec' "json/acteur/${key}.json" | sed 's/\@//i') + + commissionsRef=$(jq -r '.acteur.mandats[] | map(. | select(.typeOrgane=="COMPER" or .typeOrgane=="COMNL")) | .[].organes.organeRef' "json/acteur/${key}.json" | sort -u) + + commissions="" + if [ ! -z "$commissionsRef" ]; then + for i in $commissionsRef; do + commissions="${commissions}"$'\n'"$(jq -r .organe.libelleAbrege json/organe/${i}.json)" + done + fi + + county=$(jq -r '.acteur.mandats[] | map(. | select(.typeOrgane=="ASSEMBLEE")) | .[].election.lieu.departement' "json/acteur/${key}.json" | head -1) + + groupRef=$(jq -r '.acteur.mandats[] | map(. | select(.typeOrgane=="GP")) | .[].organes.organeRef' "json/acteur/${key}.json" | head -1) + group=$(jq -r .organe.libelle json/organe/${groupRef}.json) + + photo=$(echo ${key} | sed 's/PA//i') + + filename="${MAIN_DIR}/data/${key}.yml" + +[[ -s ${filename} ]] && cat "${filename}" && continue + + echo -n " Writing data..." + echo "id: ${key}" > "${filename}" + echo "last_name: ${last_name}" >> "${filename}" + echo "first_name: ${first_name}" >> "${filename}" + echo "group: ${group}" >> "${filename}" + echo "county: ${county}" >> "${filename}" + + echo "commissions:" >> "${filename}" + if [ ! -z "${commissions}" ]; then + for i in ${commissions}; do + echo "- \"${i}\"" >> "${filename}" + done + fi + + echo -n "phone:" >> "${filename}" + if [ ! -z "${phone}" ]; then + echo "" >> "${filename}" + for i in ${phone}; do + echo "- \"${i}\"" >> "${filename}" + done + else + echo " \"\"" >> "${filename}" + fi + + echo "email:" >> "${filename}" + if [ ! -z "${email}" ]; then + for i in ${email}; do + echo "- \"${i}\"" >> "${filename}" + done + fi + + echo "twitter: ${twitter}" >> "${filename}" + echo "facebook: ${facebook}" >> "${filename}" + echo "photo: ${photo}" >> "${filename}" + + echo " done." + + echo -n " Downloading photo..." + if [ ! -f "${MAIN_DIR}/data/gen/an/images/${photo}.jpg" ]; then + wget -q -U "${USER_AGENT}" "https://www2.assemblee-nationale.fr/static/tribun/16/photos/${photo}.jpg" -O "${MAIN_DIR}/data/gen/an/images/${photo}.jpg" + fi + echo " done." + + cat "${filename}" + +CUR=5 +WHAT=${RANDOM:0:1} +echo "sleeping $((CUR+WHAT))" +sleep $((CUR+WHAT)) + +done diff --git a/tools/TW.cache.sh b/tools/TW.cache.sh index 26a2fade..59d05c07 100755 --- a/tools/TW.cache.sh +++ b/tools/TW.cache.sh @@ -11,8 +11,11 @@ MOATS="$2" [[ ! ${ASTRONAUTENS} || ! $MOATS ]] && echo "${ME} : ASTRONAUTENS & MOATS needed" && exit 1 start=$(date +%s) -[[ ! ${IPFSNODEID} ]] && IPFSNODEID=$(ipfs --timeout 12s id -f='\n') || ( echo "${ME} : IPFSNODEID MISSING" && exit 1 ) - +[[ ${IPFSNODEID} == "" ]]; then + IPFSNODEID=$(ipfs --timeout 12s id -f='\n') +else + echo "${ME} : IPFSNODEID MISSING" && exit 1 +fi ## GETTING LAST TW via IPFS echo "${ME} : IPFS : ipfs --timeout 120s cat /ipns/${ASTRONAUTENS}"\ && ipfs --timeout 360s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/coucou/${MOATS}.astroindex.html @@ -50,7 +53,8 @@ start=$(date +%s) ## IN CACHE echo "${ME} : CACHING ~/.zen/tmp/${IPFSNODEID}/$PLAYER/" mkdir -p ~/.zen/tmp/${IPFSNODEID}/$PLAYER/ - cp -f ~/.zen/tmp/coucou/${MOATS}.astroindex.html ~/.zen/tmp/${IPFSNODEID}/$PLAYER/index.html + cp -f ~/.zen/tmp/coucou/${MOATS}.astroindex.html ~/.zen/tmp/${IPFSNODEID}/$PLAYER/index.html \ + && rm ~/.zen/tmp/coucou/${MOATS}.astroindex.html ### NO TW !! else diff --git a/tools/download_from_kodi_log.sh b/tools/download_from_kodi_log.sh deleted file mode 100755 index 91eedfc7..00000000 --- a/tools/download_from_kodi_log.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash -######################################################################## -# Author: papiche -# Version: 0.1 -# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.${MOATS}/) -######################################################################## -# download_from_kodi_log.sh -######################################################################## -echo "Extract uqload links from ~/.kodi/temp/kodi.${OLD}log" -# Detects uqload links and ask for copying it to $HOME/astroport -######################################################################## -MY_PATH="`dirname \"$0\"`" # relative -MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized -SCRIPT="${0##*/}" - -isKodiRunning=$(ps auxf --sort=+utime | grep -w 'kodi-x11' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) - -if [[ ! $isKodiRunning ]]; then - echo "Kodi is not running" -fi - - -# script usage -usage() -{ -# if argument passed to function echo it -[ -z "${1}" ] || echo "! ${1}" -# display help -echo "\ -# extract played uqload links from kodi log file -$(basename "$0") : current log scraping -$(basename "$0") old scraping" -exit 2 -} - -IPFSNODEID=$(ipfs --timeout 5s id -f='\n') -[[ ! $IPFSNODEID ]] && IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID) -[[ $IPFSNODEID == "" ]] && echo "IPFS APPLICATION. P.LEASE " && exit 1 - -mkdir -p ~/.zen/tmp/${IPFSNODEID}/uqdl/ - -## CHOOSE kodi.${OLD}log -[[ $1 == "old" ]] && OLD='old.' || OLD='' - -[[ ! $(which kodi) ]] && echo "KODI IS MISSING." && exit 1 - - function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } - -## LOOP -cycle=1 -for uqlink in $(cat ~/.kodi/temp/kodi.${OLD}log | grep uqload | grep 'play :' | rev | cut -d '/' -f 1 | rev); -do - proname=$(cat ~/.kodi/temp/kodi.${OLD}log | grep uqload | grep $uqlink | grep VideoPlayer | cut -d '=' -f 4 | cut -d '&' -f 1) - uqname=$(urldecode $proname | detox --inline) - - [[ ! $uqname ]] && echo "$uqlink is BAD" && continue - cycle=$((cycle+1)) - - echo "########################################################################" - echo "MANUAL : uqload_downloader https://uqload.com/$uqlink \"$HOME/Astroport/film/${MOATS}/$uqname.mp4\"" - - ! cat ~/.zen/tmp/${IPFSNODEID}/uqdl/commands.fifo | grep -w "$uqname.mp4" && \ - echo "uqload_downloader https://uqload.com/$uqlink \"$HOME/Astroport/$uqname.mp4\"" >> ~/.zen/tmp/${IPFSNODEID}/uqdl/commands.fifo || \ - echo "$uqname.mp4 detected in ~/.zen/tmp/${IPFSNODEID}/uqdl/commands.fifo" - - ## CHECK & MANAGE COPY - if [[ $(find $HOME/Astroport -name "$uqname.mp4" -type f -print) ]]; - then - echo "FILE ALREADY IN $HOME/Astroport/" - continue - else - MOATS=$(date -u +"%Y%m%d%H%M%S%4N") - mkdir -p $HOME/Astroport/film/${MOATS} - echo "DETECTED MOVIE : $uqname (https://uqload.com/$uqlink)" - uqload_downloader https://uqload.com/$uqlink "$HOME/Astroport/film/${MOATS}/$uqname.mp4" - echo "COPY ~/Astroport/film/${MOATS}/$uqname.mp4 DONE" - #~ ## RUNNING ON ASTROPORT STATION? - #~ ( - #~ [[ $(which ipfs) && $IPFSNODEID ]] \ - #~ && espeak "Download $uqname done. Adding file to I P F S" \ - #~ && ~/.zen/Astroport.ONE/tools/new_file_in_astroport.sh "$HOME/Astroport/film/${MOATS}/" "$uqname.mp4" - #~ && CID=$(ipfs add -q ~/Astroport/$uqname.mp4 | tail -n 1) \ - #~ && mkdir -p ~/.zen/tmp/$IPFSNODEID/$PLAYER/Astroport/ \ - #~ && echo "/ipfs/$CID" > ~/.zen/tmp/$IPFSNODEID/Astroport/$uqname.mp4.ipfs \ - #~ && espeak "Added to Station 12345 mapping" - #~ ) & - fi -done -echo -echo "########################################################################" -[[ $cycle == 1 && ! ${OLD} ]] && echo "NOTHING IN CURRENT LOG, TRY old ?" && read OLD && [[ "$OLD" != "" ]] && $MY_PATH/$SCRIPT old -echo "DONE... VideoClub Datacenter Virtuel entre amis." -echo "ASTROPORT. Le web des gens." -exit 0 diff --git a/tools/make_m3u_playlist_from_G1Video_json_flux.sh b/tools/make_m3u_playlist_from_G1Video_json_flux.sh index 68cdb9bc..eba8c479 100755 --- a/tools/make_m3u_playlist_from_G1Video_json_flux.sh +++ b/tools/make_m3u_playlist_from_G1Video_json_flux.sh @@ -6,8 +6,8 @@ ######################################################################## ### TAKE A G1Video tiddlers JSON Flux and make a m3u playlist ############################################### -# USE : $IPFSGW/ipns/$VOEUNS/$PLAYER.tiddlers.json > ~/Astroport/playlist.m3u -## && vlc ~/Astroport/playlist.m3u +# USE : $IPFSGW/ipns/$VOEUNS/$PLAYER.tiddlers.json > ~/Astroport/${PLAYER}/playlist.m3u +## && vlc ~/Astroport/${PLAYER}/playlist.m3u ############################################### MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized @@ -29,7 +29,7 @@ IPFSGW="$2" [[ ! $VIDEOJSONTIDDLERSURL ]] \ && echo "Please provide WISHKEY URL : G1Video JSON Flux URL. TRY" \ -&& echo "$MY_PATH/$ME $IPFSGW/ipns/k51qzi5uqu5dkb5rpiwbu1waex0ve41mi3k3935712z6nhrdesicg2te53glp1/fred@g1sms.fr.tiddlers.json > ~/Astroport/playlist.m3u" \ +&& echo "$MY_PATH/$ME $IPFSGW/ipns/k51qzi5uqu5dkb5rpiwbu1waex0ve41mi3k3935712z6nhrdesicg2te53glp1/fred@g1sms.fr.tiddlers.json > ~/Astroport/${PLAYER}/playlist.m3u" \ && exit 1 JT=$(echo $VIDEOJSONTIDDLERSURL | rev | cut -d '/' -f 1 | rev) diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index 6772bc0b..7c706b68 100755 --- a/tools/new_file_in_astroport.sh +++ b/tools/new_file_in_astroport.sh @@ -4,7 +4,7 @@ # Version: 0.3 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) ######################################################################## -# COPY ~/Astroport/* files to IPFS +# COPY ~/Astroport/${PLAYER}/* files to IPFS # Publish INDEX ~/.zen/game/players/$PLAYER/ipfs/.*/${PREFIX}ASTRXBIAN ######## #### ### ## # start=`date +%s` @@ -22,15 +22,15 @@ YOU=$(myIpfsApi); alias zenity='zenity 2> >(grep -v GtkDialog >&2)' -# ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/Astroport/kodi/vstream/${PREFIX}ASTRXBIAN +# ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/Astroport/${PLAYER}/kodi/vstream/${PREFIX}ASTRXBIAN # Astropot/Kodi/Vstream source reads ${PREFIX}ASTRXBIAN from $myIPFS/.$IPFNODEID/ # Index File Format (could be enhanced) is using Kodi TMDB enhancement # https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films ######################################################################## -## RUN inotifywait process ~/Astroport/ NEW FILE DETECT +## RUN inotifywait process ~/Astroport/${PLAYER}/ NEW FILE DETECT # /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do ~/.zen/Astroport.ONE/tools/new_file_in_astroport.sh "$dir" "$file"; done & -# mkdir -p ~/Astroport/youtube -# mkdir -p ~/Astroport/mp3 +# mkdir -p ~/Astroport/${PLAYER}/youtube +# mkdir -p ~/Astroport/${PLAYER}/mp3 ######################################################################## path="$1" @@ -93,11 +93,11 @@ PLAYER=$(cat ~/.zen/game/players/.current/.player 2>/dev/null); ## Indicate IPFSNODEID copying mkdir -p ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID} -### SOURCE IS ~/Astroport/ !! -[[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'Astroport') ]] && er="Les fichiers sont à placer dans ~/Astroport/ MERCI" && echo "$er" && exit 1 +### SOURCE IS ~/Astroport/${PLAYER}/ !! +[[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'Astroport') ]] && er="Les fichiers sont à placer dans ~/Astroport/${PLAYER}/ MERCI" && echo "$er" && exit 1 ### TyPE & type & T = related to ~/astroport location of the infile (mimetype subdivision) -TyPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/Astroport/... TyPE(film, youtube, mp3, video, pdf)/ REFERENCE / +TyPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/Astroport/${PLAYER}/... TyPE(film, youtube, mp3, video, pdf)/ REFERENCE / type=$(echo "$TyPE" | awk '{ print tolower($0) }') PREFIX=$(echo "$TyPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, Y, M ou Y (all the alaphabet can address a data type @@ -243,21 +243,21 @@ then [[ ! $3 ]] && HASHTAG=$(awk -F '~' '{print $2}' <<<$OUTPUT) # # # # ${MOATS}_ajouter_video.txt DATA # # # # - if [[ -f ~/Astroport/${TyPE}/${REFERENCE}/ajouter_video.txt ]] + if [[ -f ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/ajouter_video.txt ]] then - line=$(cat ~/Astroport/${TyPE}/${REFERENCE}/ajouter_video.txt | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g" | sed "s/_IPNSKEY_/$IPNS/g" ) + line=$(cat ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/ajouter_video.txt | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g" | sed "s/_IPNSKEY_/$IPNS/g" ) else line="$type;${REFERENCE};$YEAR;$TITLE;$SAISON;;${IPNS};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" fi echo "-------------------- ${MOATS}_ajouter_video.txt -----------------------------" echo "$line" - echo "UPDATE ~/Astroport/${TyPE}/${REFERENCE}/ajouter_video.txt" - echo "$line" > ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt + echo "UPDATE ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/ajouter_video.txt" + echo "$line" > ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt echo "----------------- GETTING METADATA ----------------------" CAT=$(echo "$type" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords - GENRE=$(cat ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 6 | sed 's/|/ /g' | jq -r '@csv' | sed 's/ /_/g' | sed 's/,/ /g' | sed 's/\"//g' ) - YEAR=$(cat ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 3 ) + GENRE=$(cat ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 6 | sed 's/|/ /g' | jq -r '@csv' | sed 's/ /_/g' | sed 's/,/ /g' | sed 's/\"//g' ) + YEAR=$(cat ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 3 ) ## Adapt TMDB url for season & tag naming [[ $CAT == "Film" ]] \ @@ -266,7 +266,7 @@ then && FILETAG="$CapitalGluedTitle" [[ $CAT == "Serie" ]] && H1="

"${TITLE}"

" \ - && SAISON=$(cat ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 5 | cut -d '_' -f 2) \ + && SAISON=$(cat ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 5 | cut -d '_' -f 2) \ && FILETAG=$(echo "$CapitalGluedTitle" | cut -d '_' -f 1) [[ $CAT == "Youtube" ]] \ @@ -276,8 +276,8 @@ then echo $GENRE $SAISON ## Add screenshot - [[ -f $HOME/Astroport/${TyPE}/${REFERENCE}/screen.png ]] \ - && SCREEN=$(ipfs add -q "$HOME/Astroport/${TyPE}/${REFERENCE}/screen.png" | tail -n 1) + [[ -f $HOME/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/screen.png ]] \ + && SCREEN=$(ipfs add -q "$HOME/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/screen.png" | tail -n 1) if [[ $(echo "$MIME" | grep 'video') ]]; then @@ -300,8 +300,8 @@ then fi ## Archive previous dragdrop.json - [[ -s ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json ]] \ - && cp ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}.${MEDIAKEY}.dragdrop.json + [[ -s ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json ]] \ + && cp ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MOATS}.${MEDIAKEY}.dragdrop.json echo "## Creation json tiddler" echo '[ @@ -332,22 +332,22 @@ then "ipns": "'/ipns/${IPNS}'", "tmdb": "'${REFERENCE}'", "modified": "'${MOATS}'", - "tags": "'${TAGS}'" ' > ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json + "tags": "'${TAGS}'" ' > ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json [[ ${CANON} != "" ]] && echo ', - "_canonical_uri": "'${CANON}'"' >> ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json + "_canonical_uri": "'${CANON}'"' >> ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json echo ' } ] -' >> ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json +' >> ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json -echo "~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json copy into Station Balise" +echo "~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json copy into Station Balise" ############################################################################# ## ARCHIVE FOR IPFSNODEID CACHE SHARING (APPNAME=KEY) mkdir -p "$HOME/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MIME}/${MEDIAKEY}/${G1PUB}/" -cp ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MIME}/${MEDIAKEY}/${G1PUB}/tiddler.json" +cp ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MIME}/${MEDIAKEY}/${G1PUB}/tiddler.json" ############################################################################# ## TODO : Do we keep that ? diff --git a/tools/new_mp3_in_astroport.sh b/tools/new_mp3_in_astroport.sh index 5b9957b8..fd18ea5c 100755 --- a/tools/new_mp3_in_astroport.sh +++ b/tools/new_mp3_in_astroport.sh @@ -4,7 +4,7 @@ # Version: 0.3 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) ######################################################################## -# COPY ~/Astroport/mp3/artist/song files to IPFS +# COPY ~/Astroport/${PLAYER}/mp3/artist/song files to IPFS ######## #### ### ## # MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized @@ -38,7 +38,7 @@ TITLE="${YNAME%.*}" FILE_EXT="${file##*.}" [[ "$FILE_EXT" != "mp3" ]] && echo "Extension inconnue. Seul le format mp3 est accepté ... EXIT" && exit 1 -[[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'astroport') ]] && echo "Les fichiers sont à placer dans ~/Astroport/mp3/ MERCI" && exit 1 +[[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'astroport') ]] && echo "Les fichiers sont à placer dans ~/Astroport/${PLAYER}/mp3/ MERCI" && exit 1 CAT=$(echo "$path" | cut -d '/' -f 5 ) # mp3 ARTIST=$(echo "$path" | cut -d '/' -f 6 ) # artist || YID ALBUM=$(echo "$path" | cut -d '/' -f 7 ) # album || _o-o_ || EMPTY diff --git a/tools/vlc_webcam.sh b/tools/vlc_webcam.sh index 2b253228..552b559a 100755 --- a/tools/vlc_webcam.sh +++ b/tools/vlc_webcam.sh @@ -120,11 +120,11 @@ echo "NEW VIDEO $myIPFS/ipfs/$IPFSROOT" ########################### MEDIAID=$(date -u +"%Y%m%d%H%M%S%4N") -mkdir -p ~/Astroport/video/vlog/ +mkdir -p ~/Astroport/${PLAYER}/video/vlog/ MEDIAKEY="VLOG_${PLAYER}_${MEDIAID}" -cp ~/.zen/tmp/output.mp4 ~/Astroport/video/vlog/${PLAYER}_$MEDIAID.mp4 +cp ~/.zen/tmp/output.mp4 ~/Astroport/${PLAYER}/video/vlog/${PLAYER}_$MEDIAID.mp4 -REAL=$(file --mime-type -b "$HOME/Astroport/video/vlog/${PLAYER}_$MEDIAID.mp4") +REAL=$(file --mime-type -b "$HOME/Astroport/${PLAYER}/video/vlog/${PLAYER}_$MEDIAID.mp4") ## TW not displaying direct ipfs video link (only image, pdf, ...) so insert