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

Further revisions to exclusion rules and prefix rules when handling a custom field of type bool

Browse Source
This commit is contained in:
GRiker 2012-10-13 07:59:01 -06:00
parent 2ed98182ca
commit 0b6a6b1804
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -590,9 +590,16 @@ class CatalogBuilder(object):
field_contents = self.db.get_field(record['id'], field_contents = self.db.get_field(record['id'],
rule['field'], rule['field'],
index_is_id=True) index_is_id=True)
if field_contents == '': if field_contents == '':
field_contents = None field_contents = None
if (self.db.metadata_for_field(rule['field'])['datatype'] == 'bool' and
field_contents is None):
# Handle condition where field is a bool and contents is None,
# which is displayed as No
field_contents = _('False')
if field_contents is not None: if field_contents is not None:
if self.db.metadata_for_field(rule['field'])['datatype'] == 'bool': if self.db.metadata_for_field(rule['field'])['datatype'] == 'bool':
# For Yes/No fields, need to translate field_contents to # For Yes/No fields, need to translate field_contents to
@ -4300,7 +4307,7 @@ class CatalogBuilder(object):
# Report excluded books # Report excluded books
if self.opts.verbose and excluded_tags: if self.opts.verbose and excluded_tags:
self.opts.log.info(" Excluded books:") self.opts.log.info(" Books excluded by tag:")
data = self.db.get_data_as_dict(ids=self.opts.ids) data = self.db.get_data_as_dict(ids=self.opts.ids)
for record in data: for record in data:
matched = list(set(record['tags']) & set(excluded_tags)) matched = list(set(record['tags']) & set(excluded_tags))
@ -4618,13 +4625,28 @@ class CatalogBuilder(object):
else: else:
continue continue
if exclusion_pairs: if exclusion_pairs:
if self.opts.verbose:
self.opts.log.info(" Books excluded by custom field contents:")
for record in data_set: for record in data_set:
for exclusion_pair in exclusion_pairs: for exclusion_pair in exclusion_pairs:
field,pat = exclusion_pair field,pat = exclusion_pair
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:
if (self.db.metadata_for_field(field)['datatype'] == 'bool' and
field_contents is None):
# Handle condition where field is a bool and contents is None,
# which is displayed as No
field_contents = _('False')
if field_contents is not None:
if self.db.metadata_for_field(field)['datatype'] == 'bool':
# For Yes/No fields, need to translate field_contents to
# locale version
field_contents = _(repr(field_contents))
matched = re.search(pat, unicode(field_contents), matched = re.search(pat, unicode(field_contents),
re.IGNORECASE) re.IGNORECASE)
if matched is not None: if matched is not None:
@ -4632,8 +4654,11 @@ class CatalogBuilder(object):
field_md = self.db.metadata_for_field(field) field_md = self.db.metadata_for_field(field)
for rule in self.opts.exclusion_rules: for rule in self.opts.exclusion_rules:
if rule[1] == '#%s' % field_md['label']: if rule[1] == '#%s' % field_md['label']:
self.opts.log.info(" - '%s' by %s (Exclusion rule '%s')" % self.opts.log.info(" - '%s' by %s (%s: '%s' contains '%s')" %
(record['title'], record['authors'][0], rule[0])) (record['title'], record['authors'][0],
rule[0],
self.db.metadata_for_field(field)['name'],
field_contents))
exclusion_set.append(record) exclusion_set.append(record)
if record in filtered_data_set: if record in filtered_data_set:
filtered_data_set.remove(record) filtered_data_set.remove(record)