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

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

Browse Source
This commit is contained in:
Kovid Goyal 2022-01-17 17:29:48 +05:30
commit 5d15c9ded4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/calibre/library/coloring.py
View File

@ -113,9 +113,9 @@ class Rule: # {{{
def ondevice_condition(self, col, action, val): def ondevice_condition(self, col, action, val):
if action == 'is set': if action == 'is set':
return "test(ondevice(), '1', '')" return "ondevice()"
if action == 'is not set': if action == 'is not set':
return "test(ondevice(), '', '1')" return "!ondevice()"
def bool_condition(self, col, action, val): def bool_condition(self, col, action, val):
test = {'is true': '0, 0, 1', test = {'is true': '0, 0, 1',
@ -128,9 +128,9 @@ class Rule: # {{{
def number_condition(self, col, action, val): def number_condition(self, col, action, val):
if action == 'is set': if action == 'is set':
return "test(field('%s'), '1', '')"%col return f"${col}"
if action == 'is not set': if action == 'is not set':
return "test(field('%s'), '', '1')"%col return f"!${col}"
lt, eq, gt = { lt, eq, gt = {
'eq': ('', '1', ''), 'eq': ('', '1', ''),
'lt': ('1', '', ''), 'lt': ('1', '', ''),
@ -139,13 +139,13 @@ class Rule: # {{{
if col == 'size': if col == 'size':
return f"cmp(booksize(), {val}, '{lt}', '{eq}', '{gt}')" return f"cmp(booksize(), {val}, '{lt}', '{eq}', '{gt}')"
else: else:
return f"cmp(raw_field('{col}'), {val}, '{lt}', '{eq}', '{gt}')" return f"cmp(raw_field('{col}', 0), {val}, '{lt}', '{eq}', '{gt}')"
def rating_condition(self, col, action, val): def rating_condition(self, col, action, val):
if action == 'is set': if action == 'is set':
return "test(field('%s'), '1', '')"%col return f"${col}"
if action == 'is not set': if action == 'is not set':
return "test(field('%s'), '', '1')"%col return f"!${col}"
lt, eq, gt = { lt, eq, gt = {
'eq': ('', '1', ''), 'eq': ('', '1', ''),
'lt': ('1', '', ''), 'lt': ('1', '', ''),
@ -175,26 +175,25 @@ class Rule: # {{{
"format_date(today(), 'yyyy-MM-dd')), '1', '', ''), '')") "format_date(today(), 'yyyy-MM-dd')), '1', '', ''), '')")
%(col, val, col)) %(col, val, col))
if action == 'is set': if action == 'is set':
return ("test(field('%s'), '1', '')"%(col)) return (f"${col}")
if action == 'is not set': if action == 'is not set':
return ("test(field('%s'), '', '1')"%(col)) return (f"!${col}")
if action == 'is today': if action == 'is today':
return f"strcmp(format_date(raw_field('{col}'), 'yyyy-MM-dd'), 'format_date(today(), 'yyyy-MM-dd')', '', '1', '')" return f"substr(format_date(raw_field('{col}'), 'iso'), 0, 10) == substr(today(), 0, 10)"
lt, eq, gt = { lt, eq, gt = {
'eq': ('', '1', ''), 'eq': ('', '1', ''),
'lt': ('1', '', ''), 'lt': ('1', '', ''),
'gt': ('', '', '1') 'gt': ('', '', '1')
}[action] }[action]
return ("strcmp(format_date(raw_field('%s'), 'yyyy-MM-dd'), '%s', '%s', '%s', '%s')" % return (f"strcmp(format_date(raw_field('{col}'), 'yyyy-MM-dd'), '{val}', '{lt}', '{eq}', '{gt}')")
(col, val, lt, eq, gt))
def multiple_condition(self, col, action, val, sep): def multiple_condition(self, col, action, val, sep):
if not sep or sep == '|': if not sep or sep == '|':
sep = ',' sep = ','
if action == 'is set': if action == 'is set':
return "test(field('%s'), '1', '')"%col return f"${col}"
if action == 'is not set': if action == 'is not set':
return "test(field('%s'), '', '1')"%col return f"!${col}"
if action == 'has': if action == 'has':
return "str_in_list(field('%s'), '%s', \"%s\", '1', '')"%(col, sep, val) return "str_in_list(field('%s'), '%s', \"%s\", '1', '')"%(col, sep, val)
if action == 'does not have': if action == 'does not have':
@ -206,9 +205,9 @@ class Rule: # {{{
def text_condition(self, col, action, val): def text_condition(self, col, action, val):
if action == 'is set': if action == 'is set':
return "test(field('%s'), '1', '')"%col return f"${col}"
if action == 'is not set': if action == 'is not set':
return "test(field('%s'), '', '1')"%col return f"!${col}"
if action == 'is': if action == 'is':
return "strcmp(field('%s'), \"%s\", '', '1', '')"%(col, val) return "strcmp(field('%s'), \"%s\", '', '1', '')"%(col, val)
if action == 'is not': if action == 'is not':