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

RPUB/MOBI Catalog generation: Allow matching empty fields in exclusion rules. Fixes #1814458 [catalog builder ignore "any" and "undefined"](https://bugs.launchpad.net/calibre/+bug/1814458)

Browse Source
This commit is contained in:
Kovid Goyal 2019-02-04 19:34:11 +05:30
parent 7c5184cef8
commit 58442a478a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -4807,6 +4807,8 @@ class CatalogBuilder(object):
field_contents = self.db.get_field(record['id'], field_contents = self.db.get_field(record['id'],
field, field,
index_is_id=True) index_is_id=True)
if field_contents == '':
field_contents = None
if (self.db.metadata_for_field(field)['datatype'] == 'bool' and if (self.db.metadata_for_field(field)['datatype'] == 'bool' and
field_contents is None): field_contents is None):
@ -4839,6 +4841,10 @@ class CatalogBuilder(object):
else: else:
if record not in filtered_data_set: if record not in filtered_data_set:
filtered_data_set.append(record) filtered_data_set.append(record)
elif field_contents is None and pat == 'None':
exclusion_set.append(record)
if record in filtered_data_set:
filtered_data_set.remove(record)
else: else:
if (record not in filtered_data_set and if (record not in filtered_data_set and
record not in exclusion_set): record not in exclusion_set):