lxbfYeaa/BookConverter
Archived
Template
1
0
Fork 0
forked from LiveCarta/BookConverter
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change select proc to find_all

Browse Source
This commit is contained in:
Kiryl
2022-09-09 15:13:26 +03:00
parent ca728973f2
commit b716a2180c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/html_presets_processor.py
View File

@@ -117,7 +117,7 @@ class HtmlPresetsProcessor:
@staticmethod @staticmethod
def _insert_tag(**kwargs): def _insert_tag(**kwargs):
tag_to_insert = \ tag_to_insert = \
kwargs["chapter_tag"].new_tag(kwargs["rule"]["tag_to_insert"]) kwargs["body_tag"].new_tag(kwargs["rule"]["tag_to_insert"])
# insert all items that was in tag to subtag and remove from tag # insert all items that was in tag to subtag and remove from tag
for content in reversed(kwargs["tag"].contents): for content in reversed(kwargs["tag"].contents):
tag_to_insert.insert(0, content.extract()) tag_to_insert.insert(0, content.extract())
@@ -150,14 +150,15 @@ class HtmlPresetsProcessor:
if rule["condition"]: if rule["condition"]:
for condition_on_tag in ((k, v) for k, v in rule["condition"].items() if v): for condition_on_tag in ((k, v) for k, v in rule["condition"].items() if v):
if condition_on_tag[0] == "parent_tags": if condition_on_tag[0] == "parent_tags":
for tag in body_tag.select(', '.join([condition_on_tag[1] + " > " + re.sub(r"[\^$]", "", tag) for parent_tag in body_tag.select(condition_on_tag[1]):
for tag in tags])): for tag in parent_tag.find_all([re.compile(tag) for tag in tags]):
tag.parent.attrs.update(tag.attrs) # parent_tag != tag.parent
action(body_tag=body_tag, tag=tag, rule=rule) tag.parent.attrs.update(tag.attrs)
action(body_tag=body_tag, tag=tag, rule=rule)
elif condition_on_tag[0] == "child_tags": elif condition_on_tag[0] == "child_tags":
for tag in body_tag.select(', '.join([re.sub(r"[\^$]", "", tag) + condition_on_tag[1] for tag in body_tag.find_all([re.compile(tag) for tag in tags]):
for tag in tags])): if tag.select(condition_on_tag[1]):
action(body_tag=body_tag, tag=tag, rule=rule) action(body_tag=body_tag, tag=tag, rule=rule)
elif condition_on_tag[0] == "attrs": elif condition_on_tag[0] == "attrs":
for attr in rule["condition"]["attrs"]: for attr in rule["condition"]["attrs"]:
for tag in body_tag.find_all([re.compile(tag) for tag in tags], for tag in body_tag.find_all([re.compile(tag) for tag in tags],