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

Add not equals match operators

Browse Source
This commit is contained in:
Kovid Goyal 2016-03-09 23:52:14 +05:30
parent de9032aa9f
commit 70a36a10b4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/ebooks/css_transform_rules.py
View File

@ -87,7 +87,7 @@ class StyleDeclaration(object):
def __str__(self): def __str__(self):
return force_unicode(self.css_declaration.cssText, 'utf-8') return force_unicode(self.css_declaration.cssText, 'utf-8')
operator_map = {'==':'eq', '<=':'le', '<':'lt', '>=':'ge', '>':'gt', '-':'sub', '+': 'add', '*':'mul', '/':'truediv'} operator_map = {'==':'eq', '!=': 'ne', '<=':'le', '<':'lt', '>=':'ge', '>':'gt', '-':'sub', '+': 'add', '*':'mul', '/':'truediv'}
def unit_convert(value, unit, dpi=96.0, body_font_size=12): def unit_convert(value, unit, dpi=96.0, body_font_size=12):
result = None result = None
@ -157,6 +157,8 @@ class Rule(object):
self.action_operator = partial(transform_number, float(self.action_data), getattr(operator, operator_map[self.action])) self.action_operator = partial(transform_number, float(self.action_data), getattr(operator, operator_map[self.action]))
if match_type == 'is': if match_type == 'is':
self.property_matches = lambda x: x.lower() == query self.property_matches = lambda x: x.lower() == query
elif match_type == 'is_not':
self.property_matches = lambda x: x.lower() != query
elif match_type == '*': elif match_type == '*':
self.property_matches = lambda x: True self.property_matches = lambda x: True
elif 'matches' in match_type: elif 'matches' in match_type:
@ -207,7 +209,7 @@ def validate_rule(rule):
except Exception: except Exception:
return _('Query invalid'), _( return _('Query invalid'), _(
'%s is not a valid regular expression') % rule['query'] '%s is not a valid regular expression') % rule['query']
elif mt in '< > <= >= =='.split(): elif mt in '< > <= >= == !='.split():
try: try:
num = parse_css_length_or_number(rule['query'])[0] num = parse_css_length_or_number(rule['query'])[0]
if num is None: if num is None:
@ -253,6 +255,7 @@ def test(): # {{{
css, ecss = 'color: red; margin: 0', 'margin: 0' css, ecss = 'color: red; margin: 0', 'margin: 0'
m('*') m('*')
m('is', 'red') m('is', 'red')
m('is_not', 'blue')
m('matches', 'R.d') m('matches', 'R.d')
m('not_matches', 'blue') m('not_matches', 'blue')
ecss = css.replace('; ', ';\n') ecss = css.replace('; ', ';\n')
@ -262,6 +265,7 @@ def test(): # {{{
css, ecss = 'color: red; margin-top: 10', 'color: red' css, ecss = 'color: red; margin-top: 10', 'color: red'
m('*') m('*')
m('==', '10') m('==', '10')
m('!=', '11')
m('<=', '10') m('<=', '10')
m('>=', '10') m('>=', '10')
m('<', '11') m('<', '11')

2
src/calibre/gui2/css_transform_rules.py
View File

@ -28,10 +28,12 @@ class RuleEdit(QWidget): # {{{
MATCH_TYPE_MAP = OrderedDict(( MATCH_TYPE_MAP = OrderedDict((
('is', _('is')), ('is', _('is')),
('is_not', _('is not')),
('*', _('is any value')), ('*', _('is any value')),
('matches', _('matches pattern')), ('matches', _('matches pattern')),
('not_matches', _('does not match pattern')) ('not_matches', _('does not match pattern'))
('==', _('is the same length as')), ('==', _('is the same length as')),
('!=', _('is not the same length as')),
('<', _('is less than')), ('<', _('is less than')),
('>', _('is greater than')), ('>', _('is greater than')),
('<=', _('is less than or equal to')), ('<=', _('is less than or equal to')),