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

Book details: Render custom comments fields correctly

Browse Source 
Book details panel: Render custom comments fields the same as the builtin
comments field. In particular this fixes problems caused by wide text and
images in custom comments fields. Fixes #1226350 [Image in Custom Comments Column](https://bugs.launchpad.net/calibre/+bug/1226350)
This commit is contained in:
Kovid Goyal 2013-09-17 11:33:16 +05:30
parent aca201d3d9
commit 50d619d471
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/calibre/gui2/book_details.py
View File

@ -29,7 +29,7 @@ from calibre.utils.localization import calibre_langcode_to_name
from calibre.utils.config import tweaks from calibre.utils.config import tweaks
def render_html(mi, css, vertical, widget, all_fields=False): # {{{ def render_html(mi, css, vertical, widget, all_fields=False): # {{{
table = render_data(mi, all_fields=all_fields, table, comment_fields = render_data(mi, all_fields=all_fields,
use_roman_numbers=config['use_roman_numerals_for_series_number']) use_roman_numbers=config['use_roman_numerals_for_series_number'])
def color_to_string(col): def color_to_string(col):
@ -68,12 +68,9 @@ def render_html(mi, css, vertical, widget, all_fields=False): # {{{
</body> </body>
<html> <html>
'''%(f, fam, c, css) '''%(f, fam, c, css)
fm = getattr(mi, 'field_metadata', field_metadata)
fl = dict(get_field_list(fm))
show_comments = (all_fields or fl.get('comments', True))
comments = u'' comments = u''
if mi.comments and show_comments: if comment_fields:
comments = comments_to_html(force_unicode(mi.comments)) comments = '\n'.join(u'<div>%s</div>' % x for x in comment_fields)
right_pane = u'<div id="comments" class="comments">%s</div>'%comments right_pane = u'<div id="comments" class="comments">%s</div>'%comments
if vertical: if vertical:
@ -106,8 +103,10 @@ def get_field_list(fm, use_defaults=False):
def render_data(mi, use_roman_numbers=True, all_fields=False): def render_data(mi, use_roman_numbers=True, all_fields=False):
ans = [] ans = []
comment_fields = []
isdevice = not hasattr(mi, 'id') isdevice = not hasattr(mi, 'id')
fm = getattr(mi, 'field_metadata', field_metadata) fm = getattr(mi, 'field_metadata', field_metadata)
row = u'<td class="title">%s</td><td class="value">%s</td>'
for field, display in get_field_list(fm): for field, display in get_field_list(fm):
metadata = fm.get(field, None) metadata = fm.get(field, None)
@ -119,24 +118,23 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
isnull = mi.get(field) is None isnull = mi.get(field) is None
else: else:
isnull = mi.is_null(field) isnull = mi.is_null(field)
if (not display or not metadata or isnull or field == 'comments'): if (not display or not metadata or isnull):
continue continue
name = metadata['name'] name = metadata['name']
if not name: if not name:
name = field name = field
name += ':' name += ':'
if metadata['datatype'] == 'comments': if metadata['datatype'] == 'comments' or field == 'comments':
val = getattr(mi, field) val = getattr(mi, field)
if val: if val:
val = force_unicode(val) val = force_unicode(val)
ans.append((field, comment_fields.append(comments_to_html(val))
u'<td class="comments" colspan="2">%s</td>'%comments_to_html(val)))
elif metadata['datatype'] == 'rating': elif metadata['datatype'] == 'rating':
val = getattr(mi, field) val = getattr(mi, field)
if val: if val:
val = val/2.0 val = val/2.0
ans.append((field, ans.append((field,
u'<td class="title">%s</td><td class="rating" ' u'<td class="title">%s</td><td class="rating value" '
'style=\'font-family:"%s"\'>%s</td>'%( 'style=\'font-family:"%s"\'>%s</td>'%(
name, rating_font(), u'\u2605'*int(val)))) name, rating_font(), u'\u2605'*int(val))))
elif metadata['datatype'] == 'composite' and \ elif metadata['datatype'] == 'composite' and \
@ -145,8 +143,7 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
if val: if val:
val = force_unicode(val) val = force_unicode(val)
ans.append((field, ans.append((field,
u'<td class="title">%s</td><td>%s</td>'% row % (name, comments_to_html(val))))
(name, comments_to_html(val))))
elif field == 'path': elif field == 'path':
if mi.path: if mi.path:
path = force_unicode(mi.path, filesystem_encoding) path = force_unicode(mi.path, filesystem_encoding)
@ -163,22 +160,20 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
prepare_string_for_xml(durl)) prepare_string_for_xml(durl))
link = u'<a href="%s:%s" title="%s">%s</a>%s' % (scheme, url, link = u'<a href="%s:%s" title="%s">%s</a>%s' % (scheme, url,
prepare_string_for_xml(path, True), pathstr, extra) prepare_string_for_xml(path, True), pathstr, extra)
ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name, link))) ans.append((field, row % (name, link)))
elif field == 'formats': elif field == 'formats':
if isdevice: if isdevice:
continue continue
fmts = [u'<a href="format:%s:%s">%s</a>' % (mi.id, x, x) for x fmts = [u'<a href="format:%s:%s">%s</a>' % (mi.id, x, x) for x
in mi.formats] in mi.formats]
ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name, ans.append((field, row % (name, u', '.join(fmts))))
u', '.join(fmts))))
elif field == 'identifiers': elif field == 'identifiers':
urls = urls_from_identifiers(mi.identifiers) urls = urls_from_identifiers(mi.identifiers)
links = [u'<a href="%s" title="%s:%s">%s</a>' % (url, id_typ, id_val, name) links = [u'<a href="%s" title="%s:%s">%s</a>' % (url, id_typ, id_val, name)
for name, id_typ, id_val, url in urls] for name, id_typ, id_val, url in urls]
links = u', '.join(links) links = u', '.join(links)
if links: if links:
ans.append((field, u'<td class="title">%s</td><td>%s</td>'%( ans.append((field, row % (_('Ids')+':', links)))
_('Ids')+':', links)))
elif field == 'authors' and not isdevice: elif field == 'authors' and not isdevice:
authors = [] authors = []
formatter = EvalFormatter() formatter = EvalFormatter()
@ -199,14 +194,12 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
authors.append(u'<a calibre-data="authors" href="%s">%s</a>'%(link, aut)) authors.append(u'<a calibre-data="authors" href="%s">%s</a>'%(link, aut))
else: else:
authors.append(aut) authors.append(aut)
ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name, ans.append((field, row % (name, u' & '.join(authors))))
u' & '.join(authors))))
elif field == 'languages': elif field == 'languages':
if not mi.languages: if not mi.languages:
continue continue
names = filter(None, map(calibre_langcode_to_name, mi.languages)) names = filter(None, map(calibre_langcode_to_name, mi.languages))
ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name, ans.append((field, row % (name, u', '.join(names))))
u', '.join(names))))
else: else:
val = mi.format_field(field)[-1] val = mi.format_field(field)[-1]
if val is None: if val is None:
@ -224,14 +217,13 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
if is_date_undefined(aval): if is_date_undefined(aval):
continue continue
ans.append((field, u'<td class="title">%s</td><td>%s</td>'%(name, val))) ans.append((field, row % (name, val)))
dc = getattr(mi, 'device_collections', []) dc = getattr(mi, 'device_collections', [])
if dc: if dc:
dc = u', '.join(sorted(dc, key=sort_key)) dc = u', '.join(sorted(dc, key=sort_key))
ans.append(('device_collections', ans.append(('device_collections',
u'<td class="title">%s</td><td>%s</td>'%( row % (_('Collections')+':', dc)))
_('Collections')+':', dc)))
def classname(field): def classname(field):
try: try:
@ -243,7 +235,7 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
ans = [u'<tr id="%s" class="%s">%s</tr>'%(field.replace('#', '_'), ans = [u'<tr id="%s" class="%s">%s</tr>'%(field.replace('#', '_'),
classname(field), html) for field, html in ans] classname(field), html) for field, html in ans]
# print '\n'.join(ans) # print '\n'.join(ans)
return u'<table class="fields">%s</table>'%(u'\n'.join(ans)) return u'<table class="fields">%s</table>'%(u'\n'.join(ans)), comment_fields
# }}} # }}}