mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
3bbfb055e7
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user