Jul 25 18:48

[flac-archive] / fa-rip

diff --git a/fa-rip b/fa-rip
index 6a087644180cc4c4d357c110db6d90caaeafe26b..6b729804149f3927e592a7045b42b043c278b49b 100755 (executable)
--- a/fa-rip
+++ b/fa-rip
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.4
+#!/usr/bin/python

 
 """
 =head1 NAME
 
 """
 =head1 NAME


@@ -7,7 +7,7 @@ B<fa-rip> - rip a CD for B<fa-flacd>
 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-B<fa-rip> [B<-d> I<device>] [B<-p> I<post-processor> [B<-t> I<track-count>]
+B<fa-rip> [B<--artist> I<artist> B<--title> I<title>] [B<-d> I<device>] [B<-m>] [B<-p> I<post-processor>] [B<-s>] [B<-t> I<track-count>]

 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 


@@ -27,17 +27,32 @@ have to fill out the candidate-tags-0 template.
 
 =over 4
 
 
 =over 4
 

+=item B<--artist> I<artist> B<--title> I<title>
+
+Write candidate-tags files based on I<artist> and album I<title>.
+Useful if you've already ripped wav files with some other program and
+just need to set things up for B<fa-flacd>.
+

 =item B<-d> [B<--device>] I<device>
 
 Use I<device> as the CD-ROM device, instead of the default
 "/dev/cdrom" or the environment variable CDDEV.
 
 =item B<-d> [B<--device>] I<device>
 
 Use I<device> as the CD-ROM device, instead of the default
 "/dev/cdrom" or the environment variable CDDEV.
 

+=item B<-m> [B<--no-musicbrainz>]
+
+Don't connect to MusicBrainz, just write candidate-tags-0.
+

 =item B<-p> [B<--post-processor>] I<post-processor>
 
 Create a "post-processor" file in the temporary directory containing
 the line 'I<post-processor> "$@"'.  See B<fa-flacd>'s man page for
 information about this hook.
 
 =item B<-p> [B<--post-processor>] I<post-processor>
 
 Create a "post-processor" file in the temporary directory containing
 the line 'I<post-processor> "$@"'.  See B<fa-flacd>'s man page for
 information about this hook.
 

+=item B<-s> [B<--single-file>]
+
+Rip whole disc to one wav file and configure B<fa-flacd> to encode it
+to one FLAC file with embedded cuesheet.
+

 =item B<-t> [B<--tracks>] I<track-count>
 
 Archive only the first I<track-count> tracks.  This is handy for
 =item B<-t> [B<--tracks>] I<track-count>
 
 Archive only the first I<track-count> tracks.  This is handy for


@@ -67,30 +82,35 @@ it under the same terms as Perl itself.
 
 """
 
 
 """
 

-import os, re, sys, tempfile, traceback
+import os, re, sys, tempfile, time, traceback

 from optparse import OptionParser
 import urllib
 
 from optparse import OptionParser
 import urllib
 

-import musicbrainz2.disc
-import musicbrainz2.webservice
+import discid.disc
+import musicbrainzngs.musicbrainz

 
 from org.diplodocus.util import catch_EnvironmentError as c
 
 
 from org.diplodocus.util import catch_EnvironmentError as c
 

+musicbrainzngs.musicbrainz.set_useragent(
+    'flac-archive', '0.1', 'https://diplodocus.org/git/flac-archive')
+
+#import logging
+#logging.basicConfig(level=logging.DEBUG)
+

 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439790
 MSF_OFFSET = 150
 
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439790
 MSF_OFFSET = 150
 

-def mkcue(disc, trackcount=None):
-    fp = c(file, 'cue', 'w')
+def mkcue(fp, disc, trackcount=None):

     c(fp.write, 'FILE "dummy.wav" WAVE\n')
 
     if trackcount == None:
     c(fp.write, 'FILE "dummy.wav" WAVE\n')
 
     if trackcount == None:

-        trackcount = disc.lastTrackNum
+        trackcount = len(disc.tracks)

     else:
     else:

-        trackcount = min(trackcount, disc.lastTrackNum)
+        trackcount = min(trackcount, len(disc.tracks))

 
 

-    for i in xrange(disc.firstTrackNum, trackcount+1):
-        offset = disc.tracks[i-1][0]
-        offset -= MSF_OFFSET
+    for i in xrange(1, trackcount+1):
+        track = disc.tracks[i-1]
+        offset = track.offset - MSF_OFFSET

 
         minutes = seconds = 0
         sectors = offset % 75
 
         minutes = seconds = 0
         sectors = offset % 75


@@ -100,20 +120,21 @@ def mkcue(disc, trackcount=None):
                 minutes = seconds / 60
                 seconds = seconds % 60
 
                 minutes = seconds / 60
                 seconds = seconds % 60
 

-        c(fp.write, '  TRACK %02d AUDIO\n' % (i,))
+        c(fp.write, '  TRACK %02d AUDIO\n' % (track.number,))

         if i == 1 and offset > 0:
             c(fp.write, '    INDEX 00 00:00:00\n')
         c(fp.write,
           '    INDEX 01 %02d:%02d:%02d\n' % (minutes, seconds, sectors))
 
         if i == 1 and offset > 0:
             c(fp.write, '    INDEX 00 00:00:00\n')
         c(fp.write,
           '    INDEX 01 %02d:%02d:%02d\n' % (minutes, seconds, sectors))
 

-    c(fp.close)
-

     return trackcount
 
 def tags_file(fn, trackcount, various, artist=None, album=None,
               release_dates={}, tracks=[]):
     fp = c(file, fn, 'w')
     return trackcount
 
 def tags_file(fn, trackcount, various, artist=None, album=None,
               release_dates={}, tracks=[]):
     fp = c(file, fn, 'w')

-    c(fp.write, 'ARTIST=')
+    if various:
+        c(fp.write, 'ALBUMARTIST=')
+    else:
+        c(fp.write, 'ARTIST=')

     if artist != None:
         c(fp.write, artist.encode('utf-8'))
     c(fp.write, '\nALBUM=')
     if artist != None:
         c(fp.write, artist.encode('utf-8'))
     c(fp.write, '\nALBUM=')


@@ -130,13 +151,12 @@ def tags_file(fn, trackcount, various, artist=None, album=None,
     if len(tracks) > 0:
         trackcount = min(trackcount, len(tracks))
     for i in xrange(1, trackcount + 1):
     if len(tracks) > 0:
         trackcount = min(trackcount, len(tracks))
     for i in xrange(1, trackcount + 1):

-        try:
+        artist = title = ''
+        if len(tracks) > 0:

             track = tracks.pop(0)
             title = track.title
             track = tracks.pop(0)
             title = track.title

-            artist = track.artist
-        except IndexError:
-            title = ''
-            artist = ''
+            if track.artist:
+                artist = track.artist.name

         various and c(fp.write, 'ARTIST[%d]=%s\n' % (i,
                                                      artist.encode('utf-8')))
         c(fp.write, 'TITLE[%d]=%s\n' % (i, title.encode('utf-8')))
         various and c(fp.write, 'ARTIST[%d]=%s\n' % (i,
                                                      artist.encode('utf-8')))
         c(fp.write, 'TITLE[%d]=%s\n' % (i, title.encode('utf-8')))


@@ -149,29 +169,36 @@ def cover_art(i, asin):
     fp.write(urllib.urlopen(url).read())
     fp.close()
 
     fp.write(urllib.urlopen(url).read())
     fp.close()
 

-def tags(q, releases, trackcount):
+def tags(releases, trackcount):

     results = []
     results = []

+    seen_asins = set()

     seen_various = False
 
     tags_file('candidate-tags-0', trackcount, False)
 
     seen_various = False
 
     tags_file('candidate-tags-0', trackcount, False)
 

-    include = musicbrainz2.webservice.ReleaseIncludes(tracks=True)
-

     i = 0
     i = 0

-    for album in releases:
+    for release in releases:

         i += 1
         i += 1

-        various = not album.release.isSingleArtistRelease()
+        various = not release.isSingleArtistRelease()

 
         if various and not seen_various:
             seen_various = True
 
         if various and not seen_various:
             seen_various = True

-            tags_file('candidate-tags-0v', trackcount, True)
+            tags_file('candidate-tags-0v', trackcount, various)

 
         tags_file('candidate-tags-' + str(i), trackcount, various,
 
         tags_file('candidate-tags-' + str(i), trackcount, various,

-                  album.release.artist.name, album.release.title,
-                  album.release.getReleaseEventsAsDict(),
-                  q.getReleaseById(album.release.id, include).tracks)
-
-        cover_art(str(i), album.release.asin)
+                  release.artist.name, release.title,
+                  release.getReleaseEventsAsDict(),
+                  release.tracks)
+        if release.asin:
+            # See also:
+            # for i in release.getRelations(): print i.type
+            # http://musicbrainz.org/ns/rel-1.0#Wikipedia
+            # ...
+            # http://musicbrainz.org/ns/rel-1.0#AmazonAsin
+            asin = release.asin
+            if asin not in seen_asins:
+                seen_asins.add(asin)
+                cover_art(str(i), asin)

 
 def rip(device, trackcount, single_file):
     if device == None:
 
 def rip(device, trackcount, single_file):
     if device == None:


@@ -195,18 +222,40 @@ def make_post_processor(command):
     c(fp.write, command +' "$@"\n')
     c(fp.close)
 
     c(fp.write, command +' "$@"\n')
     c(fp.close)
 

-def releases_by_disc(q, disc):
-    filter = musicbrainz2.webservice.ReleaseFilter(discId=disc.getId())
-    return q.getReleases(filter)
+def get_releases(filter_, tries=5):
+    sleep = 1
+    query = musicbrainz2.webservice.Query()
+    while True:
+        try:
+            return query.getReleases(filter_)
+        except musicbrainz2.webservice.WebServiceError, e:
+            if '503' not in e.msg:
+                raise
+            tries -= 1
+            sys.stderr.write('getReleases: %s: ' % e)
+            if tries == 0:
+                sys.stderr.write('giving up\n')
+                raise
+            sleep *= 2
+            sys.stderr.write('sleeping %ds before retry...\n' % sleep)
+            time.sleep(sleep)
+
+def releases_by_disc(disc_id):
+    try:
+        musicbrainzngs.musicbrainz.get_releases_by_discid(disc_id)
+    except musicbrainzngs.musicbrainz.ResponseError:
+        return []
+    raise 'what now'

 
 def releases_by(q, title, artist=None):
 
 def releases_by(q, title, artist=None):

-    r = q.getReleases(musicbrainz2.webservice.ReleaseFilter(title=title))
-    if artist == None:
-        return r
-
-    artist = re.sub(r'\s+', r'\s+', artist.strip())
-    return [x for x in r if re.match(artist, x.release.artist.name,
-                                     re.IGNORECASE) != None]
+    filter_ = musicbrainz2.webservice.ReleaseFilter(title=title)
+    results = get_releases(filter_)
+    releases = (result.release for result in results)
+    if artist:
+        pattern = re.sub(r'\s+', r'\s+', artist.strip())
+        releases = (x for x in releases
+                    if re.match(pattern, x.artist.name, re.IGNORECASE))
+    return releases

 
 def main(argv):
     # Control the exit code for any uncaught exceptions.
 
 def main(argv):
     # Control the exit code for any uncaught exceptions.


@@ -214,7 +263,9 @@ def main(argv):
         parser = OptionParser()
         parser.disable_interspersed_args()
         parser.add_option('--artist')
         parser = OptionParser()
         parser.disable_interspersed_args()
         parser.add_option('--artist')

+        parser.add_option('--discid')

         parser.add_option('--title')
         parser.add_option('--title')

+        parser.add_option('--print-discid', action='store_true', default=False)

         parser.add_option('-d', '--device')
         parser.add_option('-m', '--no-musicbrainz',
                           action='store_true', default=False)
         parser.add_option('-d', '--device')
         parser.add_option('-m', '--no-musicbrainz',
                           action='store_true', default=False)


@@ -246,20 +297,23 @@ def main(argv):
 
         make_post_processor(options.post_processor)
 
 
         make_post_processor(options.post_processor)
 

-        q = musicbrainz2.webservice.Query()

         if options.title != None:
         if options.title != None:

-            releases = releases_by(q, options.title, options.artist)
+            tags(releases_by(q, options.title, options.artist), trackcount)
+        elif options.discid != None:
+            tags(releases_by_disc(options.discid), trackcount)

         else:
         else:

-            disc = musicbrainz2.disc.readDisc(device)
-            trackcount = mkcue(disc, trackcount)
+            disc = discid.disc.read(device)
+            if options.print_discid:
+                print disc.id
+                return 0
+            fp = c(file, 'cue', 'w')
+            trackcount = mkcue(fp, disc, trackcount)
+            c(fp.close)

             if options.no_musicbrainz:
                 releases = []
             else:
             if options.no_musicbrainz:
                 releases = []
             else:

-                releases = releases_by_disc(q, disc)
-
-        tags(q, releases, trackcount)
-
-        if options.title == None:
+                releases = releases_by_disc(disc.id)
+            tags(releases, trackcount)

             rip(device, trackcount, options.single_file)
     except Exception, error:
         if isinstance(error, SystemExit):
             rip(device, trackcount, options.single_file)
     except Exception, error:
         if isinstance(error, SystemExit):