diff --git a/AAXtoMP3 b/AAXtoMP3 index 88e70ac..98b5e9d 100755 --- a/AAXtoMP3 +++ b/AAXtoMP3 @@ -7,7 +7,7 @@ # Usage Synopsis. usage=$'\nUsage: AAXtoMP3 [--flac] [--aac] [--opus ] [--single] [--level ] [--chaptered] [-e:mp3] [-e:m4a] [-e:m4b] [--authcode ] [--no-clobber] - [--target_dir ] [--complete_dir ] [--validate] [--append-narrator] + [--target_dir ] [--complete_dir ] [--validate] [--use-audible-cli-data] [--continue ] {FILES}\n' codec=libmp3lame # Default encoder. extension=mp3 # Default encoder extension. @@ -23,7 +23,6 @@ noclobber=0 # Default off, clobber only if flag is enabled continue=0 # Default off, If set Transcoding is skipped and chapter splitting starts at chapter continueAt. continueAt=1 # Optional chapter to continue splitting the chapters. audibleCli=0 # Default off, Use additional data gathered from mkb79/audible-cli -appendNarrator=0 # Default off, Append the narrator name to the Folder name. Needs mediainfo # ----- # Code tip Do not have any script above this point that calls a function or a binary. If you do @@ -66,8 +65,6 @@ while true; do --use-audible-cli-data ) audibleCli=1; shift ;; # Compression level --level ) level="$2"; shift 2 ;; - # Append Narrator - --append-narrator ) appendNarrator=1; shift ;; # Command synopsis. -h | --help ) printf "$usage" $0 ; exit ;; # Standard flag signifying the end of command line processing. @@ -150,7 +147,7 @@ log() { # ----- # Print out what we have already after command line processing. -debug_vars "Command line options as set" codec extension mode container targetdir completedir auth_code appendNarrator audibleCli +debug_vars "Command line options as set" codec extension mode container targetdir completedir auth_code audibleCli # ======================================================================== # Variable validation @@ -303,13 +300,6 @@ if [ "${level}" != "-1" ]; then fi fi -# ----- -# Check for presence of mediainfo in case the flag --append-narrator is used -if [[ "${appendNarrator}" == 1 && "x$(type -P mediainfo)" == "x" ]]; then - echo "ERROR --append-narator specified, but mediainfo is not in PATH" - exit 1 -fi - # ----- # Clean up if someone hits ^c or the script exits for any reason. trap 'rm -r -f "${working_directory}"' EXIT @@ -507,11 +497,6 @@ do description="" publisher="" fi - # If the flag --append-narrator is used, we append the narrator name to the output dir - if [[ "${appendNarrator}" == 1 ]]; then - output_directory="${output_directory}"-"${narrator}" - output_file="${output_directory}/${title}.${extension}" - fi if [[ "${noclobber}" = "1" ]] && [[ -d "${output_directory}" ]]; then log "Noclobber enabled but directory '${output_directory}' exists. Exiting to avoid overwriting" exit 0 diff --git a/README.md b/README.md index a1910d8..7e75183 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,6 @@ bash AAXtoMP3 [-f|--flac] [-o|--opus] [-a|-aac] [-s|--single] [--level