diff --git a/ajouter_video.sh b/ajouter_video.sh index 4e3c332..a08a316 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -526,7 +526,7 @@ MIME=$(file --mime-type $HOME/astroport/${CAT}/${MEDIAID}/${TITLE}.${FILE_EXT} | ######################################################################## # ADD $FILE to IPFS / ASTROPORT / KODI -echo "new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\"" +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 ######################################################################## @@ -541,7 +541,7 @@ echo "new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_N timestamp=$(date -u +%s%N | cut -b1-13) -## AUTO DESTRUCTIVE ADD TO ASTROPORT IPFS SCRIPT +## AUTO DESTRUCTIVE LATER ADD TO ASTROPORT SCRIPT echo "MEDIAKEY=${MEDIAKEY}" > ~/astroport/Add_${MEDIAKEY}_script.sh #[[ $CHOICE == "TMDB" ]] && echo "echo \"Encoder ${FILE_NAME} en h265 avant import ? Tapez sur ENTER.. Sinon saisissez qqch avant...\" #reponse=\$1 @@ -553,7 +553,7 @@ echo "MEDIAKEY=${MEDIAKEY}" > ~/astroport/Add_${MEDIAKEY}_script.sh # ~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}.mp4\" #else" >> ~/astroport/Add_${MEDIAKEY}_script.sh -echo "~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\" " >> ~/astroport/Add_${MEDIAKEY}_script.sh +echo "~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\" \"$3\"" >> ~/astroport/Add_${MEDIAKEY}_script.sh #[[ $CHOICE == "TMDB" ]] && echo "fi" >> ~/astroport/Add_${MEDIAKEY}_script.sh diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 7b438b5..8740d2e 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -170,8 +170,8 @@ if [[ $(($runtime % 15)) == 0 ]]; then ######################################################################## # RE/LAUNCHING INSTASCAN API instascan=$(ps auxf --sort=+utime | grep -w nc | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) -[[ $instascan ]] && killall nc && killall instascan_login.sh && ~/.zen/Astroport.ONE/tools/instascan_login.sh & -[[ ! $instascan ]] && ~/.zen/Astroport.ONE/tools/instascan_login.sh & +[[ $instascan ]] && killall instascan_login.sh && killall nc && ~/.zen/Astroport.ONE/tools/instascan_login.sh >> /tmp/instascan.log & +[[ ! $instascan ]] && ~/.zen/Astroport.ONE/tools/instascan_login.sh >> /tmp/instascan.log & # git reset --hard cd $MY_PATH @@ -336,6 +336,7 @@ echo ' # New full test review in gchange_INIT.sh rm -f ~/.ipfs/test.disk + rm -f /tmp/instascan.log # LOG ROTATE WEEKLY [[ -f /tmp/astroport.log ]] && [[ ! -f ~/.zen/astroport.$weeknumber.log.tgz ]] && tar cvzf ~/.zen/astroport.$weeknumber.log.tgz /tmp/astroport.log && echo "" > /tmp/astroport.log diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index 9a1f363..507d43f 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -453,11 +453,11 @@ then ] ' >> ~/astroport/${TYPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json -## Add tidller into Station Balise +echo "Add tidller into Station Balise" cp ~/astroport/${TYPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/tiddler.json -## SEND TW json to GCHANGE (call from g1-compagnon -~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d $3 -t "MEDIAKEY ${MEDIAKEY}" -m "MEDIA : https;//astroport.com/ipfs/${IPFSREPFILEID} + TW https;//astroport.com/ipns/$IPFSNODEID/.$IPFSNODEID/KEY/${MEDIAKEY}/${G1PUB}/tiddler.json " +echo "SEND TW json to GCHANGE (call from g1-compagnon" +~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d "$3" -t "MEDIAKEY ${MEDIAKEY}" -m "MEDIA : https;//astroport.com/ipfs/${IPFSREPFILEID} + TW https;//astroport.com/ipns/$IPFSNODEID/.$IPFSNODEID/KEY/${MEDIAKEY}/${G1PUB}/tiddler.json " # Will be used by caroussel.html template # CAROUSSEL=$(ipfs add -wq ~/astroport/${TYPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json | head-n 1)