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

Make setting an incorrect compression quality value non-fatal by forcing incorrect values to the default.

Browse Source
This commit is contained in:
Charles Haley 2014-01-16 09:46:04 +01:00
parent 8add032da1
commit a4777f81e9
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/devices/smart_device_app/driver.py
View File

@ -208,6 +208,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
THUMBNAIL_HEIGHT = 160 THUMBNAIL_HEIGHT = 160
DEFAULT_THUMBNAIL_HEIGHT = 160 DEFAULT_THUMBNAIL_HEIGHT = 160
THUMBNAIL_COMPRESSION_QUALITY = 75 THUMBNAIL_COMPRESSION_QUALITY = 75
DEFAULT_THUMBNAIL_COMPRESSION_QUALITY = 75
PREFIX = '' PREFIX = ''
BACKLOADING_ERROR_MESSAGE = None BACKLOADING_ERROR_MESSAGE = None
@ -680,6 +681,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
return self.OPT_PORT_NUMBER return self.OPT_PORT_NUMBER
elif opt_string == 'force_ip_address': elif opt_string == 'force_ip_address':
return self.OPT_FORCE_IP_ADDRESS return self.OPT_FORCE_IP_ADDRESS
elif opt_string == 'thumbnail_compression_quality':
return self.OPT_COMPRESSION_QUALITY
else: else:
return None return None
@ -1463,6 +1466,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
self.connection_attempts = {} self.connection_attempts = {}
self.client_wants_uuid_file_names = False self.client_wants_uuid_file_names = False
message = None
compression_quality_ok = True compression_quality_ok = True
try: try:
cq = int(self.settings().extra_customization[self.OPT_COMPRESSION_QUALITY]) cq = int(self.settings().extra_customization[self.OPT_COMPRESSION_QUALITY])
@ -1474,11 +1478,12 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
compression_quality_ok = False compression_quality_ok = False
if not compression_quality_ok: if not compression_quality_ok:
self.THUMBNAIL_COMPRESSION_QUALITY = 70 self.THUMBNAIL_COMPRESSION_QUALITY = 70
message = 'Bad compression quality setting. It must be a number between 50 and 99' message = _('Bad compression quality setting. It must be a number '
'between 50 and 99. Forced to be %d.')%self.DEFAULT_THUMBNAIL_COMPRESSION_QUALITY
self._debug(message) self._debug(message)
return message self.set_option('thumbnail_compression_quality',
str(self.DEFAULT_THUMBNAIL_COMPRESSION_QUALITY))
message = None
try: try:
self.listen_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.listen_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
set_socket_inherit(self.listen_socket, False) set_socket_inherit(self.listen_socket, False)
@ -1541,7 +1546,6 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
# Now try to open a UDP socket to receive broadcasts on # Now try to open a UDP socket to receive broadcasts on
message = None
try: try:
self.broadcast_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.broadcast_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
except: except:

2
src/calibre/gui2/dialogs/smartdevice.py
View File

@ -143,7 +143,7 @@ class SmartdeviceDialog(QDialog, Ui_Dialog):
if not self.device_manager.is_running('smartdevice'): if not self.device_manager.is_running('smartdevice'):
error_dialog(self, _('Problem starting the wireless device'), error_dialog(self, _('Problem starting the wireless device'),
_('The wireless device driver did not start. It said "%s"')%message, _('The wireless device driver had problems starting. It said "%s"')%message,
show=True) show=True)
self.device_manager.set_option('smartdevice', 'use_fixed_port', self.device_manager.set_option('smartdevice', 'use_fixed_port',
self.orig_fixed_port) self.orig_fixed_port)

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

@ -432,7 +432,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
if message: if message:
if not self.device_manager.is_running('Wireless Devices'): if not self.device_manager.is_running('Wireless Devices'):
error_dialog(self, _('Problem starting the wireless device'), error_dialog(self, _('Problem starting the wireless device'),
_('The wireless device driver did not start. ' _('The wireless device driver had problems starting. '
'It said "%s"')%message, show=True) 'It said "%s"')%message, show=True)
self.iactions['Connect Share'].set_smartdevice_action_state() self.iactions['Connect Share'].set_smartdevice_action_state()