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

/browse: Respect custom field tweaks

Browse Source
This commit is contained in:
Kovid Goyal 2010-10-16 08:06:22 -06:00
commit ee287f65ce
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/library/server/browse.py
View File

@ -17,6 +17,7 @@ from calibre.utils.ordered_dict import OrderedDict
from calibre.utils.filenames import ascii_filename from calibre.utils.filenames import ascii_filename
from calibre.utils.config import prefs from calibre.utils.config import prefs
from calibre.library.comments import comments_to_html from calibre.library.comments import comments_to_html
from calibre.library.server import custom_fields_to_display
def render_book_list(ids, suffix=''): # {{{ def render_book_list(ids, suffix=''): # {{{
pages = [] pages = []
@ -266,6 +267,7 @@ class BrowseServer(object):
def getter(x): def getter(x):
return category_meta[x]['name'].lower() return category_meta[x]['name'].lower()
displayed_custom_fields = custom_fields_to_display(self.db)
for category in sorted(categories, for category in sorted(categories,
cmp=lambda x,y: cmp(getter(x), getter(y))): cmp=lambda x,y: cmp(getter(x), getter(y))):
if len(categories[category]) == 0: if len(categories[category]) == 0:
@ -275,6 +277,8 @@ class BrowseServer(object):
meta = category_meta.get(category, None) meta = category_meta.get(category, None)
if meta is None: if meta is None:
continue continue
if meta['is_custom'] and category not in displayed_custom_fields:
continue
cats.append((meta['name'], category)) cats.append((meta['name'], category))
cats = ['<li title="{2} {0}">{0}<span>/browse/category/{1}</span></li>'\ cats = ['<li title="{2} {0}">{0}<span>/browse/category/{1}</span></li>'\
.format(xml(x, True), xml(quote(y)), xml(_('Browse books by'))) .format(xml(x, True), xml(quote(y)), xml(_('Browse books by')))
@ -556,8 +560,11 @@ class BrowseServer(object):
ofmts = ', '.join(ofmts) ofmts = ', '.join(ofmts)
args['formats'] = ofmts args['formats'] = ofmts
fields, comments = [], [] fields, comments = [], []
displayed_custom_fields = custom_fields_to_display(self.db)
for field, m in list(mi.get_all_standard_metadata(False).items()) + \ for field, m in list(mi.get_all_standard_metadata(False).items()) + \
list(mi.get_all_user_metadata(False).items()): list(mi.get_all_user_metadata(False).items()):
if m['is_custom'] and field not in displayed_custom_fields:
continue
if m['datatype'] == 'comments' or field == 'comments': if m['datatype'] == 'comments' or field == 'comments':
comments.append((m['name'], comments_to_html(mi.get(field, comments.append((m['name'], comments_to_html(mi.get(field,
'')))) ''))))