From 09145b4df2aced0b09221328dbefd908ed08c4f6 Mon Sep 17 00:00:00 2001 From: upuv Date: Sat, 26 May 2018 16:16:00 +1000 Subject: [PATCH] Fixed an issue with container setting. --- AAXtoMP3 | 9 +++++---- README.md | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/AAXtoMP3 b/AAXtoMP3 index 4a60e9d..ed965ae 100755 --- a/AAXtoMP3 +++ b/AAXtoMP3 @@ -34,9 +34,9 @@ while true; do # This is the same as --single option. -e:mp3 ) codec=libmp3lame; extension=mp3; mode=single; container=mp3; shift ;; # Identical to --acc option. - -e:m4a ) codec=copy; extension=m4a; mode=single; container=m4a shift ;; - # Similiar to --aac but specific to audio books. - -e:m4b ) codec=copy; extension=m4a; mode=single; container=m4b shift ;; + -e:m4a ) codec=copy; extension=m4a; mode=single; container=m4a; shift ;; + # Similiar to --aac but specific to audio books + -e:m4b ) codec=copy; extension=m4a; mode=single; container=m4b; shift ;; # Change the working dir from AAX directory to what you choose. -t | --target_dir ) targetdir="$2"; shift 2 ;; # Authorization code associate with the AAX file(s) @@ -215,7 +215,7 @@ do # Big long DEBUG output. Fully describes the settings used for transcoding. I could probably do this better. # Not this is a long debug command. It's not critical to operation. It's purely for people debugging # and coders wanting to extend the script. - debug "$(printf '\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %sn%-18s: %s' title "${title}" auth_code "${auth_code}" mode "${mode}" path "${path}" codec "${codec}" bitrate "${bitrate}" artist "${artist}" album_artist "${album_artist}" album "${album}" album_date "${album_date}" genre "${genre}" copyright "${copyright}" full_file_path "${full_file_path}" metadata_file "${metadata_file}" working_directory "${working_directory}" )" + debug "$(printf '\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %s\n%-18s: %sn%-18s: %s' title "${title}" auth_code "${auth_code}" mode "${mode}" path "${path}" container ${container} codec "${codec}" bitrate "${bitrate}" artist "${artist}" album_artist "${album_artist}" album "${album}" album_date "${album_date}" genre "${genre}" copyright "${copyright}" full_file_path "${full_file_path}" metadata_file "${metadata_file}" working_directory "${working_directory}" )" # ----- # This is the main work horse command. This is the primary transcoder. @@ -282,6 +282,7 @@ do duration=$(echo "${end} - ${start%?}" | bc) echo "#EXTINF:${duration%.*},${title} - ${chapter}" >> "${playlist_file}" echo "${chapter_title}.${container}" >> "${playlist_file}" + echo "${container} ${chapter_title}.${container}" chapternum=$((chapternum + 1 )) # ---- diff --git a/README.md b/README.md index 79f4b74..bc468c1 100644 --- a/README.md +++ b/README.md @@ -56,10 +56,10 @@ this string from a tool like [audible-activator](https://github.com/inAudible-NG/audible-activator). #### Specifying the AUTHCODE. - In order of __precidence__. - 1. __--authcode [AUTHCODE]__ The command line option. With the highest precidence. - 2. __.authcode__ If this file is placed in the current working directory and contains only the authcode it is used if the above is not. - 3. __~/.authcode__ a global config file for all the tools. And is used as the default if none of the above are specified. +In order of __precidence__. +1. __--authcode [AUTHCODE]__ The command line option. With the highest precidence. +2. __.authcode__ If this file is placed in the current working directory and contains only the authcode it is used if the above is not. +3. __~/.authcode__ a global config file for all the tools. And is used as the default if none of the above are specified. __Note:__ At least one of the above must be exist. The code must also match the encoding for the user that owns the AAX file(s). If the authcode does not match the AAX file no transcoding will occure.