* Several patches for improved Musicbrainz support from Martin Michlmayr:

    + add musicbrainz support for FLAC files with embedded cue files.
      Closes: #669139

git-svn-id: http://abcde.googlecode.com/svn/trunk@302 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/abcde b/abcde
index b3542b0..202ad94 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -489,8 +489,18 @@ makeids ()
        PREGAP=$(($(echo $OFFSETS | cut -f1 -d' ')))
        TOTALTIME=$(( (($LEADOUT + $LEADIN + $PREGAP) / $CDFRAMES) - (($LEADIN + $PREGAP) / $CDFRAMES)))
 
        PREGAP=$(($(echo $OFFSETS | cut -f1 -d' ')))
        TOTALTIME=$(( (($LEADOUT + $LEADIN + $PREGAP) / $CDFRAMES) - (($LEADIN + $PREGAP) / $CDFRAMES)))
 

-       printf -v HEXSUM "%08lx" $(( ($CDDBCKSUM % 0xff) << 24 | $TOTALTIME << 8 | $TRACKS))
-       TRACKINFO="${HEXSUM} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"
+       case "$CDDBMETHOD" in
+               cddb)
+                       printf -v DISCID "%08lx" $(( ($CDDBCKSUM % 0xff) << 24 | $TOTALTIME << 8 | $TRACKS))
+                       ;;
+               musicbrainz)
+                       # FIXME: don't assume the first track is 1
+                       echo "dasd: 1 $TRACKS $LEADIN $LEADOUT $OFFSETS "
+                       DISCID=$($MUSICBRAINZ --command calcid --discinfo 1 $TRACKS $LEADIN $LEADOUT $OFFSETS)
+                       ;;
+       esac
+
+       TRACKINFO="${DISCID} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"

 }
 
 do_replaygain()
 }
 
 do_replaygain()


@@ -2230,7 +2240,8 @@ do_musicbrainz ()
                # the available entries.
                rm -f "$ABCDETEMPDIR/cddbchoices"
                CDDBCHOICES=1 # Overridden by multiple matches
                # the available entries.
                rm -f "$ABCDETEMPDIR/cddbchoices"
                CDDBCHOICES=1 # Overridden by multiple matches

-               ${MUSICBRAINZ} --command data --device "$CDROM" --workdir $ABCDETEMPDIR
+               MBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
+               ${MUSICBRAINZ} --command data --discid "$MBDISCID" --workdir $ABCDETEMPDIR

 
                # The helper script will write disc matches out to
                # cddbread.*. Count how many we have
 
                # The helper script will write disc matches out to
                # cddbread.*. Count how many we have

diff --git a/abcde-musicbrainz-tool b/abcde-musicbrainz-tool
index 7a0f567..8a7391e 100644 (file)
--- a/abcde-musicbrainz-tool
+++ b/abcde-musicbrainz-tool
@@ -13,6 +13,8 @@
 
 use strict;
 use encoding "utf8";
 
 use strict;
 use encoding "utf8";

+use POSIX qw(ceil);
+use Digest::SHA;

 use MusicBrainz::DiscID;
 use WebService::MusicBrainz::Release;
 use WebService::MusicBrainz::Artist;
 use MusicBrainz::DiscID;
 use WebService::MusicBrainz::Release;
 use WebService::MusicBrainz::Artist;


@@ -22,12 +24,14 @@ use Getopt::Long;
 
 my $FRAMES_PER_SEC = 75;
 
 
 my $FRAMES_PER_SEC = 75;
 

-my ($device, $command, $workdir);
+my ($device, $command, $discid, @discinfo, $workdir);

 Getopt::Long::Configure ('no_ignore_case');
 Getopt::Long::Configure ('no_auto_abbrev');
 Getopt::Long::Configure ('no_ignore_case');
 Getopt::Long::Configure ('no_auto_abbrev');

