From bf209a69a6f138cdebd09d676f50ce61111fb747 Mon Sep 17 00:00:00 2001 From: qo-op Date: Sun, 19 Apr 2020 13:02:16 +0200 Subject: [PATCH] zero fixing --- zen/cron_MINUTE.sh | 15 ++++++++------- zen/miam_miam.sh | 8 +++----- zen/ssb_GET_zenyta.sh | 1 + zen/ssb_GET_zenytv.sh | 2 ++ zen/zen_MAKE.sh | 5 +++-- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/zen/cron_MINUTE.sh b/zen/cron_MINUTE.sh index 62cc621..d372a8b 100755 --- a/zen/cron_MINUTE.sh +++ b/zen/cron_MINUTE.sh @@ -8,8 +8,7 @@ MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized ME="${0##*/}" -ipfsnodeid=$(ipfs id -f='\n') -[[ ! -f ~/.ssb/secret.dunikey ]] && $MY_PATH/tools/secret2dunikey.sh +ipfsnodeid=$(/usr/local/bin/ipfs id -f='\n') g1pub=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) # TIME @@ -19,9 +18,11 @@ timebar="$heure:$minute" jourdelasemaine=$(date +%w) jourdumois=$(date +%d) numerosemaine=$(date +%V) -# echo $timebar +echo $timebar # TIME NTP SYNC: TODO: Problem being root (stickybit INSTALL?) # sudo ntpdate ntp.pool.org +# CORRECT PATH +[[ ! $(echo $PATH | grep "/usr/local/bin") ]] && export PATH="$PATH:/usr/local/bin" ################################################################## @@ -32,13 +33,13 @@ numerosemaine=$(date +%V) ################################################################## # RANDOMLY RUN SSB GET zenytv (avoid simultaneous run in swarm) -randh=$((RANDOM % 24)) +randh=$((1 + RANDOM % 24)) [[ $(($heure % $randh)) == 0 ]] && $MY_PATH/ssb_GET_zenytv.sh ################################################################## -randh=$((RANDOM % 24)) +randh=$((1 + RANDOM % 24)) [[ $(($heure % $randh)) == 0 ]] && $MY_PATH/ssb_GET_zenyta.sh ################################################################## -randh=$((RANDOM % 24)) +randh=$((1 + RANDOM % 24)) [[ $(($heure % $randh)) == 0 ]] && $MY_PATH/miam_miam.sh ################################################################## @@ -46,7 +47,7 @@ randh=$((RANDOM % 24)) ################################################################## # MIDNIGHT:01 -if [[ "$timebar" == "03:01" ]]; then +if [[ "$timebar" == "00:01" ]]; then youtube-dl --rm-cache-dir youtube-dl -U [[ $jourdelasemaine == 0 ]] && mv -f /tmp/astroport.log ~/.zen/astroport.$numerosemaine.log # LOG BACKUP FOR 1 YEAR !! diff --git a/zen/miam_miam.sh b/zen/miam_miam.sh index 700c405..dd4f737 100755 --- a/zen/miam_miam.sh +++ b/zen/miam_miam.sh @@ -104,13 +104,11 @@ for tstamp in $(ls ~/.zen/miam/); do # WHAT DO WE HAVE THERE? [[ "$JSON" == "" ]] && echo "NO METADATA" && continue - - [[ -f $MP3 ]] && $MY_PATH/zen_MAKE.sh "1000" "$tstamp" "$MP3" "$JSON" "10" "10" [[ -f $MP4 ]] && $MY_PATH/zen_MAKE.sh "1000" "$tstamp" "$MP4" "$JSON" "10" "10" - echo "CONTINUE.............................. ?" - read + echo "CONTINUE.............................." +# read # CLEAN A LITTLE UNKOWN="" @@ -118,6 +116,6 @@ for tstamp in $(ls ~/.zen/miam/); do MP4="" JPG="" JSON="" - # rm -Rf ~/.zen/miam/$tstamp + [[ -d ~/.zen/miam/$tstamp && "$tstamp" != "" ]] && rm -Rf ~/.zen/miam/$tstamp # DELETE miam, it has been EATEN done diff --git a/zen/ssb_GET_zenyta.sh b/zen/ssb_GET_zenyta.sh index 6ecd2c2..a0745ca 100755 --- a/zen/ssb_GET_zenyta.sh +++ b/zen/ssb_GET_zenyta.sh @@ -27,6 +27,7 @@ fi mkdir -p ~/.zen/miam/ self=$(sbotc whoami | jq -r .id) || exit 1 +[[ "$self" == "" ]] && exit 1 g1self=$(echo $self | cut -d '@' -f 2 | cut -d '.' -f 1 | base64 -d | base58) self_name=$(sbotc query.read '{"query":[{"$filter":{"value":{"author": "'"$self"'", "content":{"type":"about", "about": "'"$self"'"}}}}]}' | jq -r .value?.content?.name | grep -v null | tail -n 1) ipfsnodeid=$(ipfs id -f='\n') diff --git a/zen/ssb_GET_zenytv.sh b/zen/ssb_GET_zenytv.sh index 7563a9a..bffd963 100755 --- a/zen/ssb_GET_zenytv.sh +++ b/zen/ssb_GET_zenytv.sh @@ -27,10 +27,12 @@ fi mkdir -p ~/.zen/miam/ self=$(sbotc whoami | jq -r .id) || exit 1 +[[ "$self" == "" ]] && exit 1 g1self=$(echo $self | cut -d '@' -f 2 | cut -d '.' -f 1 | base64 -d | base58) self_name=$(sbotc query.read '{"query":[{"$filter":{"value":{"author": "'"$self"'", "content":{"type":"about", "about": "'"$self"'"}}}}]}' | jq -r .value?.content?.name | grep -v null | tail -n 1) ipfsnodeid=$(ipfs id -f='\n') + current_ts=$(date -u +%s%N | cut -b1-13) [ -f ~/.zen/zenytv.last.ts ] && last_ts=$(cat ~/.zen/zenytv.last.ts) || last_ts=$((current_ts - 10*24*3600*1000 - 1)) # 10*24h ago diff --git a/zen/zen_MAKE.sh b/zen/zen_MAKE.sh index f7a530a..aee14dc 100755 --- a/zen/zen_MAKE.sh +++ b/zen/zen_MAKE.sh @@ -61,11 +61,12 @@ IPFS: $ipfsnodeid # _tag.uid # ZenTag UID # _tag.zen # ZentTag balance # _ipns # /ipns/ address -# PASSENGER FILE OPTIONNAL +# PASSENGER FILE (put to IPFS and cypher link in IPNS ZenTag) # _passenger.filename # Passenger filename # _passenger.ipfs.crypt # G1SSB cyphered IPFS Passenger link # _passenger.read # Zen value asked for READING # _passenger.park # Zen value paid for PARKING +# Only if contract executed => add new cyphered links # _passenger.contract.sh # Zen CONTRACT TODO # COmpare with code to verify and extend Draft # TODO: Could be converted into yaml or json if you like... @@ -100,7 +101,7 @@ echo " _|_ o ._ _ _ _ _|_ _. ._ _ ._ |_ | | | | (/_ _> |_ (_| | | | |_) | -PASSENGER ~/.zen/miam/$ZENSOURCE +SSB PASSENGER ~/.zen/miam/$ZENSOURCE " [[ ! -d ~/.zen/miam/$ZENSOURCE ]] && echo "ERROR# UNKNOWN ~/.zen/miam/$ZENSOURCE !!" && exit 1