diff --git a/zen/cron_MINUTE.sh b/zen/cron_MINUTE.sh index ec3efe9..283bef8 100755 --- a/zen/cron_MINUTE.sh +++ b/zen/cron_MINUTE.sh @@ -41,10 +41,10 @@ echo $timebar ################################################################## # RANDOMLY RUN SSB GET zenytv (avoid simultaneous run in swarm) randh=$((1 + RANDOM % 24)) -[[ $(($heure % $randh)) == 0 ]] && $MY_PATH/ssb_GET_zenytv.sh && $MY_PATH/miam_miam.sh +[[ $(($heure % $randh)) == 0 ]] && $MY_PATH/ssb_GET_zenytv.sh ################################################################## randh=$((1 + RANDOM % 24)) -[[ $(($heure % $randh)) == 0 ]] && $MY_PATH/ssb_GET_zenyta.sh && $MY_PATH/miam_miam.sh +[[ $(($heure % $randh)) == 0 ]] && $MY_PATH/ssb_GET_zenyta.sh ################################################################## diff --git a/zen/miam_miam.sh b/zen/miam_miam.sh index 9e344ed..9f92ecb 100755 --- a/zen/miam_miam.sh +++ b/zen/miam_miam.sh @@ -26,10 +26,12 @@ echo ' _| / ' +tstamp="$1" -for tstamp in $(ls ~/.zen/miam/); do - [ ! -d ~/.zen/miam/$tstamp ] && continue - [ -f ~/.zen/miam/$tstamp/msg_key ] && msg_key=$(cat ~/.zen/miam/$tstamp/msg_key) || echo "HEY I cannot find SSB message in $tstamp" || continue +# for tstamp in $(ls ~/.zen/miam/); do + + [ ! -d ~/.zen/miam/$tstamp ] && ehco "NOT FOUND ~/.zen/miam/$tstamp" && exit 1 + [ -f ~/.zen/miam/$tstamp/msg_key ] && msg_key=$(cat ~/.zen/miam/$tstamp/msg_key) || echo "HEY I cannot find source SSB message in $tstamp" || continue echo "$msg_key" msg=$(sbotc get '{"id":"'"$msg_key"'"}') @@ -94,7 +96,7 @@ for tstamp in $(ls ~/.zen/miam/); do ;; *) - echo "TYPE UNKNOWN $file" && UNKOWN="$file" + echo "TYPE is UNKNOWN for $file" && UNKOWN="$file" continue ;; @@ -102,20 +104,21 @@ for tstamp in $(ls ~/.zen/miam/); do done # File analyse finished... # WHAT DO WE HAVE THERE? - [[ "$JSON" == "" ]] && echo "NO METADATA" && continue + [[ "$JSON" == "" ]] && echo "NO METADATA !!!!" \ + && echo "BAD PASSENGER ERASING ~/.zen/miam/$tstamp" && rm -Rf ~/.zen/miam/$tstamp \ + && exit 1 [[ -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 - # CLEAN A LITTLE UNKOWN="" MP3="" MP4="" JPG="" JSON="" - [[ -d ~/.zen/miam/$tstamp && "$tstamp" != "" ]] && rm -Rf ~/.zen/miam/$tstamp # DELETE miam, it has been EATEN - -done + [[ -d ~/.zen/miam/$tstamp && "$tstamp" != "" ]] && rm -Rf ~/.zen/miam/$tstamp && echo "# DELETE miam, it has been EATEN" + + exit 0 + +#done diff --git a/zen/ssb_GET_zenyta.sh b/zen/ssb_GET_zenyta.sh index de8cfaa..608e58b 100755 --- a/zen/ssb_GET_zenyta.sh +++ b/zen/ssb_GET_zenyta.sh @@ -87,5 +87,7 @@ do # REFERENCE msg_key AND timestamp [[ $timestamp ]] && echo "$((timestamp + 1))" > ~/.zen/zenyta.last.ts [[ $msg_key ]] && echo "$msg_key" > ~/.zen/miam/$timestamp/msg_key + + $MY_PATH/miam_miam.sh "$timestamp" done < <(printf '%s\n' "$messages") diff --git a/zen/ssb_GET_zenytv.sh b/zen/ssb_GET_zenytv.sh index 1d32b48..078b560 100755 --- a/zen/ssb_GET_zenytv.sh +++ b/zen/ssb_GET_zenytv.sh @@ -42,6 +42,8 @@ __ __ (_) __| | ___ ___ \ V / | | / _` | / -_) / _ \ \_/ |_| \__,_| \___| \___/ +Hi, i am [$self_name]($self) + ' @@ -86,4 +88,6 @@ do [[ $timestamp ]] && echo "$((timestamp + 1))" > ~/.zen/zenytv.last.ts [[ $msg_key ]] && echo "$msg_key" > ~/.zen/miam/$timestamp/msg_key + $MY_PATH/miam_miam.sh "$timestamp" + done < <(printf '%s\n' "$messages")