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

USBMS: Use default send template when device specific one is not present.

Browse Source
This commit is contained in:
John Schember 2010-01-07 07:21:18 -05:00
parent 431a39137e
commit 4b3059e979
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/usbms/device.py
View File

@ -805,7 +805,7 @@ class Device(DeviceConfig, DevicePlugin):
break break
settings = self.settings() settings = self.settings()
template = settings.save_template template = self.save_template()
use_subdirs = self.SUPPORTS_SUB_DIRS and settings.use_subdirs use_subdirs = self.SUPPORTS_SUB_DIRS and settings.use_subdirs
fname = sanitize(fname) fname = sanitize(fname)

10
src/calibre/devices/usbms/deviceconfig.py
View File

@ -64,12 +64,20 @@ class DeviceConfig(object):
ec = None ec = None
proxy['extra_customization'] = ec proxy['extra_customization'] = ec
st = unicode(config_widget.opt_save_template.text()) st = unicode(config_widget.opt_save_template.text())
proxy['save_template'] = st if st else cls._default_save_template() proxy['save_template'] = st
@classmethod @classmethod
def settings(cls): def settings(cls):
return cls._config().parse() return cls._config().parse()
@classmethod
def save_template(cls):
st = cls.settings().save_template
if st:
return st
else:
return cls._default_save_template()
@classmethod @classmethod
def customization_help(cls, gui=False): def customization_help(cls, gui=False):
return cls.HELP_MESSAGE return cls.HELP_MESSAGE