* morituri/common/task.py:
add task argument to TaskRunner.schedule so we can get exceptions. Add .schedule method to Task to pass self. * morituri/common/checksum.py: * morituri/common/encode.py: * morituri/common/gstreamer.py: * morituri/program/cdparanoia.py: * morituri/program/cdrdao.py: Adapt.
This commit is contained in:
@@ -274,7 +274,7 @@ class ReadTrackTask(task.Task):
|
||||
|
||||
raise
|
||||
|
||||
self.runner.schedule(1.0, self._read, runner)
|
||||
self.schedule(1.0, self._read, runner)
|
||||
|
||||
def _read(self, runner):
|
||||
ret = self._popen.recv_err()
|
||||
@@ -282,7 +282,7 @@ class ReadTrackTask(task.Task):
|
||||
if self._popen.poll() is not None:
|
||||
self._done()
|
||||
return
|
||||
self.runner.schedule(0.01, self._read, runner)
|
||||
self.schedule(0.01, self._read, runner)
|
||||
return
|
||||
|
||||
self._buffer += ret
|
||||
@@ -315,11 +315,11 @@ class ReadTrackTask(task.Task):
|
||||
|
||||
# 0 does not give us output before we complete, 1.0 gives us output
|
||||
# too late
|
||||
self.runner.schedule(0.01, self._read, runner)
|
||||
self.schedule(0.01, self._read, runner)
|
||||
|
||||
def _poll(self, runner):
|
||||
if self._popen.poll() is None:
|
||||
self.runner.schedule(1.0, self._poll, runner)
|
||||
self.schedule(1.0, self._poll, runner)
|
||||
return
|
||||
|
||||
self._done()
|
||||
|
||||
@@ -270,7 +270,7 @@ class CDRDAOTask(task.Task):
|
||||
self._popen.pid, self.options)
|
||||
self.debug('command: cdrdao %s', ' '.join(self.options))
|
||||
|
||||
self.runner.schedule(1.0, self._read, runner)
|
||||
self.schedule(1.0, self._read, runner)
|
||||
|
||||
def _read(self, runner):
|
||||
try:
|
||||
@@ -288,7 +288,7 @@ class CDRDAOTask(task.Task):
|
||||
|
||||
if self._popen.poll() is None and self.runner:
|
||||
# not finished yet
|
||||
self.runner.schedule(1.0, self._read, runner)
|
||||
self.schedule(1.0, self._read, runner)
|
||||
return
|
||||
|
||||
self._done()
|
||||
|
||||
Reference in New Issue
Block a user