Skip to content

Automatic determination of disc number #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasom wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Automatic determination of disc number #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 34 additions & 17 deletions abcde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4067,6 +4067,18 @@ post_encode ()
:
}

parse_multidisc() {
local multidisc_info rest
multidisc_info="${ABCDETEMPDIR}/multidisc.$(checkstatus cddb-choice)"
if [[ -n "$AUTOMATIC_DISCNUMBER" && -e "$multidisc_info" ]]; then
read -r DISCNUMBER DISCTOTAL < "$multidisc_info"
STARTTRACKNUMBER="${DISCNUMBER}$(printf "%02d" "${STARTTRACKNUMBER:-01}")"
STARTTRACKNUMBERTAG="y"
COMMENT="CD ${DISCNUMBER}/${DISCTOTAL}"
fi
}


###############################################################################
# End of functions
#
Expand Down Expand Up @@ -4513,24 +4525,27 @@ while getopts 1a:bBc:C:d:DefgGhj:klLmMnNo:pPQ:r:s:S:t:T:UvVxX:w:W:z opt ; do
;;
W)
re='^[0-9]+([,][0-9]+)?$'
if ! [[ "${OPTARG}" =~ $re ]]; then
log error 'Argument of -W must be discnumber[,disctotal]'
exit 1
if [[ "${OPTARG}" =~ $re ]]; then
DISCNUMBER=$( echo "$OPTARG" | cut -f1 -d',' )
DISCTOTAL=$( echo "$OPTARG" | cut -f2 -d',' -s )
if echo "${DISCTOTAL}" | grep "[[:digit:]]" > /dev/null 2>&1 ; then
if [ $DISCNUMBER -gt $DISCTOTAL ]; then
log error "discnumber (${DISCNUMBER}) cannot be higher than disctotal (${DISCTOTAL})"
exit 1
fi
DISCNUMBER=$( echo "$OPTARG" | cut -f1 -d',' )
DISCTOTAL=$( echo "$OPTARG" | cut -f2 -d',' -s )
if echo "${DISCTOTAL}" | grep "[[:digit:]]" > /dev/null 2>&1 ; then
if [ $DISCNUMBER -gt $DISCTOTAL ]; then
log error "discnumber (${DISCNUMBER}) cannot be higher than disctotal (${DISCTOTAL})"
exit 1
fi
COMMENT="CD ${DISCNUMBER}/${DISCTOTAL}"
else
COMMENT="CD ${DISCNUMBER}"
fi
STARTTRACKNUMBER="${DISCNUMBER}$(printf "%02d" "${STARTTRACKNUMBER:-01}")"
STARTTRACKNUMBERTAG="y"
vecho Comment is "${COMMENT}" >&2
COMMENT="CD ${DISCNUMBER}/${DISCTOTAL}"
else
COMMENT="CD ${DISCNUMBER}"
fi
STARTTRACKNUMBER="${DISCNUMBER}$(printf "%02d" "${STARTTRACKNUMBER:-01}")"
STARTTRACKNUMBERTAG="y"
vecho Comment is "${COMMENT}" >&2
elif [[ "$OPTARG" = auto ]]; then
AUTOMATIC_DISCNUMBER=yes
else
log error 'Argument of -W must be discnumber[,disctotal] or "auto"'
exit 1
fi
;;
z) DEBUG=y ; CDROMREADERSYNTAX=debug ; EJECTCD="n" ;;
?) usage; exit ;;
Expand Down Expand Up @@ -5528,6 +5543,8 @@ if [ "$DOCDDB" = "y" ]; then
do_cddbedit

eval "$($CDDBTOOL parse "$CDDBDATA")"

parse_multidisc
fi

# Before reading tracks, we set the speed of the device
Expand Down
10 changes: 10 additions & 0 deletions abcde-musicbrainz-tool
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use MusicBrainz::DiscID;
use WebService::MusicBrainz 1.0.4;
use Getopt::Long;
use Pod::Usage;
use List::Util qw(max);

my $FRAMES_PER_S = 75;

Expand Down Expand Up @@ -155,6 +156,8 @@ if ($command =~ m/^id/) {
my $medium = @mediums[0];
my @tracks = @{ $medium->{'tracks'} };

my $position = $medium->{'position'};
my $max_pos = (max (map { $_->{'position'} } @{$release->{'media'}}));
my $total_len = 0;
for (my $i = 0; $i < scalar(@tracks); $i++) {
my $track = $tracks[$i];
Expand Down Expand Up @@ -209,6 +212,13 @@ if ($command =~ m/^id/) {
print OUT $release->{'asin'};
close OUT;

if ($max_pos > 1) {
open (OUT, "> $workdir/multidisc.$releasenum");
print OUT $position . " " . $max_pos;
close OUT;
}


# Check to see that this entry is unique; generate a checksum
# and compare to any previous checksums
my $checksum = calc_sha1("$workdir/cddbread.$releasenum");
Expand Down