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

Also implement vertical categories in the content server book details page

Browse Source
This commit is contained in:
Kovid Goyal 2022-09-18 10:16:03 +05:30
parent a593ce0efc
commit bf4bfa6e70
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/srv/code.py
View File

@ -208,6 +208,7 @@ def get_library_init_data(ctx, rd, db, num, sorts, orders, vl):
ans['virtual_libraries'] = db._pref('virtual_libraries', {}) ans['virtual_libraries'] = db._pref('virtual_libraries', {})
ans['bools_are_tristate'] = db._pref('bools_are_tristate', True) ans['bools_are_tristate'] = db._pref('bools_are_tristate', True)
ans['book_display_fields'] = get_field_list(db) ans['book_display_fields'] = get_field_list(db)
ans['book_details_vertical_categories'] = db._pref('book_details_vertical_categories', ())
mdata = ans['metadata'] = {} mdata = ans['metadata'] = {}
try: try:
extra_books = { extra_books = {

42
src/pyj/book_list/book_details.pyj
View File

@ -185,15 +185,18 @@ def render_metadata(mi, table, book_id, iframe_css): # {{{
return True return True
fields = library_data.book_display_fields fields = library_data.book_display_fields
vertical_categories = {x: True for x in (library_data.book_details_vertical_categories or v'[]')}
if not fields or not fields.length or get_session_data().get('show_all_metadata'): if not fields or not fields.length or get_session_data().get('show_all_metadata'):
fields = sorted(filter(allowed_fields, mi), key=field_sorter(field_metadata)) fields = sorted(filter(allowed_fields, mi), key=field_sorter(field_metadata))
else: else:
fields = filter(allowed_fields, fields) fields = filter(allowed_fields, fields)
comments = v'[]' comments = v'[]'
def add_row(name, val, is_searchable=False, is_html=False, join=None, search_text=None, use_quotes=True): def add_row(field, name, val, is_searchable=False, is_html=False, join=None, search_text=None, use_quotes=True):
if val is undefined or val is None: if val is undefined or val is None:
return return
is_vertical = vertical_categories[field]
def add_val(v): def add_val(v):
if not v.appendChild: if not v.appendChild:
v += '' v += ''
@ -220,24 +223,27 @@ def render_metadata(mi, table, book_id, iframe_css): # {{{
for v in val: for v in val:
add_val(v) add_val(v)
if v is not val[-1]: if v is not val[-1]:
table.lastChild.lastChild.appendChild(document.createTextNode(join)) if is_vertical:
table.lastChild.lastChild.appendChild(E.br())
else:
table.lastChild.lastChild.appendChild(document.createTextNode(join))
return table.lastChild.lastChild return table.lastChild.lastChild
def process_composite(field, fm, name, val): def process_composite(field, fm, name, val):
if fm.display and fm.display.contains_html: if fm.display and fm.display.contains_html:
add_row(name, val, is_html=True) add_row(field, name, val, is_html=True)
return return
if fm.is_multiple and fm.is_multiple.list_to_ui: if fm.is_multiple and fm.is_multiple.list_to_ui:
all_vals = filter(None, map(str.strip, val.split(fm.is_multiple.list_to_ui))) all_vals = filter(None, map(str.strip, val.split(fm.is_multiple.list_to_ui)))
add_row(name, all_vals, is_searchable=field, join=fm.is_multiple.list_to_ui) add_row(field, name, all_vals, is_searchable=field, join=fm.is_multiple.list_to_ui)
else: else:
add_row(name, val, is_searchable=field) add_row(field, name, val, is_searchable=field)
def process_authors(field, fm, name, val): def process_authors(field, fm, name, val):
add_row(name, val, is_searchable=field, join=' & ') add_row(field, name, val, is_searchable=field, join=' & ')
def process_publisher(field, fm, name, val): def process_publisher(field, fm, name, val):
add_row(name, val, is_searchable=field) add_row(field, name, val, is_searchable=field)
def process_formats(field, fm, name, val): def process_formats(field, fm, name, val):
if val.length and book_id?: if val.length and book_id?:
@ -258,7 +264,7 @@ def render_metadata(mi, table, book_id, iframe_css): # {{{
val = int(val or 0) val = int(val or 0)
if val > 0: if val > 0:
add_stars_to(stars, val, fm.display?.allow_half_stars) add_stars_to(stars, val, fm.display?.allow_half_stars)
add_row(name, stars, is_searchable=field, search_text=val/2 + '') add_row(field, name, stars, is_searchable=field, search_text=val/2 + '')
def process_identifiers(field, fm, name, val): def process_identifiers(field, fm, name, val):
@ -286,9 +292,9 @@ def render_metadata(mi, table, book_id, iframe_css): # {{{
def process_size(field, fm, name, val): def process_size(field, fm, name, val):
if val: if val:
try: try:
add_row(name, human_readable(int(val))) add_row(field, name, human_readable(int(val)))
except: except:
add_row(name, val+'') add_row(field, name, val+'')
def process_languages(field, fm, name, val): def process_languages(field, fm, name, val):
if val and val.length: if val and val.length:
@ -312,7 +318,7 @@ def render_metadata(mi, table, book_id, iframe_css): # {{{
fmt = interface_data['gui_' + field + '_display_format'] or (fm['display'] or {}).date_format fmt = interface_data['gui_' + field + '_display_format'] or (fm['display'] or {}).date_format
formatted_val = format_date(val, fmt) formatted_val = format_date(val, fmt)
if formatted_val: if formatted_val:
add_row(name, formatted_val, is_searchable=field, search_text=val) add_row(field, name, formatted_val, is_searchable=field, search_text=val)
def process_series(field, fm, name, val): def process_series(field, fm, name, val):
if val: if val:
@ -345,19 +351,19 @@ def render_metadata(mi, table, book_id, iframe_css): # {{{
hp = fm.display?.heading_position or 'hide' hp = fm.display?.heading_position or 'hide'
if ias is 'long-text': if ias is 'long-text':
if hp is 'side': if hp is 'side':
add_row(name, val).style.whiteSpace = 'pre-wrap' add_row(field, name, val).style.whiteSpace = 'pre-wrap'
return return
val = E.pre(val, style='white-space:pre-wrap').outerHTML val = E.pre(val, style='white-space:pre-wrap').outerHTML
elif ias is 'short-text': elif ias is 'short-text':
if hp is 'side': if hp is 'side':
add_row(name, val) add_row(field, name, val)
return return
val = E.span(val).outerHTML val = E.span(val).outerHTML
else: else:
if field is 'comments' and '<' not in val: if field is 'comments' and '<' not in val:
val = '\n'.join(['<p class="description">{}</p>'.format(x.replace(/\n/g, '<br>')) for x in val.split('\n\n')]) val = '\n'.join(['<p class="description">{}</p>'.format(x.replace(/\n/g, '<br>')) for x in val.split('\n\n')])
if hp is 'side': if hp is 'side':
add_row(name, val, is_html=True) add_row(field, name, val, is_html=True)
return return
comments.push(v'[field, val]') comments.push(v'[field, val]')
return return
@ -388,14 +394,14 @@ def render_metadata(mi, table, book_id, iframe_css): # {{{
if datatype is 'text' or datatype is 'enumeration': if datatype is 'text' or datatype is 'enumeration':
if val is not undefined and val is not None: if val is not undefined and val is not None:
join = fm.is_multiple.list_to_ui if fm.is_multiple else None join = fm.is_multiple.list_to_ui if fm.is_multiple else None
add_row(name, val, join=join, is_searchable=field) add_row(field, name, val, join=join, is_searchable=field)
elif datatype is 'bool': elif datatype is 'bool':
if library_data.bools_are_tristate: if library_data.bools_are_tristate:
v = _('Yes') if val else ('' if val is undefined or val is None else _('No')) v = _('Yes') if val else ('' if val is undefined or val is None else _('No'))
else: else:
v = _('Yes') if val else _('No') v = _('Yes') if val else _('No')
if v: if v:
add_row(name, v, is_searchable=field, use_quotes=False) add_row(field, name, v, is_searchable=field, use_quotes=False)
elif datatype is 'int' or datatype is 'float': elif datatype is 'int' or datatype is 'float':
if val is not undefined and val is not None: if val is not undefined and val is not None:
fmt = (fm.display or {}).number_format fmt = (fm.display or {}).number_format
@ -403,10 +409,10 @@ def render_metadata(mi, table, book_id, iframe_css): # {{{
formatted_val = fmt.format(val) formatted_val = fmt.format(val)
if formatted_val: if formatted_val:
val += '' val += ''
add_row(name, formatted_val, is_searchable=field, search_text=val) add_row(field, name, formatted_val, is_searchable=field, search_text=val)
else: else:
val += '' val += ''
add_row(name, val, is_searchable=field, search_text=val) add_row(field, name, val, is_searchable=field, search_text=val)
for field in fields: for field in fields:
fm = field_metadata[field] fm = field_metadata[field]

2
src/pyj/book_list/library_data.pyj
View File

@ -83,7 +83,7 @@ def update_library_data(data):
if library_data.for_library is not current_library_id(): if library_data.for_library is not current_library_id():
library_data.field_names = {} library_data.field_names = {}
library_data.for_library = current_library_id() library_data.for_library = current_library_id()
for key in 'search_result sortable_fields field_metadata metadata virtual_libraries book_display_fields bools_are_tristate'.split(' '): for key in 'search_result sortable_fields field_metadata metadata virtual_libraries book_display_fields bools_are_tristate book_details_vertical_categories'.split(' '):
library_data[key] = data[key] library_data[key] = data[key]
sr = library_data.search_result sr = library_data.search_result
if sr: if sr: