MTP driver: Change the default template to not create subfolders as apparently Amazon are even more incompetent than I thought.

This commit is contained in:
Kovid Goyal 2012-09-16 09:30:25 +05:30
parent 433f620b05
commit 2112ee3e17

View File

@ -45,13 +45,12 @@ class MTP_DEVICE(BASE):
@property @property
def prefs(self): def prefs(self):
if self._prefs is None: if self._prefs is None:
from calibre.library.save_to_disk import config
self._prefs = p = JSONConfig('mtp_devices') self._prefs = p = JSONConfig('mtp_devices')
p.defaults['format_map'] = self.FORMATS p.defaults['format_map'] = self.FORMATS
p.defaults['send_to'] = ['Calibre_Companion', 'Books', p.defaults['send_to'] = ['Calibre_Companion', 'Books',
'eBooks/import', 'eBooks', 'wordplayer/calibretransfer', 'eBooks/import', 'eBooks', 'wordplayer/calibretransfer',
'sdcard/ebooks', 'kindle'] 'sdcard/ebooks', 'kindle']
p.defaults['send_template'] = config().parse().send_template p.defaults['send_template'] = '{title} - {authors}'
p.defaults['blacklist'] = [] p.defaults['blacklist'] = []
p.defaults['history'] = {} p.defaults['history'] = {}
p.defaults['rules'] = [] p.defaults['rules'] = []
@ -291,7 +290,7 @@ class MTP_DEVICE(BASE):
prefix_path=path, prefix_path=path,
path_type=posixpath, path_type=posixpath,
maxlen=self.MAX_PATH_LEN, maxlen=self.MAX_PATH_LEN,
use_subdirs=True, use_subdirs='/' in self.save_template,
news_in_folder=self.NEWS_IN_FOLDER, news_in_folder=self.NEWS_IN_FOLDER,
) )
return tuple(x for x in filepath.split('/')) return tuple(x for x in filepath.split('/'))