Changeset 438

Timestamp:

19-05-11 02:28:36 (2 years ago)

Author:

thomas

Message:

• morituri/program/cdparanoia.py:
• morituri/common/encode.py:
• morituri/common/program.py:
• morituri/rip/cd.py: Add action and what args to describe task better.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• morituri/common/encode.py (modified) (5 diffs)
• morituri/common/program.py (modified) (3 diffs)
• morituri/program/cdparanoia.py (modified) (7 diffs)
• morituri/rip/cd.py (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * morituri/program/cdparanoia.py:
+        * morituri/common/encode.py:
+        * morituri/common/program.py:
+        * morituri/rip/cd.py:
+          Add action and what args to describe task better.
+
 2011-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/morituri/common/encode.py

@@ -138 +138 @@
     peak = None
 
-    def __init__(self, inpath, outpath, profile, taglist=None):
+    def __init__(self, inpath, outpath, profile, taglist=None, what="track"):
         """
         @param profile: encoding profile
@@ -155 +155 @@
         self._profile = profile
 
+        self.description = "Encoding %s" % what
         self._profile.test()
 
@@ -163 +164 @@
         import gst
 
-        self._pipeline = gst.parse_launch('''
+        desc = '''
             filesrc location="%s" !
             decodebin name=decoder !
@@ -172 +173 @@
                 common.quoteParse(self._inpath).encode('utf-8'),
                 self._profile.pipeline,
-                common.quoteParse(self._outpath).encode('utf-8')))
+                common.quoteParse(self._outpath).encode('utf-8'))
+
+        self.debug('creating pipeline: %r', desc)
+        self._pipeline = gst.parse_launch(desc)
 
         tagger = self._pipeline.get_by_name('tagger')
@@ -273 +277 @@
         self._pipeline.set_state(gst.STATE_NULL)
         self.debug('set state to NULL')
+        # FIXME: maybe this should move lower ? If used by BaseMultiTask,
+        # this starts the next task without showing us the peakdB
         task.Task.stop(self)
 

trunk/morituri/common/program.py

@@ -462 +462 @@
         return trackResult.testcrc == t.checksum
 
-    def ripTrack(self, runner, trackResult, offset, device, profile, taglist):
+    def ripTrack(self, runner, trackResult, offset, device, profile, taglist,
+        what=None):
         """
         @param trackResult: the object to store information in.
@@ -479 +480 @@
             os.makedirs(dirname)
 
+        if not what:
+            what='track %d' % (trackResult.number, )
+
         t = cdparanoia.ReadVerifyTrackTask(trackResult.filename,
             self.result.table, start, stop,
@@ -484 +488 @@
             device=device,
             profile=profile,
-            taglist=taglist)
-        t.description = 'Reading Track %d' % trackResult.number 
+            taglist=taglist,
+            what=what)
 
         runner.run(t)

trunk/morituri/program/cdparanoia.py

@@ -188 +188 @@
     """
 
-    description = "Reading Track"
+    description = "Reading track"
     quality = None # set at end of reading
 
     _MAXERROR = 100 # number of errors detected by parser
 
-    def __init__(self, path, table, start, stop, offset=0, device=None):
+    def __init__(self, path, table, start, stop, offset=0, device=None,
+        action="Reading", what="track"):
         """
         Read the given track.
@@ -209 +210 @@
         @param device: the device to rip from
         @type  device: str
+        @param action: a string representing the action; e.g. Read/Verify
+        @type  action: str
+        @param what:   a string representing what's being read; e.g. Track
+        @type  what:   str
         """
         assert type(path) is unicode, "%r is not unicode" % path
@@ -222 +227 @@
         self._buffer = "" # accumulate characters
         self._errors = []
+        self.description = "%s %s" % (action, what)
 
     def start(self, runner):
@@ -372 +378 @@
 
     def __init__(self, path, table, start, stop, offset=0, device=None,
-                 profile=None, taglist=None):
+                 profile=None, taglist=None, what="track"):
         """
         @param path:    where to store the ripped track
@@ -393 +399 @@
         task.MultiSeparateTask.__init__(self)
 
+        self.debug('Creating read and verify task on %r', path)
         self.path = path
 
@@ -409 +416 @@
         self.tasks.append(
             ReadTrackTask(tmppath, table, start, stop,
-                offset=offset, device=device))
+                offset=offset, device=device, what=what))
         self.tasks.append(checksum.CRC32Task(tmppath))
         t = ReadTrackTask(tmppath, table, start, stop,
-            offset=offset, device=device)
-        t.description = 'Verifying track...'
+            offset=offset, device=device, action="Verifying", what=what)
         self.tasks.append(t)
         self.tasks.append(checksum.CRC32Task(tmppath))
@@ -427 +433 @@
 
         self.tasks.append(encode.EncodeTask(tmppath, tmpoutpath, profile,
-            taglist=taglist))
+            taglist=taglist, what=what))
         # make sure our encoding is accurate
         self.tasks.append(checksum.CRC32Task(tmpoutpath))

trunk/morituri/rip/cd.py

@@ -216 +216 @@
                     device=self.parentCommand.options.device,
                     profile=profile,
-                    taglist=prog.getTagList(number))
+                    taglist=prog.getTagList(number),
+                    what='track %d of %d' % (number, len(itable.tracks)))
 
                 if trackResult.testcrc == trackResult.copycrc: