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

Sending by email: Asciiize filenames when sending to @pbsync.com as the service cant handle non-ascii filenames

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-08 19:42:55 +05:30
parent 414668fa71
commit 2f6ad90635
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,28 +6,33 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os, socket, time, textwrap import os
from functools import partial import socket
from threading import Thread import textwrap
from itertools import repeat import time
from collections import defaultdict from collections import defaultdict
from functools import partial
from itertools import repeat
from qt.core import ( from qt.core import (
Qt, QDialog, QGridLayout, QIcon, QListWidget, QDialogButtonBox, QDialog, QDialogButtonBox, QGridLayout, QIcon, QLabel, QLineEdit, QListWidget,
QListWidgetItem, QLabel, QLineEdit, QPushButton) QListWidgetItem, QPushButton, Qt
)
from threading import Thread
from calibre.utils.smtp import (compose_mail, sendmail, extract_email_address, from calibre.constants import preferred_encoding
config as email_config)
from calibre.customize.ui import available_input_formats, available_output_formats from calibre.customize.ui import available_input_formats, available_output_formats
from calibre.ebooks.metadata import authors_to_string from calibre.ebooks.metadata import authors_to_string
from calibre.constants import preferred_encoding from calibre.gui2 import Dispatcher, config, error_dialog, gprefs, warning_dialog
from calibre.gui2 import config, Dispatcher, warning_dialog, error_dialog, gprefs
from calibre.library.save_to_disk import get_components
from calibre.utils.config import tweaks, prefs
from calibre.utils.icu import primary_sort_key
from calibre.gui2.threaded_jobs import ThreadedJob from calibre.gui2.threaded_jobs import ThreadedJob
from polyglot.builtins import iteritems, itervalues from calibre.library.save_to_disk import get_components
from calibre.utils.config import prefs, tweaks
from calibre.utils.filenames import ascii_filename
from calibre.utils.icu import primary_sort_key
from calibre.utils.smtp import (
compose_mail, config as email_config, extract_email_address, sendmail
)
from polyglot.binary import from_hex_unicode from polyglot.binary import from_hex_unicode
from polyglot.builtins import iteritems, itervalues
class Worker(Thread): class Worker(Thread):
@ -144,6 +149,9 @@ def send_mails(jobnames, callback, attachments, to_s, subjects,
for name, attachment, to, subject, text, aname in zip(jobnames, for name, attachment, to, subject, text, aname in zip(jobnames,
attachments, to_s, subjects, texts, attachment_names): attachments, to_s, subjects, texts, attachment_names):
description = _('Email %(name)s to %(to)s') % dict(name=name, to=to) description = _('Email %(name)s to %(to)s') % dict(name=name, to=to)
if isinstance(to, str) and '@pbsync.com' in to:
# The pbsync service chokes on non-ascii filenames
aname = ascii_filename(aname)
job = ThreadedJob('email', description, gui_sendmail, (attachment, aname, to, job = ThreadedJob('email', description, gui_sendmail, (attachment, aname, to,
subject, text), {}, callback) subject, text), {}, callback)
job_manager.run_threaded_job(job) job_manager.run_threaded_job(job)
@ -476,6 +484,7 @@ class EmailMixin: # {{{
next_id=next_id) next_id=next_id)
except: except:
import traceback import traceback
# Probably the user deleted the files, in any case, failing # Probably the user deleted the files, in any case, failing
# to delete the book is not catastrophic # to delete the book is not catastrophic
traceback.print_exc() traceback.print_exc()