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

When calculating the recommended folder for files of a given type, if no such files already exist in the book, use the folder containing the OPF file rather than the root

Browse Source
This commit is contained in:
Kovid Goyal 2014-07-05 10:01:02 +05:30
parent 774c7603d0
commit 20bd464caa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/oeb/polish/replace.py
View File

@ -184,15 +184,21 @@ def mt_to_category(container, mt):
def get_recommended_folders(container, names): def get_recommended_folders(container, names):
''' Return the folders that are recommended for the given filenames. The ''' Return the folders that are recommended for the given filenames. The
recommendation is based on where the majority of files of the same type are recommendation is based on where the majority of files of the same type are
located in the container. ''' located in the container. If no files of a particular type are present, the
recommended folder is assumed to be the folder containing the OPF file. '''
from calibre.ebooks.oeb.polish.utils import guess_type from calibre.ebooks.oeb.polish.utils import guess_type
counts = defaultdict(Counter) counts = defaultdict(Counter)
for name, mt in container.mime_map.iteritems(): for name, mt in container.mime_map.iteritems():
folder = name.rpartition('/')[0] if '/' in name else '' folder = name.rpartition('/')[0] if '/' in name else ''
counts[mt_to_category(container, mt)][folder] += 1 counts[mt_to_category(container, mt)][folder] += 1
try:
opf_folder = counts['opf'].most_common(1)[0][0]
except KeyError:
opf_folder = ''
recommendations = {category:counter.most_common(1)[0][0] for category, counter in counts.iteritems()} recommendations = {category:counter.most_common(1)[0][0] for category, counter in counts.iteritems()}
return {n:recommendations.get(mt_to_category(container, guess_type(os.path.basename(n))), '') for n in names} return {n:recommendations.get(mt_to_category(container, guess_type(os.path.basename(n))), opf_folder) for n in names}
def rationalize_folders(container, folder_type_map): def rationalize_folders(container, folder_type_map):
all_names = set(container.mime_map) all_names = set(container.mime_map)