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

Only start emailer thread on demand

Browse Source
This commit is contained in:
Kovid Goyal 2011-02-22 20:17:57 -07:00
parent dee216e6bb
commit 6460f08b7f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/email.py
View File

@ -209,7 +209,6 @@ class EmailMixin(object): # {{{
def __init__(self): def __init__(self):
self.emailer = Emailer(self.job_manager) self.emailer = Emailer(self.job_manager)
self.emailer.start()
def send_by_mail(self, to, fmts, delete_from_library, send_ids=None, def send_by_mail(self, to, fmts, delete_from_library, send_ids=None,
do_auto_convert=True, specific_format=None): do_auto_convert=True, specific_format=None):
@ -255,6 +254,8 @@ class EmailMixin(object): # {{{
to_s = list(repeat(to, len(attachments))) to_s = list(repeat(to, len(attachments)))
if attachments: if attachments:
if not self.emailer.is_alive():
self.emailer.start()
self.emailer.send_mails(jobnames, self.emailer.send_mails(jobnames,
Dispatcher(partial(self.email_sent, remove=remove)), Dispatcher(partial(self.email_sent, remove=remove)),
attachments, to_s, subjects, texts, attachment_names) attachments, to_s, subjects, texts, attachment_names)
@ -325,6 +326,8 @@ class EmailMixin(object): # {{{
files, auto = self.library_view.model().\ files, auto = self.library_view.model().\
get_preferred_formats_from_ids([id_], fmts) get_preferred_formats_from_ids([id_], fmts)
return files return files
if not self.emailer.is_alive():
self.emailer.start()
sent_mails = self.emailer.email_news(mi, remove, sent_mails = self.emailer.email_news(mi, remove,
get_fmts, self.email_sent) get_fmts, self.email_sent)
if sent_mails: if sent_mails:

3
src/calibre/gui2/ui.py
View File

@ -633,7 +633,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
mb.stop() mb.stop()
self.hide_windows() self.hide_windows()
self.emailer.stop() if self.emailer.is_alive():
self.emailer.stop()
try: try:
try: try:
if self.content_server is not None: if self.content_server is not None: