OTR/OTR-SaneRename
1
0
Fork 0
mirror of https://github.com/Jonny007-MKD/OTR-SaneRename synced 2025-10-30 15:35:33 +01:00
Code Issues Releases Wiki Activity

Cleaned up exit codes

Browse source 
Search for correct EPG data in while loop. We could not differentiate between start and stop time in grep
This commit is contained in:
Jonny007-MKD 2014-08-03 16:51:21 +02:00
parent c2cca9c614
commit b99dc140b9
1 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
saneRenamix.sh
View file

@ -1,6 +1,15 @@
#!/bin/bash #!/bin/bash
# TODO: Umlaute werden beim Download der xml über alle serien nicht richtig übergeben. evtl mit %-Code arbeiten # Exit codes:
# 1 : General error (invalid argument option, missing parameter)
# 2 : Specified language not recognized
# 3 : Aborted (Ctrl+C)
# 10 : Series not found in TvDB
# 11 : Series not found in EPG
# 20 : No info for this episode found
# 21 : No episode title found in EPG
# 40 : Downloading EPG data failed
# 41 : Downloading list of episodes from TvDB failed
########## ##########
# Config # # Config #
@ -27,7 +36,7 @@ function ctrl_c() {
if $wget_running; then if $wget_running; then
rm -f $wget_file rm -f $wget_file
fi fi
exit 40 exit 3
} }
wget_running=false; wget_running=false;
@ -51,14 +60,14 @@ function funcParam {
lang="fr";; lang="fr";;
*) *)
echo "Language not recognized: $OPTARG" echo "Language not recognized: $OPTARG"
exit 11;; exit 2;;
esac;; esac;;
"?") # Help "?") # Help
echo "Usage: $0 -f pathToAvi [-s] [-l LANG]" echo "Usage: $0 -f pathToAvi [-s] [-l LANG]"
exit;; exit;;
":") ":")
echo "No argument value for option $OPTARG" echo "No argument value for option $OPTARG"
exit;; exit 1;;
esac esac
done done
} }
@ -119,7 +128,7 @@ function funcGetSeriesId {
fi fi
if [ -z "$series_id" ]; then # This series was not found anywhere :( if [ -z "$series_id" ]; then # This series was not found anywhere :(
eecho -e " TVDB:\tSeries not found!" eecho -e " TVDB:\tSeries not found!"
exit 30 exit 10
fi fi
eecho -e " \t\t\tName:\t$series_title" eecho -e " \t\t\tName:\t$series_title"
@ -202,20 +211,23 @@ function funcGetEPG {
error=$? error=$?
if [ $error -ne 0 ]; then if [ $error -ne 0 ]; then
eecho "Downloading $epg_csv failed (Exit code: $error)!" eecho "Downloading $epg_csv failed (Exit code: $error)!"
exit 4 exit 40
fi fi
fi fi
epg="$(grep "$series_title" "$wget_file" | grep "${file_time}")" # Get the line with the movie epg="$(grep "$series_title" "$wget_file" | grep "${file_time}")" # Get the line with the movie
if [ -z "$epg" ]; then if [ -z "$epg" ]; then
eecho -e " EPG:\tSeries \"$series_title\" not found in EPG data" # This cannot happen :) eecho -e " EPG:\tSeries \"$series_title\" not found in EPG data" # This cannot happen :)
exit 5 exit 11
fi fi
# Parse EPG data using read # Parse EPG data using read
OLDIFS=$IFS OLDIFS=$IF
IFS=";" IFS=";"
read epg_id epg_start epg_end epg_duration epg_sender epg_title epg_type epg_text epg_genre epg_fsk epg_language epg_weekday epg_additional epg_rpt epg_downloadlink epg_infolink epg_programlink <<< "$epg" while read epg_id epg_start epg_end epg_duration epg_sender epg_title epg_type epg_text epg_genre epg_fsk epg_language epg_weekday epg_additional epg_rpt epg_downloadlink epg_infolink epg_programlink; do
if [[ "$epg_start" == *$file_time* ]]; then # Use the one with the correct start time
break
fi
done <<< "$epg"
IFS=$OLDIFS IFS=$OLDIFS
} }
@ -224,9 +236,9 @@ function funcGetEpgEpisodeTitle {
episode_title="${epg_text%%$1*}" # Text begins with episode title, cut off the rest episode_title="${epg_text%%$1*}" # Text begins with episode title, cut off the rest
if [ -z "$episode_title" ]; then if [ -z "$episode_title" ]; then
eecho -e " EPG:\tNo Episode title found" eecho -e " EPG:\tNo Episode title found"
exit 5 else
eecho -e " EPG:\tEpisode title:\t$episode_title" # We found some title :)
fi fi
eecho -e " EPG:\tEpisode title:\t$episode_title" # We found some title :)
} }
# Download episodes list from TvDB, language as argument # Download episodes list from TvDB, language as argument
@ -241,7 +253,7 @@ function funcGetEpisodes {
error=$? error=$?
if [ $error -ne 0 ]; then if [ $error -ne 0 ]; then
eecho "Downloading $episode_db failed (Exit code: $error)!" eecho "Downloading $episode_db failed (Exit code: $error)!"
exit 6 exit 41
fi fi
fi fi
} }
@ -322,7 +334,7 @@ function doIt {
if [ -z "$path" ]; then # If no path was specified (-f) if [ -z "$path" ]; then # If no path was specified (-f)
echo "Usage: $0 -f pathToAvi [-s] [-l LANG]" echo "Usage: $0 -f pathToAvi [-s] [-l LANG]"
exit 15 exit 1
fi fi
PwD=$(readlink -e $0) # Get the path to this script PwD=$(readlink -e $0) # Get the path to this script
@ -368,14 +380,21 @@ function doItEpisodes {
funcGetEpgEpisodeTitle "." # Get the episode title using . as delimiter funcGetEpgEpisodeTitle "." # Get the episode title using . as delimiter
fi fi
funcGetEpisodes $1 # Download episodes file funcGetEpisodes $1 # Download episodes file
funcGetEpisodeInfo if [ -n "$episode_title" ]; then
if [ -z "$episode_info" ] && ! $episode_title_set; then # No info found and delimiter , possible:
funcGetEpgEpisodeTitle "," # Try again with , as delimiter
funcGetEpisodeInfo funcGetEpisodeInfo
fi fi
if [ -z "$episode_info" ] && ! $episode_title_set; then # No info found and delimiter , is possible:
funcGetEpgEpisodeTitle "," # Try again with , as delimiter
if [ -n "episode_title" ]; then # If we have got an episode title
funcGetEpisodeInfo
else
eecho -e " EPG:\tNo episode title found in EPG!"
exit 21
fi
fi
} }
funcParam $@ funcParam $@
doIt doIt
exit 30 exit 20