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

Better implementation of tweak controlling book_info

Browse Source
This commit is contained in:
Charles Haley 2010-12-10 14:39:43 +00:00
parent 82e45728a9
commit 64d6f32819
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,6 @@ from calibre.constants import preferred_encoding
from calibre.library.comments import comments_to_html from calibre.library.comments import comments_to_html
from calibre.gui2 import config, open_local_file from calibre.gui2 import config, open_local_file
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key
from calibre.utils.config import tweaks
# render_rows(data) {{{ # render_rows(data) {{{
WEIGHTS = collections.defaultdict(lambda : 100) WEIGHTS = collections.defaultdict(lambda : 100)
@ -30,25 +29,8 @@ WEIGHTS[_('Collections')] = 2
WEIGHTS[_('Series')] = 3 WEIGHTS[_('Series')] = 3
WEIGHTS[_('Tags')] = 4 WEIGHTS[_('Tags')] = 4
def keys_to_display(data):
kt = data.get('__cf_kt__', None)
if kt is None:
return data.keys()
cfkeys = frozenset([k for k in kt.values()])
yes_fields = set(tweaks['book_details_will_display'])
no_fields = set(tweaks['book_details_wont_display'])
if '*' in yes_fields:
yes_fields = cfkeys
if '*' in no_fields:
no_fields = cfkeys
todisplay = frozenset(yes_fields - no_fields)
res = [k for k in data.keys()
if k not in kt or (kt[k] not in cfkeys or kt[k] in todisplay)]
res.remove('__cf_kt__')
return res
def render_rows(data): def render_rows(data):
keys = keys_to_display(data) keys = data.keys()
# First sort by name. The WEIGHTS sort will preserve this sub-order # First sort by name. The WEIGHTS sort will preserve this sub-order
keys.sort(key=sort_key) keys.sort(key=sort_key)
keys.sort(key=lambda x: WEIGHTS[x]) keys.sort(key=lambda x: WEIGHTS[x])

22
src/calibre/gui2/library/models.py
View File

@ -303,6 +303,20 @@ class BooksModel(QAbstractTableModel): # {{{
return self.rowCount(None) return self.rowCount(None)
def get_book_display_info(self, idx): def get_book_display_info(self, idx):
def custom_keys_to_display():
ans = getattr(self, '_custom_fields_in_book_info', None)
if ans is None:
cfkeys = set(self.db.custom_field_keys())
yes_fields = set(tweaks['book_details_will_display'])
no_fields = set(tweaks['book_details_wont_display'])
if '*' in yes_fields:
yes_fields = cfkeys
if '*' in no_fields:
no_fields = cfkeys
ans = frozenset(yes_fields - no_fields)
setattr(self, '_custom_fields_in_book_info', ans)
return ans
data = {} data = {}
cdata = self.cover(idx) cdata = self.cover(idx)
if cdata: if cdata:
@ -334,15 +348,13 @@ class BooksModel(QAbstractTableModel): # {{{
_('Book %s of %s.')%\ _('Book %s of %s.')%\
(sidx, prepare_string_for_xml(series)) (sidx, prepare_string_for_xml(series))
mi = self.db.get_metadata(idx) mi = self.db.get_metadata(idx)
cf_to_display = custom_keys_to_display()
for key in mi.custom_field_keys(): for key in mi.custom_field_keys():
if key not in cf_to_display:
continue
name, val = mi.format_field(key) name, val = mi.format_field(key)
if val: if val:
data[name] = val data[name] = val
cf_kt = {}
for key,mi in self.db.all_metadata().items():
if mi['is_custom']:
cf_kt[mi['name']] = key
data['__cf_kt__'] = cf_kt
return data return data
def set_cache(self, idx): def set_cache(self, idx):