-GetOptions ("device=s"   => \$device,
-            "command=s"  => \$command,
-            "workdir=s" => \$workdir);
+GetOptions ("device=s"       => \$device,
+            "command=s"      => \$command,
+            "discid=s"       => \$discid,
+            "discinfo=i{5,}" => \@discinfo,
+            "workdir=s"      => \$workdir);

 
 if (!defined($device)) {
     $device = "/dev/cdrom";
 
 if (!defined($device)) {
     $device = "/dev/cdrom";


@@ -39,15 +43,15 @@ if (!defined($workdir)) {
     $workdir = "/tmp";
 }
 
     $workdir = "/tmp";
 }
 

-my $disc = new MusicBrainz::DiscID($device);

 
 

-# read the disc in the default disc drive */
-if ( $disc->read() == 0 ) {
-    printf STDERR "Error: %s\n", $disc->error_msg();
-    exit(1);
-}
+if ($command =~ m/^id/) {
+    my $disc = new MusicBrainz::DiscID($device);

 
 

-if ($command =~ m/id/) {
+    # read the disc in the default disc drive */
+    if ( $disc->read() == 0 ) {
+        printf STDERR "Error: %s\n", $disc->error_msg();
+        exit(1);
+    }

 
     printf("%s ", $disc->id());
     printf("%d ", $disc->last_track_num() + 1 - $disc->first_track_num());
 
     printf("%s ", $disc->id());
     printf("%d ", $disc->last_track_num() + 1 - $disc->first_track_num());


@@ -57,10 +61,11 @@ if ($command =~ m/id/) {
         printf("%d ", $disc->track_offset($i));
     }
     printf("%d\n", $disc->sectors() / $FRAMES_PER_SEC);
         printf("%d ", $disc->track_offset($i));
     }
     printf("%d\n", $disc->sectors() / $FRAMES_PER_SEC);

+    undef $disc;

 
 } elsif ($command =~ m/data/) {
     my $ws = WebService::MusicBrainz::Release->new();
 
 } elsif ($command =~ m/data/) {
     my $ws = WebService::MusicBrainz::Release->new();

-    my $response = $ws->search({ DISCID => $disc->id()});
+    my $response = $ws->search({ DISCID => $discid });

     my @releases = $response->release_list();
     my $releasenum = 0;
 
     my @releases = $response->release_list();
     my $releasenum = 0;
 


@@ -76,18 +81,21 @@ if ($command =~ m/id/) {
         print OUT "# xmcd style database file\n";
         print OUT "#\n";
         print OUT "# Track frame offsets:\n";
         print OUT "# xmcd style database file\n";
         print OUT "#\n";
         print OUT "# Track frame offsets:\n";

-        for ( my $i = $disc->first_track_num;
-              $i <= $disc->last_track_num; $i++ ) {
-            print OUT "#       " . $disc->track_offset($i) . "\n";
+        # Assume standard pregap
+        my $total_len = 2000;
+        my @tracks = @{$release->track_list()->tracks()};
+        for (my $i = 0; $i < scalar(@tracks); $i++) {
+            printf OUT "#       %d\n", ceil($total_len * $FRAMES_PER_SEC / 1000.0);
+            $total_len += $tracks[$i]->duration();

         }
         print OUT "#\n";
         }
         print OUT "#\n";

-        printf OUT "# Disc length: %d seconds\n", $disc->sectors() / $FRAMES_PER_SEC;
+        printf OUT "# Disc length: %d seconds\n", $total_len / 1000.0;

         print OUT "#\n";
         print OUT "# Submitted via: XXXXXX\n";
         print OUT "#\n";
         print OUT "#blues,classical,country,data,folk,jazz,newage,reggae,rock,soundtrack,misc\n";
         print OUT "#CATEGORY=none\n";
         print OUT "#\n";
         print OUT "# Submitted via: XXXXXX\n";
         print OUT "#\n";
         print OUT "#blues,classical,country,data,folk,jazz,newage,reggae,rock,soundtrack,misc\n";
         print OUT "#CATEGORY=none\n";

-        print OUT "DISCID=" . $disc->id() . "\n";
+        print OUT "DISCID=" . $discid . "\n";

         print OUT "DTITLE=" . $a_artist. " / " . $release->title() . "\n";
         print OUT "DYEAR=\n";
         print OUT "DGENRE=\n";
         print OUT "DTITLE=" . $a_artist. " / " . $release->title() . "\n";
         print OUT "DYEAR=\n";
         print OUT "DGENRE=\n";


@@ -112,6 +120,38 @@ if ($command =~ m/id/) {
         print OUT ".\n";
         close OUT;
     }
         print OUT ".\n";
         close OUT;
     }

+} elsif ($command =~ m/calcid/) {
+# Calculate MusicBrainz ID from disc offsets; see
+# http://musicbrainz.org/doc/DiscIDCalculation
+
+    my ($first, $last, $leadin, $leadout, @offsets) = @discinfo;
+
+    my $s = Digest::SHA->new(1);
+    $s->add(sprintf "%02X", int($first));
+    $s->add(sprintf "%02X", int($last));
+
+    my @a;
+    for (my $i = 0; $i < 100; $i++) {
+        $a[$i] = 0;
+    }
+    my $i = 0;
+    foreach my $o ($leadout, @offsets) {
+       $a[$i++] = int($o) + int($leadin);
+    }
+    for (my $i = 0; $i < 100; $i++) {
+       $s->add(sprintf "%08X", $a[$i]);
+    }
+
+    my $id = $s->b64digest;
+    # CPAN Digest modules do not pad their Base64 output, so we have to do it.
+    while (length($id) % 4) {
+        $id .= '=';
+    }
+
+    $id =~ tr#+#.#;
+    $id =~ tr#/#_#;
+    $id =~ tr#=#-#;
+
+    print $id;

 }
 
 }
 

-undef $disc;

diff --git a/changelog b/changelog
index 46d12f6..5163d50 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+abcde 2.5.1 UNRELEASED
+
+  * Several patches for improved Musicbrainz support from Martin Michlmayr:
+    + add musicbrainz support for FLAC files with embedded cue files.
+      Closes: #669139
+
+ -- Steve McIntyre <93sam@debian.org>  Fri, 13 Apr 2012 22:29:45 +0100
+

 abcde 2.5.0
 
   * Bumped to 2.5.0
 abcde 2.5.0
 
   * Bumped to 2.5.0

diff --git a/debian/control b/debian/control
index 0833191..7f0dd3f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Svn: http://abcde.googlecode.com/svn/trunk/
 Package: abcde
 Architecture: all
 Depends: ${misc:Depends}, cd-discid, wget, cdparanoia | icedax, vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | speex
 Package: abcde
 Architecture: all
 Depends: ${misc:Depends}, cd-discid, wget, cdparanoia | icedax, vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | speex

-Recommends: vorbis-tools, libmusicbrainz-discid-perl, libwebservice-musicbrainz-perl
+Recommends: vorbis-tools, libmusicbrainz-discid-perl, libwebservice-musicbrainz-perl, libdigest-sha-perl

 Suggests: eject, distmp3, id3 (>= 0.12), id3v2, eyed3, normalize-audio, vorbisgain, mkcue, mp3gain
 Description: A Better CD Encoder
  A frontend program to cdparanoia, wget, cd-discid, id3, and your favorite
 Suggests: eject, distmp3, id3 (>= 0.12), id3v2, eyed3, normalize-audio, vorbisgain, mkcue, mp3gain
 Description: A Better CD Encoder
  A frontend program to cdparanoia, wget, cd-discid, id3, and your favorite