diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index 59d01ce7..4bd0158c 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -106,7 +106,7 @@ while read YID; ILINK=$(ipfs add -q "$HOME/.zen/tmp/$WISHKEY/$ZFILE" | tail -n 1) echo "/ipfs/$ILINK <=> $ZFILE" - MIME=$(file --mime-type "$HOME/.zen/tmp/$WISHKEY/$ZFILE" | rev | cut -d ' ' -f 1 | rev) + MIME=$(file --mime-type -b "$HOME/.zen/tmp/$WISHKEY/$ZFILE") ## ADD TAGS SEC=$(yt-dlp --print "%(duration)s" "${ZYURL}") diff --git a/ajouter_media.sh b/ajouter_media.sh index 16e31bbb..bdabdb36 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -554,7 +554,7 @@ echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/i esac ## Extract thumbnail -MIME=$(file --mime-type $HOME/astroport/${CAT}/${MEDIAID}/${TITLE}.${FILE_EXT} | rev | cut -d ' ' -f 1 | rev) +MIME=$(file --mime-type -b $HOME/astroport/${CAT}/${MEDIAID}/${TITLE}.${FILE_EXT}) [[ $(echo $MIME | grep video) ]] && ffmpeg -i $HOME/astroport/${CAT}/${MEDIAID}/${TITLE}.${FILE_EXT} -r 1/300 -vf scale=-1:120 -vcodec png $HOME/astroport/${CAT}/${MEDIAID}/thumbnail.png [[ ! -f ~/astroport/${CAT}/${MEDIAID}/thumbnail.png ]] && echo "DEFAULT THUMBNAIL NEEDED" diff --git a/tools/mailjet.sh b/tools/mailjet.sh index 0f095f8e..d3bb6a9b 100755 --- a/tools/mailjet.sh +++ b/tools/mailjet.sh @@ -17,15 +17,19 @@ echo ' ########################################################################' ### PLEASE CHANGE YOUR DOMAIN AND KEY ( OR HELP PAYING TRAFIC ;) ## THIS IS A FREE LIMITED ACCOUNT. DO NOT EXAGERATE ;) -mail=$1 +mail="$1" # EMAIL DESTINATAIRE +messfile="$2" # CORPS MESSAGE + [[ ! $1 ]] && mail="support@qo-op.com" -echo "From: fred@g1sms.fr +SUBJECT="[(♥‿‿♥)] message personnel. merci. " +MESSAGE="( ◕‿◕) Bonjour $PLAYER\n\nTW http://qwantic.com:1234 .\n\nAstroport" +[[ $messfile && -f $messfile ]] && [[ $(file --mime-type -b $messfile) == 'text/plain' ]] && MESSAGE=$(cat $messfile) + +echo "From: Fred To: EMAIL Subject: SUBJECT MESSAGE " > ~/.zen/tmp/email.txt -SUBJECT="[(♥‿‿♥)] message personnel. merci. " -MESSAGE="( ◕‿◕) Bonjour $PLAYER\n\nTW http://qwantic.com:1234 .\n\nAstroport" cat ~/.zen/tmp/email.txt | sed "s~EMAIL~${mail}~g" | sed "s~SUBJECT~${SUBJECT}~g" | sed "s~MESSAGE~${MESSAGE}~g" | ssmtp -v ${mail} diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index 276e461f..d2a1d8a9 100755 --- a/tools/new_file_in_astroport.sh +++ b/tools/new_file_in_astroport.sh @@ -425,7 +425,7 @@ then GENRE=$(cat ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/ajouter_video.txt | cut -d ';' -f 6 | sed 's/|/ /g' | jq -r '@csv' | sed 's/ /_/g' | sed 's/,/ /g' | sed 's/\"//g' ) echo $GENRE - MIME=$(file --mime-type "$HOME/astroport/${TYPE}/${REFERENCE}/${file}" | rev | cut -d ' ' -f 1 | rev) + MIME=$(file --mime-type -b "$HOME/astroport/${TYPE}/${REFERENCE}/${file}") REAL=$MIME ## ASK FOR EXTRA METADATA diff --git a/tools/vlc_webcam.sh b/tools/vlc_webcam.sh index 3325f517..5d6eaa7a 100755 --- a/tools/vlc_webcam.sh +++ b/tools/vlc_webcam.sh @@ -127,7 +127,7 @@ mkdir -p ~/astroport/video/vlog/ MEDIAKEY="VLOG_${PLAYER}_${MEDIAID}" cp ~/.zen/tmp/output.mp4 ~/astroport/video/vlog/${PLAYER}_$MEDIAID.mp4 -REAL=$(file --mime-type "$HOME/astroport/video/vlog/${PLAYER}_$MEDIAID.mp4" | cut -d ':' -f 2 | cut -d ' ' -f 2) +REAL=$(file --mime-type -b "$HOME/astroport/video/vlog/${PLAYER}_$MEDIAID.mp4") ## TW not displaying direct ipfs video link (only image, pdf, ...) so insert