Changeset 561

Timestamp:

28-10-11 19:49:36 (20 months ago)

Author:

thomas

Message:

• morituri/rip/main.py:
• morituri/common/musicbrainzngs.py:
• morituri/common/program.py:
• morituri/rip/cd.py: Add -R option to rip to record API results for debugging.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• morituri/common/musicbrainzngs.py (modified) (5 diffs)
• morituri/common/program.py (modified) (2 diffs)
• morituri/rip/cd.py (modified) (1 diff)
• morituri/rip/main.py (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2011-10-28  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * morituri/rip/main.py:
+        * morituri/common/musicbrainzngs.py:
+        * morituri/common/program.py:
+        * morituri/rip/cd.py:
+          Add -R option to rip to record API results for debugging.
+
 2011-10-28  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/morituri/common/musicbrainzngs.py

@@ -72 +72 @@
     def __init__(self):
         self.tracks = []
+
+def _record(record, which, name, what):
+    # optionally record to disc as a JSON serialization
+    if record:
+        import json
+        filename = 'morituri.%s.%s.json' % (which, name)
+        handle = open(filename, 'w')
+        handle.write(json.dumps(what))
+        handle.close()
+        log.info('musicbrainzngs', 'Wrote %s %s to %s', which, name, filename)
 
 
@@ -176 +186 @@
 
 # see http://bugs.musicbrainz.org/browser/python-musicbrainz2/trunk/examples/ripper.py
-def musicbrainz(discid):
+def musicbrainz(discid, record=False):
     """
     Based on a MusicBrainz disc id, get a list of DiscMetadata objects
@@ -190 +200 @@
     from morituri.extern.musicbrainzngs import musicbrainz
 
-    results = []
+    ret = []
 
     try:
@@ -206 +216 @@
         return None
 
-    log.debug('musicbrainz', 'found %d releases for discid %r',
+    log.debug('musicbrainzngs', 'found %d releases for discid %r',
         len(result['disc']['release-list']),
         discid)
+    _record(record, 'releases', discid, result)
 
     # Display the returned results to the user.
-    ret = []
 
     for release in result['disc']['release-list']:
@@ -222 +232 @@
         res = musicbrainz.get_release_by_id(release['id'],
             includes=["artists", "artist-credits", "recordings", "discids"])
+        _record(record, 'release', release['id'], res)
         release = res['release']
 

trunk/morituri/common/program.py

@@ -53 +53 @@
     outdir = None
     result = None
+
+    def __init__(self, record=False):
+        """
+        @param record: whether to record results of API calls for playback.
+        """
+        self._record = record
 
     def _getTableCachePath(self):
@@ -225 +231 @@
         for _ in range(0, 4):
             try:
-                metadatas = musicbrainzngs.musicbrainz(mbdiscid)
+                metadatas = musicbrainzngs.musicbrainz(mbdiscid,
+                    record=self._record)
             except musicbrainzngs.NotFoundException, e:
                 break

trunk/morituri/rip/cd.py

@@ -111 +111 @@
 
     def do(self, args):
-        prog = program.Program()
+        prog = program.Program(record=self.getRootCommand().record)
         runner = task.SyncRunner()
 

trunk/morituri/rip/main.py

@@ -70 +70 @@
             configure.version, configure.revision)
 
+        self.parser.add_option('-R', '--record',
+                          action="store_true", dest="record",
+                          help="record API requests for playback")
         self.parser.add_option('-v', '--version',
                           action="store_true", dest="version",
@@ -80 +83 @@
             sys.exit(0)
 
+        self.record = options.record
+
     def parse(self, argv):
         log.debug("morituri", "rip %s" % " ".join(argv))