USBMS: Use filename_callback on the filename with template and tags.

This commit is contained in:
John Schember 2010-01-01 20:30:42 -05:00
parent c007eb5000
commit 081bb9b3ba

View File

@ -870,7 +870,7 @@ class Device(DeviceConfig, DevicePlugin):
if special_tag is None: if special_tag is None:
from calibre.library.save_to_disk import get_components from calibre.library.save_to_disk import get_components
extra_components = get_components(template, mdata, fname) extra_components = get_components(template, mdata, fname)
extra_components[-1] += ext extra_components[-1] = extra_components[-1] = sanitize(self.filename_callback(extra_components[-1]+ext, mdata)))
else: else:
tag = special_tag tag = special_tag
if tag.startswith(_('News')): if tag.startswith(_('News')):
@ -884,7 +884,7 @@ class Device(DeviceConfig, DevicePlugin):
c = sanitize(c) c = sanitize(c)
if not c: continue if not c: continue
extra_components.append(c) extra_components.append(c)
extra_componets.append(fname) extra_componets.append(sanitize(self.filename_callback(fname, mdata)))
if not use_subdirs: if not use_subdirs:
extra_components = extra_components[:1] extra_components = extra_components[:1]