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

Remove non-existent columns from the set of columns to display. Having them there can cause exceptions.

Browse Source
This commit is contained in:
Charles Haley 2013-09-12 10:25:05 +02:00
parent 1e35898c83
commit eb7ac6011b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/library/server/__init__.py
View File

@ -51,14 +51,14 @@ def server_config(defaults=None):
return c return c
def custom_fields_to_display(db): def custom_fields_to_display(db):
ckeys = db.field_metadata.ignorable_field_keys() ckeys = set(db.field_metadata.ignorable_field_keys())
yes_fields = set(tweaks['content_server_will_display']) yes_fields = set(tweaks['content_server_will_display'])
no_fields = set(tweaks['content_server_wont_display']) no_fields = set(tweaks['content_server_wont_display'])
if '*' in yes_fields: if '*' in yes_fields:
yes_fields = set(ckeys) yes_fields = ckeys
if '*' in no_fields: if '*' in no_fields:
no_fields = set(ckeys) no_fields = ckeys
return frozenset(yes_fields - no_fields) return frozenset(ckeys & (yes_fields - no_fields))
def main(): def main():
from calibre.library.server.main import main from calibre.library.server.main import main