diff --git a/ajouter_video.sh b/ajouter_video.sh index 7977e7a..e6dc8f4 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -81,7 +81,7 @@ FILE_NAME="$(basename "${YFILE}")" FILE_EXT="${FILE_NAME##*.}" YID=$(echo "${FILE_NAME}" | cut -d "&" -f 1) -YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | sed "s/[(][^)]*[)]//g" | sed -e 's/[^A-Za-z0-9._-]/_/g' ) # Remove YoutubeID_ and (what is in perentheses) +YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | sed "s/[(][^)]*[)]//g" | sed -e 's/[^A-Za-z0-9._-]/_/g' | sed -e 's/__/_/g' ) # Remove YoutubeID_ and (what is in perentheses) [[ $(which detox) ]] && YNAME=$(echo "${FILE_NAME}" | detox --inline) TMDB="${YID}" @@ -147,7 +147,7 @@ FILE_NAME="$(basename "${YFILE}")" FILE_EXT="${FILE_NAME##*.}" YID=$(echo "${FILE_NAME}" | cut -d "&" -f 1) -YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | sed "s/[(][^)]*[)]//g" | sed -e 's/[^A-Za-z0-9._-]/_/g' ) # Remove YoutubeID_ and (what is in perentheses) +YNAME=$(echo "${FILE_NAME}" | cut -d "&" -f 2- | sed "s/[(][^)]*[)]//g" | sed -e 's/[^A-Za-z0-9._-]/_/g' | sed -e 's/__/_/g') # Remove YoutubeID_ and (what is in perentheses) [[ $(which detox) ]] && YNAME=$(echo "${FILE_NAME}" | detox --inline) [[ ! $islink && "$song" != "" ]] && FILE_PATH="$HOME/astroport/$CAT/$artist/_o-o_" \ @@ -204,7 +204,8 @@ fi # VIDEO TITLE TITLE=$(zenity --entry --width 300 --title "Titre" --text "Indiquez le titre de la vidéo" --entry-text="${FILE_TITLE}") [[ $TITLE == "" ]] && exit 1 -TITLE=$(echo "${TITLE}" | sed "s/[(][^)]*[)]//g" | sed "s/;/ /g" |sed "s/'/ /g" | sed "s/\"/ /g" | sed "s/&/ /g" ) # Clean TITLE +TITLE=$(echo "${TITLE}" | sed "s/[(][^)]*[)]//g" | sed -e 's/[^A-Za-z0-9._-]/_/g' | sed -e 's/__/_/g' ) # Clean TITLE +[[ $(which detox) ]] && TITLE=$(echo "${TITLE}" | detox --inline) # VIDEO YEAR YEAR=$(zenity --entry --width 300 --title "Année" --text "Indiquez année de la vidéo. Exemple: 1985" --entry-text="")