diff --git a/ajouter_media.sh b/ajouter_media.sh index 6f48224d..169d4187 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -912,7 +912,7 @@ if [[ -s ~/Astroport/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; then ## GETTING LAST TW via IPFS or HTTP GW LIBRA=$(head -n 2 ${MY_PATH}/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 2) rm -f ~/.zen/tmp/ajouter_media.html > /dev/null 2>&1 - [[ $YOU ]] && echo " ipfs --timeout 30s cat /ipns/${ASTRONAUTENS} ($YOU)" && ipfs --timeout 30s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/ajouter_media.html + [[ $YOU ]] && echo " ipfs --timeout 120s cat /ipns/${ASTRONAUTENS} ($YOU)" && ipfs --timeout 120s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/ajouter_media.html [[ ! -s ~/.zen/tmp/ajouter_media.html ]] && echo "curl -m 12 $LIBRA/ipns/${ASTRONAUTENS}" && curl -m 12 -so ~/.zen/tmp/ajouter_media.html "$LIBRA/ipns/${ASTRONAUTENS}" [[ ! -s ~/.zen/tmp/ajouter_media.html ]] && espeak "WARNING. WARNING. impossible to find your TW online" [[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ]] && espeak "FATAL ERROR. No player TW copy found ! EXIT" && exit 1 diff --git a/templates/register.html b/templates/register.html index c7009733..5dba7f9b 100644 --- a/templates/register.html +++ b/templates/register.html @@ -64,7 +64,7 @@ header {
Découvrez / LA ♥BOX /^3223
Téléportez vos DATA 👍 dans IPFS^3222
Activez votre 👉TW👈^3112
-.^999.^888.^777.^666.^555.^444.^333.^222.^111 / REBOOT^2312
+.^999.^888.^777.^666.^555.^444.^333.^222.^111 🔥 Partez^2312
diff --git a/tools/download_from_kodi_log.sh b/tools/download_from_kodi_log.sh index 03a147ce..e7364118 100755 --- a/tools/download_from_kodi_log.sh +++ b/tools/download_from_kodi_log.sh @@ -2,7 +2,7 @@ ######################################################################## # Author: papiche # Version: 0.1 -# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) +# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.${MOATS}/) ######################################################################## # download_from_kodi_log.sh ######################################################################## @@ -13,6 +13,14 @@ 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 + +MOATS=$(date -u +"%Y%m%d%H%M%S%4N") + # script usage usage() { @@ -20,7 +28,7 @@ usage() [ -z "${1}" ] || echo "! ${1}" # display help echo "\ -# extract uplad links from kodi log file +# extract played uqload links from kodi log file $(basename "$0") : current log scraping $(basename "$0") old scraping" exit 2 @@ -28,7 +36,10 @@ exit 2 IPFSNODEID=$(ipfs --timeout 5s id -f='