diff --git a/ajouter_video.sh b/ajouter_video.sh index b10fdd8..e266feb 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -299,5 +299,5 @@ esac ~/.zen/astrXbian/zen/new_file_in_astroport.sh "$HOME/astroport/${CAT}/${TMDB}/" "${FILE_NAME}" > /tmp/${CAT}_${TMDB}.log 2>&1 ######################################################################## ######################################################################## -[ $? == 0 ] && zenity --warning --width 300 --text "OK! Votre source vidéo $cat a été transférée dans Astroport" && exit 0 \ -|| zenity --warning --width 300 --text "Désolé une erreur est survenue... LOG: /tmp/${CAT}_${TMDB}.log" && exit 1 +[ $? == 0 ] && zenity --warning --width 300 --text "OK! Votre vidéo $CAT ${FILE_NAME} a été transférée dans Astroport" && exit 0 \ +|| zenity --warning --width ${large} --height=${haut} --text "Désolé une erreur est survenue... LOG: $(cat /tmp/${CAT}_${TMDB}.log)" && exit 1 diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index fb74e16..62829fa 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -37,11 +37,11 @@ extension="${file##*.}" TITLE="${file%.*}" # .part file false flag correcting (inotify mode) -[[ ! -f "${path}${file}" ]] && file="${TITLE%.*}" && extension="${TITLE##*.}" && [[ ! -f "${path}${file}" ]] && echo "NO FILE" && exit 1 +[[ ! -f "${path}${file}" ]] && file="${TITLE%.*}" && extension="${TITLE##*.}" && [[ ! -f "${path}${file}" ]] && er="NO FILE" && echo "$er" && exit 1 # GET XZUID [[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(cat /etc/hostname) -[[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'astroport') ]] && echo "Les fichiers sont à placer dans ~/astroport/ MERCI" && exit 1 +[[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'astroport') ]] && er="Les fichiers sont à placer dans ~/astroport/ MERCI" && echo "$er" && exit 1 TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/astroport/... TYPE(film, youtube, mp3)/ REFERENCE / CAT=$(echo "$TYPE" | awk '{ print tolower($0) }') @@ -50,7 +50,7 @@ PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, Y, M if [[ $PREFIX == "" ]] then [[ "$USER" != "xbian" ]] && zenity --warning --width 300 --text "Désolé votre fichier ne peut pas être traité" - echo "WARNING. $TYPE is root file UNTREATED" && exit 1 + er="$er | WARNING. $TYPE is root file UNTREATED" && echo "$er" && exit 1 fi ######################################################################## @@ -66,7 +66,8 @@ case ${CAT} in ## DIFFERENT TREATMENT INDEXPREFIX="MP3_" REFERENCE=$(echo "$file" | cut -d "_" -f 1) # Youtube filename starts with ID_ - echo "Please use new_mp3_in_astroport.sh ... EXIT" + er="$er | Please use new_mp3_in_astroport.sh ... EXIT" + echo "$er" exit 1 ;; film | serie | anime) @@ -74,12 +75,13 @@ case ${CAT} in REFERENCE=$(echo "$path" | cut -d '/' -f 6 ) # Path contains TMDB id if ! [[ "$REFERENCE" =~ ^[0-9]+$ ]] # ${REFERENCE} NOT A NUMBER then - echo "ERROR: $path BAD TMDB code. Get it from https://www.themoviedb.org/ " + er="$er | ERROR: $path BAD TMDB code. Get it from https://www.themoviedb.org/ " + echo "$er" exit 1 fi ;; *) - echo "$CAT inconnu" && exit 1 + er="$CAT inconnu" && echo "$er" && exit 1 ;; esac @@ -101,7 +103,7 @@ then ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey deleteoffer -i $gchangeAD rm ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad else - echo "FILE IS ALREADY EXISTING FROM ANOTHER FRIEND" + er="$er | FILE IS ALREADY EXISTING FROM ANOTHER FRIEND" && echo "$er" echo ${isREFERENCEinINDEX} | head -n 1 | cut -d ":" -f 2- # I could send message to my friend, PIN, exchange contract... WHAT IS BEST TODO ?? fi