Changeset 449

Timestamp:

21-05-11 19:01:19 (2 years ago)

Author:

thomas

Message:

• morituri/common/checksum.py:
• morituri/image/image.py:
• morituri/test/test_common_checksum.py:
• morituri/common/gstreamer.py (added): Factor out GstException? and GstPipelineTask?.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• morituri/common/checksum.py (modified) (2 diffs)
• morituri/common/gstreamer.py (added)
• morituri/image/image.py (modified) (1 diff)
• morituri/test/test_common_checksum.py (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2011-05-21  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * morituri/common/checksum.py:
+        * morituri/image/image.py:
+        * morituri/test/test_common_checksum.py:
+        * morituri/common/gstreamer.py (added):
+          Factor out GstException and GstPipelineTask.
+
 2011-05-21  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/morituri/common/checksum.py

@@ -27 +27 @@
 import gst
 
-from morituri.common import common, task
+from morituri.common import common, task, gstreamer
 
 # checksums are not CRC's. a CRC is a specific type of checksum.
 
-# FIXME: probably this should move higher up the module hierarchy and
-# be used wider
-class GstException(Exception):
-    def __init__(self, gerror, debug):
-        self.args = (gerror, debug, )
-        self.gerror = gerror
-        self.debug = debug
-
-# FIXME: this should move up too; other tasks might have use for it.
-class GstPipelineTask(task.Task):
-    """
-    I am a base class for tasks that use a GStreamer pipeline.
-
-    I handle errors and raise them appropriately.
-    """
-    def start(self, runner):
-        task.Task.start(self, runner)
-        desc = self.getPipelineDesc()
-
-        self.debug('creating pipeline %r', desc)
-        self.pipeline = gst.parse_launch(desc)
-
-        self._bus = self.pipeline.get_bus()
-        gst.debug('got bus %r' % self._bus)
-
-        # a signal watch calls callbacks from an idle loop
-        # self._bus.add_signal_watch()
-
-        # sync emission triggers sync-message signals which calls callbacks
-        # from the thread that signals, but happens immediately
-        self._bus.enable_sync_message_emission()
-        self._bus.connect('sync-message::eos', self.bus_eos_cb)
-        self._bus.connect('sync-message::tag', self.bus_tag_cb)
-        self._bus.connect('sync-message::error', self.bus_error_cb)
-
-        self.parsed()
-
-        self.debug('pausing pipeline')
-        self.pipeline.set_state(gst.STATE_PAUSED)
-        self.pipeline.get_state()
-        self.debug('paused pipeline')
-
-        if not self.exception:
-            self.paused()
-        else:
-            raise self.exception
-
-    def getPipelineDesc(self):
-        raise NotImplementedError
-
-    def parsed(self):
-        """
-        Called after parsing the pipeline but before setting it to paused.
-        """
-        pass
-
-    def paused(self):
-        """
-        Called after pipeline is paused
-        """
-        pass
-
-    def bus_eos_cb(self, bus, message):
-        pass
-
-    def bus_tag_cb(self, bus, message):
-        pass
-
-    def bus_error_cb(self, bus, message):
-        exc = GstException(*message.parse_error())
-        self.setAndRaiseException(exc)
-        gst.debug('error, scheduling stop')
-        #self.runner.schedule(0, self.stop)
-
-
-class ChecksumTask(GstPipelineTask):
+
+class ChecksumTask(gstreamer.GstPipelineTask):
     """
     I am a task that calculates a checksum of the decoded audio data.
@@ -342 +268 @@
         return checksum
 
-class TRMTask(GstPipelineTask):
+class TRMTask(gstreamer.GstPipelineTask):
     """
     I calculate a MusicBrainz TRM fingerprint.

trunk/morituri/image/image.py

@@ -295 +295 @@
             index = track.indexes[1]
             add(index)
+
+class ImageJoinTask(task.Task):
+    """
+    I concatenate the decoded audio from all tracks into a single .wav
+    I can optionally offset the joint audio to compensate for a write offset.
+    """
+    
+    description = "Joining tracks"
+
+    def __init__(self, image, outfile):
+
+        self._image = image
+        cue = image.cue
+        self._tasks = []
+        self.lengths = {}
+
+        def add(index):
+            # here to avoid import gst eating our options
+            from morituri.common import encode
+
+            path = image.getRealPath(index.path)
+            assert type(path) is unicode, "%r is not unicode" % path
+            self.debug('schedule encode of %r', path)
+            root, ext = os.path.splitext(os.path.basename(path))
+            outpath = os.path.join(outdir, root + '.' + profile.extension)
+            self.debug('schedule encode to %r', outpath)
+            taskk = encode.EncodeTask(path, os.path.join(outdir,
+                root + '.' + profile.extension), profile)
+            self.addTask(taskk)
+
+        try:
+            htoa = cue.table.tracks[0].indexes[0]
+            self.debug('encoding htoa track')
+            add(htoa)
+        except (KeyError, IndexError):
+            self.debug('no htoa track')
+            pass
+
+        for trackIndex, track in enumerate(cue.table.tracks):
+            self.debug('encoding track %d', trackIndex + 1)
+            index = track.indexes[1]
+            add(index)

trunk/morituri/test/test_common_checksum.py

@@ -8 +8 @@
 gobject.threads_init()
 
-from morituri.common import task, checksum, log
+from morituri.common import task, checksum, log, gstreamer
 
 from morituri.test import common as tcommon
@@ -24 +24 @@
         e = self.assertRaises(task.TaskException, self.runner.run,
             checksumtask, verbose=False)
-        self.failUnless(isinstance(e.exception, checksum.GstException))
+        self.failUnless(isinstance(e.exception, gstreamer.GstException))
         os.unlink(path)
 
@@ -34 +34 @@
         e = self.assertRaises(task.TaskException, self.runner.run,
             checksumtask, verbose=False)
-        self.failUnless(isinstance(e.exception, checksum.GstException))
+        self.failUnless(isinstance(e.exception, gstreamer.GstException))
         os.unlink(path)