Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

parenthesize chained operators (extra-edit)

Browse Source
This commit is contained in:
un-pogaz 2025-01-24 11:14:19 +01:00
parent 76c091c975
commit 537ea5ef34
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/ebooks/oeb/iterator/book.py
View File

@ -67,8 +67,7 @@ def extract_book(pathtoebook, tdir, log=None, view_kepub=False, processed=False,
if not only_input_plugin: if not only_input_plugin:
# Run the HTML preprocess/parsing from the conversion pipeline as # Run the HTML preprocess/parsing from the conversion pipeline as
# well # well
if (processed or (plumber.input_fmt.lower() in {'pdb', 'pdf', 'rb'} and if processed or (plumber.input_fmt.lower() in {'pdb', 'pdf', 'rb'} and not hasattr(pathtoopf, 'manifest')):
not hasattr(pathtoopf, 'manifest'))):
if hasattr(pathtoopf, 'manifest'): if hasattr(pathtoopf, 'manifest'):
pathtoopf = write_oebbook(pathtoopf, tdir) pathtoopf = write_oebbook(pathtoopf, tdir)
pathtoopf = create_oebbook(log, pathtoopf, plumber.opts) pathtoopf = create_oebbook(log, pathtoopf, plumber.opts)

3
src/calibre/ebooks/oeb/transforms/page_margin.py
View File

@ -88,8 +88,7 @@ class RemoveFakeMargins:
except: except:
pass pass
else: else:
if ((hasattr(ti, 'startswith') and ti.startswith('-')) or if ((hasattr(ti, 'startswith') and ti.startswith('-')) or (isinstance(ti, numbers.Number) and ti < 0)):
(isinstance(ti, numbers.Number) and ti < 0)):
raise NegativeTextIndent() raise NegativeTextIndent()
return style.marginLeft, style.marginRight, style return style.marginLeft, style.marginRight, style
return '', '', None return '', '', None

13
src/calibre/gui2/tag_browser/model.py
View File

@ -1233,12 +1233,13 @@ class TagsModel(QAbstractItemModel): # {{{
fm_dest = self.db.metadata_for_field(node.category_key) fm_dest = self.db.metadata_for_field(node.category_key)
if fm_dest['kind'] == 'user': if fm_dest['kind'] == 'user':
fm_src = self.db.metadata_for_field(md.column_name) fm_src = self.db.metadata_for_field(md.column_name)
if md.column_name in ['authors', 'publisher', 'series'] or \ if md.column_name in ['authors', 'publisher', 'series'] or (
((fm_src['is_custom'] and ( (fm_src['is_custom'] and (
fm_src['datatype'] in ['series', 'text', 'enumeration'] and fm_src['datatype'] in ['series', 'text', 'enumeration'] and
not fm_src['is_multiple']))or not fm_src['is_multiple'])) or
(fm_src['datatype'] == 'composite' and (fm_src['datatype'] == 'composite' and
fm_src['display'].get('make_category', False))): fm_src['display'].get('make_category', False))
):
mime = 'application/calibre+from_library' mime = 'application/calibre+from_library'
ids = list(map(int, md.data(mime).data().split())) ids = list(map(int, md.data(mime).data().split()))
self.handle_user_category_drop(node, ids, md.column_name) self.handle_user_category_drop(node, ids, md.column_name)