From b08357010ec46dccf0871c92ac735a04eca524be Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 4 Feb 2013 00:14:40 +0100 Subject: [PATCH] store catalog number and barcode in discmetadata --- morituri/common/musicbrainzngs.py | 10 +++++++++- morituri/rip/debug.py | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/morituri/common/musicbrainzngs.py b/morituri/common/musicbrainzngs.py index 8637c40..9a0ecfa 100644 --- a/morituri/common/musicbrainzngs.py +++ b/morituri/common/musicbrainzngs.py @@ -75,6 +75,9 @@ class DiscMetadata(object): mbidArtist = None url = None + catalogNumber = None + barcode = None + def __init__(self): self.tracks = [] @@ -141,6 +144,10 @@ def _getMetadata(releaseShort, release, discid): metadata.mbidArtist = artist['id'] metadata.url = 'http://musicbrainz.org/release/' + release['id'] + metadata.barcode = release.get('barcode', None) + lil = release.get('label-info-list', [{}]) + if lil: + metadata.catalogNumber = lil[0].get('catalog-number') tainted = False duration = 0 @@ -258,7 +265,8 @@ def musicbrainz(discid, record=False): # artist-credits res = musicbrainz.get_release_by_id(release['id'], - includes=["artists", "artist-credits", "recordings", "discids"]) + includes=["artists", "artist-credits", "recordings", "discids", + "labels"]) _record(record, 'release', release['id'], res) releaseDetail = res['release'] formatted = json.dumps(releaseDetail, sort_keys=False, indent=4) diff --git a/morituri/rip/debug.py b/morituri/rip/debug.py index 6614f55..5bb6a68 100644 --- a/morituri/rip/debug.py +++ b/morituri/rip/debug.py @@ -204,6 +204,11 @@ Example disc id: KnpGsLhvH.lPrNc1PBL21lb9Bg4-""" self.stdout.write(' Type: %s\n' % md.releaseType.encode('utf-8')) self.stdout.write(' URL: %s\n' % md.url) self.stdout.write(' Tracks: %d\n' % len(md.tracks)) + if md.catalogNumber: + self.stdout.write(' Cat no: %s\n' % md.catalogNumber) + if md.barcode: + self.stdout.write(' Barcode: %s\n' % md.barcode) + for j, track in enumerate(md.tracks): self.stdout.write(' Track %2d: %s - %s\n' % ( j + 1, track.artist.encode('utf-8'),