benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* morituri/program/cdparanoia.py:

Browse Source 
Make sure exceptions don't prevent the task from chaining up
	  to the parent stop() implementation, giving the runner a chance
	  to actually stop.
This commit is contained in:
Thomas Vander Stichele
2011-08-07 17:57:24 +00:00
parent 3093d50986
commit a8dddb9d70
2 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2011-08-07 Thomas Vander Stichele <thomas at apestaart dot org>
* morituri/program/cdparanoia.py:
Make sure exceptions don't prevent the task from chaining up
to the parent stop() implementation, giving the runner a chance
to actually stop.
2011-08-06 Thomas Vander Stichele <thomas at apestaart dot org>
* morituri/rip/debug.py:

57
morituri/program/cdparanoia.py
View File

@@ -447,33 +447,38 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
self.file_mode = 0666 - umask
def stop(self):
if not self.exception:
self.quality = max(self.tasks[0].quality, self.tasks[2].quality)
self.peak = self.tasks[4].peak
self.debug('peak: %r', self.peak)
# FIXME: maybe this kind of try-wrapping to make sure
# we chain up should be handled by a parent class function ?
try:
if not self.exception:
self.quality = max(self.tasks[0].quality, self.tasks[2].quality)
self.peak = self.tasks[4].peak
self.debug('peak: %r', self.peak)
self.testchecksum = c1 = self.tasks[1].checksum
self.copychecksum = c2 = self.tasks[3].checksum
if c1 == c2:
self.info('Checksums match, %08x' % c1)
self.checksum = self.testchecksum
self.testchecksum = c1 = self.tasks[1].checksum
self.copychecksum = c2 = self.tasks[3].checksum
if c1 == c2:
self.info('Checksums match, %08x' % c1)
self.checksum = self.testchecksum
else:
# FIXME: detect this before encoding
self.error('read and verify failed')
if self.tasks[5].checksum != self.checksum:
self.error('Encoding failed, checksum does not match')
# delete the unencoded file
os.unlink(self._tmpwavpath)
os.chmod(self._tmppath, self.file_mode)
try:
shutil.move(self._tmppath, self.path)
except Exception, e:
self._exception = e
else:
# FIXME: detect this before encoding
self.error('read and verify failed')
if self.tasks[5].checksum != self.checksum:
self.error('Encoding failed, checksum does not match')
# delete the unencoded file
os.unlink(self._tmpwavpath)
os.chmod(self._tmppath, self.file_mode)
try:
shutil.move(self._tmppath, self.path)
except Exception, e:
self._exception = e
else:
self.debug('stop: exception %r', self.exception)
self.debug('stop: exception %r', self.exception)
except Exception, e:
print 'WARNING: unhandled exception %r' % (e, )
task.MultiSeparateTask.stop(self)