Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-06 01:54:01 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse source
This commit is contained in:
Kovid Goyal 2013-09-12 14:02:29 +05:30
commit 3bbfb055e7
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
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'])
no_fields = set(tweaks['content_server_wont_display'])
if '*' in yes_fields:
yes_fields = set(ckeys)
yes_fields = ckeys
if '*' in no_fields:
no_fields = set(ckeys)
return frozenset(yes_fields - no_fields)
no_fields = ckeys
return frozenset(ckeys & (yes_fields - no_fields))
def main():
from calibre.library.server.main import main