diff --git a/API/QRCODE.sh b/API/QRCODE.sh index ebf07af8..6b17d7c6 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -30,6 +30,18 @@ TYPE=$WHAT ## GET TW mkdir -p ~/.zen/tmp/${MOATS}/ +if [[ ${QRCODE} == "station" ]]; then + ## GENERATE PLAYER G1 TO ZEN ACCOUNTING + ISTATION=$($MY_PATH/../tools/make_image_ipfs_index_carousel.sh | tail -n 1) + sed "s~_TWLINK_~${myIPFSGW}${ISTATION}/~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect + echo "url='"${myIPFSGW}${ISTATION}"'" >> ~/.zen/tmp/${MOATS}/index.redirect + ( + cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 + ) & + + exit 0 +fi + ASTRONAUTENS=$(~/.zen/Astroport.ONE/tools/g1_to_ipfs.py ${QRCODE}) [[ ! ${ASTRONAUTENS} ]] \ && (echo "$HTTPCORS ERROR - ASTRONAUTENS !!" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \ diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index b13e5266..02583d74 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -48,8 +48,9 @@ tiddlywiki --load ${INDEX} \ echo "DEBUG : cat ~/.zen/game/players/$PLAYER/G1CopierYoutube/CopierYoutube.json | jq -r" - BROWSER=$(xdg-settings get default-web-browser | cut -d '.' -f 1 | cut -d '-' -f 1) ## GET cookies-from-browser - + BZER=$(xdg-settings get default-web-browser | cut -d '.' -f 1 | cut -d '-' -f 1) ## GET cookies-from-browser + [[ $BZER ]] && BROWSER="--cookies-from-browser $BZER " || BROWSER="" + [[ ! $isLAN ]] && BROWSER="" ################################################################### ## URL EXTRACTION & yt-dlp.cache.$PLAYER upgrade for YURL in $(cat ~/.zen/game/players/$PLAYER/G1CopierYoutube/CopierYoutube.json | jq -r '.[].text' | grep 'http'); do @@ -69,7 +70,7 @@ for YURL in $(cat ~/.zen/game/players/$PLAYER/G1CopierYoutube/CopierYoutube.json fi # ONE WEEK NEW SCAN if [[ $duree -ge 604800000 || ! -s ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.cache.$PLAYER ]]; then - yt-dlp --cookies-from-browser $BROWSER --print "%(id)s&%(webpage_url)s" "${YURL}" >> ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.cache.$PLAYER + yt-dlp $BROWSER --print "%(id)s&%(webpage_url)s" "${YURL}" >> ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.cache.$PLAYER sed -i "s~$lastrun~$MOATS~g" ~/.zen/game/players/$PLAYER/G1CopierYoutube/yt-dlp.command # UPDATE LASTRUN fi @@ -109,7 +110,7 @@ if [[ ! ${TIDDLER} ]]; then ## LIMIT TO 12 MAXIMUM COPY PER DAY PER PLAYER [[ $boucle == 13 ]] && echo "MAXIMUM COPY REACHED FOR TODAY" && continue - TITLE="$(yt-dlp --cookies-from-browser $BROWSER --print "%(title)s" "${ZYURL}" | detox --inline)" + TITLE="$(yt-dlp $BROWSER --print "%(title)s" "${ZYURL}" | detox --inline)" [[ ! $TITLE ]] && echo "NO TITLE" && continue start=`date +%s` @@ -127,7 +128,7 @@ if [[ ! ${TIDDLER} ]]; then # --write-subs --write-auto-subs --sub-langs "fr, en, en-orig" --embed-subs yt-dlp -f "(bv*[ext=mp4][height<=720]+ba/b[height<=720])" \ - --cookies-from-browser $BROWSER \ + $BROWSER \ --download-archive $HOME/.zen/.yt-dlp.list \ -S res,ext:mp4:m4a --recode mp4 --no-mtime --embed-thumbnail --add-metadata \ -o "$HOME/.zen/tmp/yt-dlp/$TITLE.%(ext)s" ${ZYURL} @@ -176,9 +177,9 @@ if [[ ! ${TIDDLER} ]]; then MIME=$(file --mime-type -b "$HOME/.zen/tmp/yt-dlp/$ZFILE") ## ADD TAGS - SEC=$(yt-dlp --cookies-from-browser $BROWSER --print "%(duration)s" "${ZYURL}") - CHANNEL=$(yt-dlp --cookies-from-browser $BROWSER --print "%(channel)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords - PLAYLIST=$(yt-dlp --cookies-from-browser $BROWSER --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g') + SEC=$(yt-dlp $BROWSER --print "%(duration)s" "${ZYURL}") + CHANNEL=$(yt-dlp $BROWSER --print "%(channel)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords + PLAYLIST=$(yt-dlp $BROWSER --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g') EXTRATAG="$CHANNEL $PLAYLIST" ## PREPARE VIDEO HTML5 CODE TEXT=" diff --git a/README.md b/README.md index 013060da..815cbea5 100644 --- a/README.md +++ b/README.md @@ -198,9 +198,18 @@ GET /?player=${PLAYER}&youtube=URLENCODED ### PUBLIC (fonctionne par tout, pour tous) ```http -GET /?qrcode=$G1PUB/$IPNS/$... +GET /?qrcode=$G1PUB +``` +| Parameter | Type | Description | +| :-------- | :------- | :-------------------------------- | +| `qrcode` | `string` | **Required**. Your G1PUB token | + +Look for details in ~/.zen/Astroport.ONE/API/QRCODE.sh + +### STATION : Show Station PLAYER's G1 investments levels +```http +GET /?qrcode=station ``` -### TODO # 20H12 diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh index 587306ca..3dac95da 100755 --- a/tools/make_image_ipfs_index_carousel.sh +++ b/tools/make_image_ipfs_index_carousel.sh @@ -45,7 +45,7 @@ echo "
-

Astroport IPFS Gallery $(date)

+

Astroport ZEN Gallery $(date)