diff --git a/20h12.process.sh b/20h12.process.sh index 68a2235b..890dc0d6 100755 --- a/20h12.process.sh +++ b/20h12.process.sh @@ -16,8 +16,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|( [[ ! $myIP || $isLAN ]] && myIP="ipfs.localhost" ## CLEANING ~/.zen/tmp -rm -Rf ~/.zen/tmp -mkdir -p ~/.zen/tmp +rm -Rf ~/.zen/tmp/* ## RESTART IPFS DAEMON # echo "$USER ALL=(ALL) NOPASSWD:/bin/systemctl" | (sudo su -c 'EDITOR="tee" visudo -f /etc/sudoers.d/systemctl') diff --git a/ajouter_media.sh b/ajouter_media.sh index fe2b600f..b82cdc98 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -219,7 +219,7 @@ MEDIAKEY="YOUTUBE_${MEDIAID}" # FORMAT GENRES genre1|genre2|genre3 -FILE_PATH="$HOME/astroport/youtube/$MEDIAID" +FILE_PATH="$HOME/Astroport/youtube/$MEDIAID" mkdir -p ${FILE_PATH} && mv -f ${YTEMP}/* ${FILE_PATH}/ # rename FILE_NAME to YNAME (URL clean) mv "${FILE_PATH}/${FILE_NAME}" "${FILE_PATH}/${YNAME}" && FILE_NAME="${YNAME}" @@ -230,11 +230,11 @@ mv "${jsonfile}" "${FILE_PATH}/video.json" 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/${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/${CAT}/${MEDIAID}/ajouter_video.txt # _IPFSREPFILEID_ is replaced later @@ -262,14 +262,14 @@ rm -Rf ${YTEMP} REVSOURCE="$(echo "$URL" | rev | sha256sum | cut -d ' ' -f 1)_"; echo $REVSOURCE # URL="https://discuss.ipfs.io/t/limit-ipfs-get-command/3573/6" MEDIAID="$REVSOURCE" # MEDIAID=1252ff59950395070a0cc56bb058cbb1ccfd2f8d8a32476acaf472f62b14d97d_ MEDIAKEY="WWW_${MEDIAID}" # MEDIAKEY=PAGE_1252ff59950395070a0cc56bb058cbb1ccfd2f8d8a32476acaf472f62b14d97d_ - FILE_PATH="$HOME/astroport/web/$MEDIAID"; + FILE_PATH="$HOME/Astroport/web/$MEDIAID"; mkdir -p $FILE_PATH wget -mpck --html-extension --recursive --convert-links --user-agent="Astroport.One" -e robots=off --wait 1 -P ${FILE_PATH} "$URL" # wget --recursive --convert-links -mpck --html-extension --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36." -e robots=off -P ${FILE_PATH} "$URL" # wget \ --mirror \ --warc-file=$MEDIAID \ --no-verbose \ --warc-cdx \ --page-requisites \ --adjust-extension \ --convert-links \ --no-warc-compression \ --no-warc-keep-log \ --append-output="$MEDIAID" \ --execute robots=off \ -P ${FILE_PATH} "$URL" - echo "web;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt + echo "web;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt zenity --warning --width ${large} --text "Vérifiez que la copie de votre site se trouve bien dans ${FILE_PATH}/" @@ -319,7 +319,7 @@ rm -Rf ${YTEMP} fi - [[ ! -s ~/.zen/tmp/output.pdf ]] && espeak "No file Sorry. Exit" > /dev/null 2>&1 && exit 1 + [[ ! -s ~/.zen/tmp/output.pdf ]] && espeak "No file Sorry. Exit" && exit 1 CTITLE=$(echo $URL | rev | cut -d '/' -f 1 | rev) @@ -331,10 +331,10 @@ rm -Rf ${YTEMP} MEDIAID="$REVSOURCE$(echo "${TITLE}" | detox --inline)" MEDIAKEY="PAGE_${MEDIAID}" - FILE_PATH="$HOME/astroport/page/$MEDIAID" + FILE_PATH="$HOME/Astroport/page/$MEDIAID" mkdir -p ${FILE_PATH} && mv ~/.zen/tmp/output.pdf ${FILE_PATH}/${FILE_NAME} - echo "page;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt + echo "page;${MEDIAID};$(date -u +%s%N | cut -b1-13);${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt espeak 'Document ready' @@ -392,8 +392,8 @@ 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) [[ $(which detox) ]] && YNAME="$(echo "${FILE_NAME}" | cut -d "&" -f 2- | detox --inline)" -[[ ! $islink && "$song" != "" ]] && FILE_PATH="$HOME/astroport/$CAT/$artist/_o-o_" \ -|| FILE_PATH="$HOME/astroport/$CAT/${YID}" +[[ ! $islink && "$song" != "" ]] && FILE_PATH="$HOME/Astroport/$CAT/$artist/_o-o_" \ +|| FILE_PATH="$HOME/Astroport/$CAT/${YID}" mkdir -p "${FILE_PATH}" && mv -f ${YTEMP}/* "${FILE_PATH}/" # Remove "&" from FILE_NAME rename to YNAME @@ -459,8 +459,8 @@ 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/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ +&& PRE=$(cat ~/Astroport/${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}") @@ -469,8 +469,8 @@ TITLE=$(echo "${TITLE}" | sed "s/[(][^)]*[)]//g" | sed -e 's/;/_/g' ) # Clean TI # 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/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ +&& PRE=$(cat ~/Astroport/${CAT}/${MEDIAID}/ajouter_video.txt | cut -d ';' -f 3) YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la vidéo. Exemple: 1985" --entry-text="${PRE}") # VIDEO RESOLUTION @@ -480,8 +480,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/${CAT}/${MEDIAID}/ajouter_video.txt ]] \ +&& PRE=$(cat ~/Astroport/${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" @@ -535,7 +535,7 @@ FILM_GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut}\ # FORMAT GENRES ["genre1","genre2"] # USE IF YOU ACTIVATE KODI COMPATIBILITY GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]" -mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" +mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/Astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" if [ $? != 0 ]; then zenity --warning --width ${large} --text "Impossible de déplacer votre fichier ${FILE_PATH}/${FILE_NAME} vers ~/astroport - EXIT -" @@ -544,9 +544,9 @@ fi FILE_NAME="${TITLE}${SAISON}.${FILE_EXT}" -## CREATE "~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt" +## CREATE "~/Astroport/${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/${CAT}/${MEDIAID}/ajouter_video.txt # _IPFSREPFILEID_ is replaced later ;; @@ -581,13 +581,13 @@ 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/${CAT}/${MEDIAID}/ MEDIAKEY="VIDEO_${MEDIAID}" ## CREATE SIMPLE JSON (REMOVE== 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/${CAT}/${MEDIAID}/video.json ## MOVE FILE TO IMPORT ZONE - mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" + mv -f "${FILE_PATH}/${FILE_NAME}" "$HOME/Astroport/${CAT}/${MEDIAID}/${TITLE}${SAISON}.${FILE_EXT}" FILE_NAME="${TITLE}.${FILE_EXT}" ;; @@ -622,16 +622,16 @@ fi ################################### ### MOVING FILE TO ~/astroport #### ################################### -mkdir -p ~/astroport/${CAT}/${MEDIAID}/ -mv ~/.zen/tmp/screen.png ~/astroport/${CAT}/${MEDIAID}/screen.png +mkdir -p ~/Astroport/${CAT}/${MEDIAID}/ +mv ~/.zen/tmp/screen.png ~/Astroport/${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/${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 ######################################################################## -## CREATION DU FICHIER ~/astroport/Add_${MEDIAKEY}_script.sh +## CREATION DU FICHIER ~/Astroport/Add_${MEDIAKEY}_script.sh ######################################################################## ### AJOUT DANS IPFS ####################################################### ######################################################################## @@ -644,28 +644,28 @@ timestamp=$(date -u +%s%N | cut -b1-13) ## OLD CODE !!! ADD TO ASTROPORT SCRIPT ## NOW CREATE TIDDLER INTO PLAYER TW -echo "MEDIAKEY=${MEDIAKEY}" > ~/astroport/Add_${MEDIAKEY}_script.sh +echo "MEDIAKEY=${MEDIAKEY}" > ~/Astroport/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/${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 # $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/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\" \"$G1PUB\"" >> ~/Astroport/Add_${MEDIAKEY}_script.sh -#[[ $CHOICE == "TMDB" ]] && echo "fi" >> ~/astroport/Add_${MEDIAKEY}_script.sh +#[[ $CHOICE == "TMDB" ]] && echo "fi" >> ~/Astroport/Add_${MEDIAKEY}_script.sh -echo "mv ~/astroport/Add_${MEDIAKEY}_script.sh \"$HOME/astroport/Done_${FILE_NAME}.sh\" -" >> ~/astroport/Add_${MEDIAKEY}_script.sh +echo "mv ~/Astroport/Add_${MEDIAKEY}_script.sh \"$HOME/Astroport/Done_${FILE_NAME}.sh\" +" >> ~/Astroport/Add_${MEDIAKEY}_script.sh -chmod +x ~/astroport/Add_${MEDIAKEY}_script.sh +chmod +x ~/Astroport/Add_${MEDIAKEY}_script.sh ######################################################################## ## USE PLAYER G1PUB AS MEDIA WALLET @@ -675,7 +675,7 @@ G1BALANCE=$(${MY_PATH}/tools/jaklis/jaklis.py balance -p $G1PUB 2>/dev/null ) ######################################################################## echo "# ZENBALANCE for ${MEDIAKEY} , WALLET $MEDIAPUBKEY" ######################################################################## -FILE_BSIZE=$(du -b "$HOME/astroport/${CAT}/${MEDIAID}/${FILE_NAME}" | awk '{print $1}') +FILE_BSIZE=$(du -b "$HOME/Astroport/${CAT}/${MEDIAID}/${FILE_NAME}" | awk '{print $1}') FILE_SIZE=$(echo "${FILE_BSIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1; while( $1>1024 ){ $1/=1024; s++ } printf "%.2f %s", $1, v[s] }') #G1BALANCE=$(${MY_PATH}/tools/jaklis/jaklis.py balance -p $G1PUB) && [[ "$G1BALANCE" == "null" ]] && G1BALANCE=0 || G1BALANCE=$(echo "$G1BALANCE" | cut -d '.' -f 1) @@ -691,7 +691,7 @@ FILE_SIZE=$(echo "${FILE_BSIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1; zenity --warning --width 360 --text "(♥‿‿♥) $MEDIAKEY IPFS MIAM (ᵔ◡◡ᵔ)" espeak "Adding $CAT to I P F S. Please Wait" -bash ~/astroport/Add_${MEDIAKEY}_script.sh "noh265" +bash ~/Astroport/Add_${MEDIAKEY}_script.sh "noh265" zenity --warning --width 320 --text "Ajout à votre TW ${PLAYER}" espeak "Updating T W Index" @@ -715,7 +715,7 @@ echo "%%%%%%%%%%%%%% I GOT YOUR TW %%%%%%%%%%%%%%%%%%%%%%%%%%" echo "Nouveau MEDIAKEY dans TW $PSEUDO / ${PLAYER} : http://$myIP:8080/ipns/$ASTRONAUTENS" tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \ - --import ~/astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json "application/json" \ + --import ~/Astroport/${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 @@ -742,6 +742,6 @@ echo "%%%%%%%%%%%%%% I GOT YOUR TW %%%%%%%%%%%%%%%%%%%%%%%%%%" fi - espeak "Yes We did it" + espeak "OK We did it." exit 0 diff --git a/install.sh b/install.sh index f70b42f9..eab5f197 100755 --- a/install.sh +++ b/install.sh @@ -180,10 +180,10 @@ fi ######################################################################## # CREATE ~/astroport FILESYSTEM GATE -mkdir -p ~/astroport/film -mkdir -p ~/astroport/serie -mkdir -p ~/astroport/anime -echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME' > ~/astroport/ajouter_video.modele.txt +mkdir -p ~/Astroport/film +mkdir -p ~/Astroport/serie +mkdir -p ~/Astroport/anime +echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME' > ~/Astroport/ajouter_video.modele.txt ####################################################################### diff --git a/search b/search index 07dc754b..d430b4a4 100755 --- a/search +++ b/search @@ -11,6 +11,6 @@ fi echo "------------------------------------------------------------------------------" if [ "$2" != "" ]; then echo " To replace \"$1\" whith \"$2\", please run" - echo " grep -rl '$1' ./ | xargs sed -i 's/$1/$2/g'" + echo " grep -rl '$1' ./ | xargs sed -i 's~$1~$2~g'" fi ## THIS IS A GREAT RETRO ENGINEERING AND CODING TOOLS diff --git a/tools/download_from_kodi_log.sh b/tools/download_from_kodi_log.sh index 82910f23..775a7e18 100755 --- a/tools/download_from_kodi_log.sh +++ b/tools/download_from_kodi_log.sh @@ -39,7 +39,7 @@ do uqname=$(cat ~/.kodi/temp/kodi.${OLD}log | grep uqload | grep $uqlink | grep VideoPlayer | cut -d '=' -f 4 | cut -d '&' -f 1 | cut -d '%' -f 1 | sed 's/\+/_/g' | tail -n 1) cycle=$((cycle+1)) echo "########################################################################" - echo "MANUAL : uqload_downloader https://uqload.com/$uqlink \"$HOME/astroport/$uqname.mp4\"" + echo "MANUAL : uqload_downloader https://uqload.com/$uqlink \"$HOME/Astroport/$uqname.mp4\"" ## ADD TO ASTROPORT # IPFSNODEID=$(ipfs id -f='\n') @@ -54,21 +54,21 @@ do && cat ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/keygen.ipns.key.enc | base16 > ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/keygen.ipns.key.enc.b16 [[ ! $(cat ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/commands.fifo | grep -w "$uqname.mp4") ]] && \ - echo "uqload_downloader https://uqload.com/$uqlink \"$HOME/astroport/$uqname.mp4\"" >> ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/commands.fifo || \ + echo "uqload_downloader https://uqload.com/$uqlink \"$HOME/Astroport/$uqname.mp4\"" >> ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/commands.fifo || \ echo "$uqname.mp4 conflict" ## CHECK & MANAGE COPY if [[ $(find $HOME/astroport -name "$uqname*" -type f -print) ]]; then - echo "COPY ALREADY IN $HOME/astroport/" + echo "COPY ALREADY IN $HOME/Astroport/" else echo "DETECTED MOVIE : $uqname (https://uqload.com/$uqlink)" echo "WANT TO COPY ? Yes? Write any character + enter, else just hit enter." read YESNO if [[ "$YESNO" != "" ]]; then ## COPY STREAMING - uqload_downloader https://uqload.com/$uqlink "$HOME/astroport/$uqname.mp4" - echo "COPY ~/astroport/$uqname.mp4 DONE" + uqload_downloader https://uqload.com/$uqlink "$HOME/Astroport/$uqname.mp4" + echo "COPY ~/Astroport/$uqname.mp4 DONE" ## ARE WE ASTROPORT STATION? https://astroport.com [[ "$USER" != "xbian" && ${IPFSNODEID} ]] && ~/.zen/astrXbian/ajouter_video.sh else diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index ef9a6a27..ee26cec6 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/* files to IPFS # Publish INDEX ~/.zen/game/players/$PLAYER/ipfs/.*/${PREFIX}ASTRXBIAN ######## #### ### ## # start=`date +%s` @@ -27,15 +27,15 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|( 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/kodi/vstream/${PREFIX}ASTRXBIAN # Astropot/Kodi/Vstream source reads ${PREFIX}ASTRXBIAN from http://${myIP}:8080/.$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/ 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/youtube +# mkdir -p ~/Astroport/mp3 ######################################################################## path="$1" @@ -109,11 +109,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/ !! +[[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'astroport') ]] && er="Les fichiers sont à placer dans ~/Astroport/ 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, page)/ REFERENCE / +TyPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/Astroport/... TyPE(film, youtube, mp3, video, page)/ 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 @@ -191,9 +191,9 @@ echo ">>>>>>>>>> $MEDIAKEY ($MIME) <<<<<<<<<<<<<<<" ## RUBISH ?? ######################################################################## -mkdir -p ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/ +mkdir -p ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/Astroport/kodi/vstream/ echo "ADDING ${path}${file} to IPFS " -echo "~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN" +echo "~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/Astroport/kodi/vstream/${PREFIX}ASTRXBIAN" echo "-----------------------------------------------------------------" ### FILE SIZING #### @@ -271,49 +271,54 @@ then [[ ! $3 ]] && HASHTAG=$(awk -F '~' '{print $2}' <<<$OUTPUT) # # # # ${MOATS}_ajouter_video.txt DATA # # # # - if [[ -f ~/astroport/${TyPE}/${REFERENCE}/ajouter_video.txt ]] + if [[ -f ~/Astroport/${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/${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}/ajouter_video.txt + echo "UPDATE ~/Astroport/${TyPE}/${REFERENCE}/ajouter_video.txt" + echo "$line" > ~/Astroport/${TyPE}/${REFERENCE}/ajouter_video.txt ## MOATS TIMESTAMPING - cp ~/astroport/${TyPE}/${REFERENCE}/ajouter_video.txt ~/astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt + cp ~/Astroport/${TyPE}/${REFERENCE}/ajouter_video.txt ~/Astroport/${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' ) + 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' ) ## Adapt TMDB url for season & tag naming - [[ $CAT == "Film" ]] && tdb="movie"\ + [[ $CAT == "Film" ]] && H1="

"${TITLE}"

" \ && FILETAG="$CapitalGluedTitle" - [[ $CAT == "Serie" ]] && tdb="tv" \ - && SAISON=$(cat ~/astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 5 | cut -d '_' -f 2) \ + [[ $CAT == "Serie" ]] && H1="

"${TITLE}"

" \ + && SAISON=$(cat ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}_ajouter_video.txt | cut -d ';' -f 5 | cut -d '_' -f 2) \ && FILETAG=$(echo "$CapitalGluedTitle" | cut -d '_' -f 1) + [[ $CAT == "Youtube" ]] && H1="

"${TITLE}"

" + echo $GENRE $SAISON - ## Add screenshot (TODO : Make it better. Check what to put; if used & usefull - [[ -f $HOME/astroport/${TyPE}/${REFERENCE}/screen.png ]] && SCREENSHOT=$(ipfs add -q "$HOME/astroport/${TyPE}/${REFERENCE}/screen.png" | tail -n 1) + ## Add screenshot + [[ -f $HOME/Astroport/${TyPE}/${REFERENCE}/screen.png ]] && SCREENSHOT=$(ipfs add -q "$HOME/Astroport/${TyPE}/${REFERENCE}/screen.png" | tail -n 1) + if [[ $(echo "$MIME" | grep 'video') ]]; then - TEXT="

"${TITLE}"

-

"$DESCRIPTION"

+ TEXT="
{{!!duree}}
- <\$button class='tc-tiddlylink'> - <\$list filter='[tag[G1${CAT}]]'> - <\$action-navigate \$to=<> \$scroll=no/> - - Afficher tous les G1${CAT} - " + "$H1" +

"$DESCRIPTION"

+ + <\$button class='tc-tiddlylink'> + <\$list filter='[tag[G1${CAT}]]'> + <\$action-navigate \$to=<> \$scroll=no/> + + Afficher G1${CAT} + " + TidType="text/vnd.tiddlywiki" ## MAYBE REAL ONCE TW CAN SHOW ATTACHED IPFS VIDEO (TODO: TESTINGS) TAGS="G1${CAT} ${PLAYER} ${FILETAG} $SAISON $GENRE ipfs ${HASHTAG}" # TyPE="$MIME" @@ -327,8 +332,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/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json ]] \ + && cp ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json ~/Astroport/${TyPE}/${REFERENCE}/${MOATS}.${MEDIAKEY}.dragdrop.json echo "## Creation json tiddler" echo '[ @@ -356,22 +361,22 @@ then "ipns": "'/ipns/${IPNS}'", "tmdb": "'${REFERENCE}'", "modified": "'${MOATS}'", - "tags": "'${TAGS}'" ' > ~/astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json + "tags": "'${TAGS}'" ' > ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json [[ ${CANON} != "" ]] && echo ', - "_canonical_uri": "'${CANON}'"' >> ~/astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json + "_canonical_uri": "'${CANON}'"' >> ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json echo ' } ] -' >> ~/astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json +' >> ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json -echo "~/astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json copy into Station Balise" +echo "~/Astroport/${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/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MIME}/${MEDIAKEY}/${G1PUB}/tiddler.json" ############################################################################# ## TODO : Do we keep that ? @@ -379,11 +384,11 @@ cp ~/astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/.zen/game/p [[ $3 ]] && ~/.zen/Astroport.ONE/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" send -d "$3" -t "${TITLE} ${MEDIAKEY}" -m "MEDIA : http://astroport.com:8080/ipfs/${IPFSREPFILEID}" # Couldl be used by caroussel.html template -# CAROUSSEL=$(ipfs add -wq ~/astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json | head-n 1) +# CAROUSSEL=$(ipfs add -wq ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json | head-n 1) # COPY TIDDLER JSON TO DESKTOP Journal/${TyPE} -# [[ "$USER" != "xbian" && -d ~/Bureau ]] && mkdir -p ~/Bureau/Journal/${TyPE} && cp ~/astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/Bureau/Journal/${TyPE}/${TITLE}.dragdrop.json" && xdg-open "$HOME/Bureau/Journal/${TyPE}/" -# [[ "$USER" != "xbian" && -d ~/Desktop ]] && mkdir -p ~/Desktop/Journal/${TyPE} && cp ~/astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/Desktop/Journal/${TyPE}/${TITLE}.dragdrop.json" && xdg-open "$HOME/Desktop/Journal/${TyPE}/" +# [[ "$USER" != "xbian" && -d ~/Bureau ]] && mkdir -p ~/Bureau/Journal/${TyPE} && cp ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/Bureau/Journal/${TyPE}/${TITLE}.dragdrop.json" && xdg-open "$HOME/Bureau/Journal/${TyPE}/" +# [[ "$USER" != "xbian" && -d ~/Desktop ]] && mkdir -p ~/Desktop/Journal/${TyPE} && cp ~/Astroport/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/Desktop/Journal/${TyPE}/${TITLE}.dragdrop.json" && xdg-open "$HOME/Desktop/Journal/${TyPE}/" fi diff --git a/tools/new_mp3_in_astroport.sh b/tools/new_mp3_in_astroport.sh index e14fd8da..b0047001 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/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/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 aa7ab4e4..3a629fe0 100755 --- a/tools/vlc_webcam.sh +++ b/tools/vlc_webcam.sh @@ -126,11 +126,11 @@ echo "NEW VIDEO http://$myIP:8080/ipfs/$IPFSROOT" ########################### MEDIAID=$(date -u +"%Y%m%d%H%M%S%4N") -mkdir -p ~/astroport/video/vlog/ +mkdir -p ~/Astroport/video/vlog/ MEDIAKEY="VLOG_${PLAYER}_${MEDIAID}" -cp ~/.zen/tmp/output.mp4 ~/astroport/video/vlog/${PLAYER}_$MEDIAID.mp4 +cp ~/.zen/tmp/output.mp4 ~/Astroport/video/vlog/${PLAYER}_$MEDIAID.mp4 -REAL=$(file --mime-type -b "$HOME/astroport/video/vlog/${PLAYER}_$MEDIAID.mp4") +REAL=$(file --mime-type -b "$HOME/Astroport/video/vlog/${PLAYER}_$MEDIAID.mp4") ## TW not displaying direct ipfs video link (only image, pdf, ...) so insert