Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix cleanup of device jobs on device yank

Browse Source
This commit is contained in:
Kovid Goyal 2010-05-25 09:15:04 -06:00
parent c0fbc32e4c
commit cdbfc91eff
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/gui2/device.py
View File

@ -37,6 +37,7 @@ class DeviceJob(BaseJob):
self.exception = None self.exception = None
self.job_manager = job_manager self.job_manager = job_manager
self._details = _('No details available.') self._details = _('No details available.')
self._aborted = False
def start_work(self): def start_work(self):
self.start_time = time.time() self.start_time = time.time()
@ -55,7 +56,11 @@ class DeviceJob(BaseJob):
self.start_work() self.start_work()
try: try:
self.result = self.func(*self.args, **self.kwargs) self.result = self.func(*self.args, **self.kwargs)
if self._aborted:
return
except (Exception, SystemExit), err: except (Exception, SystemExit), err:
if self._aborted:
return
self.failed = True self.failed = True
self._details = unicode(err) + '\n\n' + \ self._details = unicode(err) + '\n\n' + \
traceback.format_exc() traceback.format_exc()
@ -63,6 +68,12 @@ class DeviceJob(BaseJob):
finally: finally:
self.job_done() self.job_done()
def abort(self, err):
self._aborted = True
self.failed = True
self._details = unicode(err)
self.exception = err
@property @property
def log_file(self): def log_file(self):
return cStringIO.StringIO(self._details.encode('utf-8')) return cStringIO.StringIO(self._details.encode('utf-8'))