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

Refactor return type for method

Browse Source
This commit is contained in:
Kovid Goyal 2018-04-19 07:56:06 +05:30
parent fa00093b21
commit 3462cd4653
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/toc/main.py
View File

@ -610,8 +610,9 @@ class TreeWidget(QTreeWidget): # {{{
from calibre.gui2.tweak_book.file_list import get_bulk_rename_settings from calibre.gui2.tweak_book.file_list import get_bulk_rename_settings
sort_map = {item:i for i, item in enumerate(self.iteritems())} sort_map = {item:i for i, item in enumerate(self.iteritems())}
items = sorted(self.selectedItems(), key=lambda x:sort_map.get(x, -1)) items = sorted(self.selectedItems(), key=lambda x:sort_map.get(x, -1))
fmt, num = get_bulk_rename_settings(self, len(items), prefix=_('Chapter '), msg=_( settings = get_bulk_rename_settings(self, len(items), prefix=_('Chapter '), msg=_(
'All selected items will be renamed to the form prefix-number'), sanitize=lambda x:x, leading_zeros=False) 'All selected items will be renamed to the form prefix-number'), sanitize=lambda x:x, leading_zeros=False)
fmt, num = settings['prefix'], settings['start']
if fmt is not None and num is not None: if fmt is not None and num is not None:
self.push_history() self.push_history()
for i, item in enumerate(items): for i, item in enumerate(items):

9
src/calibre/gui2/tweak_book/file_list.py
View File

@ -90,6 +90,7 @@ def get_bulk_rename_settings(parent, number, msg=None, sanitize=sanitize_file_na
d.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) d.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
bb.accepted.connect(d.accept), bb.rejected.connect(d.reject) bb.accepted.connect(d.accept), bb.rejected.connect(d.reject)
l.addRow(bb) l.addRow(bb)
ans = {'prefix': None, 'start': None}
if d.exec_() == d.Accepted: if d.exec_() == d.Accepted:
prefix = sanitize(unicode(d.prefix.text())) prefix = sanitize(unicode(d.prefix.text()))
@ -100,8 +101,9 @@ def get_bulk_rename_settings(parent, number, msg=None, sanitize=sanitize_file_na
if leading_zeros: if leading_zeros:
largest = num + number - 1 largest = num + number - 1
fmt = '%0{0}d'.format(len(str(largest))) fmt = '%0{0}d'.format(len(str(largest)))
return prefix + fmt, num ans['prefix'] = prefix + fmt
return None, None ans['start'] = num
return ans
# }}} # }}}
@ -589,7 +591,8 @@ class FileList(QTreeWidget):
names = self.request_rename_common() names = self.request_rename_common()
if names is not None: if names is not None:
categories = Counter(unicode(item.data(0, CATEGORY_ROLE) or '') for item in self.selectedItems()) categories = Counter(unicode(item.data(0, CATEGORY_ROLE) or '') for item in self.selectedItems())
fmt, num = get_bulk_rename_settings(self, len(names), category=categories.most_common(1)[0][0]) settings = get_bulk_rename_settings(self, len(names), category=categories.most_common(1)[0][0])
fmt, num = settings['prefix'], settings['start']
if fmt is not None: if fmt is not None:
def change_name(name, num): def change_name(name, num):
parts = name.split('/') parts = name.split('/')