Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return matching element with result #91

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions autoscraper/auto_scraper.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ def _get_result_with_stack(self, stack, soup, url, attr_fuzz_ratio, **kwargs):
i, wanted_attr, is_full_url, url, is_non_rec_text
),
getattr(i, "child_index", 0),
i
)
for i in parents
]
Expand Down Expand Up @@ -395,6 +396,7 @@ def _get_result_with_stack_index_based(
stack["is_non_rec_text"],
),
getattr(p, "child_index", 0),
p
)
]
if not kwargs.get("keep_blank", False):
Expand Down Expand Up @@ -439,27 +441,28 @@ def _get_result_by_func(
grouped_result[group_id] += result

return self._clean_result(
result_list, grouped_result, grouped, group_by_alias, unique, keep_order
result_list, grouped_result, grouped, group_by_alias, unique, keep_order,
kwargs.get("return_elements", False)
)

@staticmethod
def _clean_result(
result_list, grouped_result, grouped, grouped_by_alias, unique, keep_order
result_list, grouped_result, grouped, grouped_by_alias, unique, keep_order, return_elements
):
if not grouped and not grouped_by_alias:
if unique is None:
unique = True
if keep_order:
result_list = sorted(result_list, key=lambda x: x.index)
result = [x.text for x in result_list]
result = [x.text if not return_elements else x.element for x in result_list]
if unique:
result = unique_hashable(result)
return result

for k, val in grouped_result.items():
if grouped_by_alias:
val = sorted(val, key=lambda x: x.index)
val = [x.text for x in val]
val = [x.text if not return_elements else x.element for x in val]
if unique:
val = unique_hashable(val)
grouped_result[k] = val
Expand All @@ -479,6 +482,7 @@ def get_result_similar(
keep_blank=False,
keep_order=False,
contain_sibling_leaves=False,
return_elements=False
):
"""
Gets similar results based on the previously learned rules.
Expand Down Expand Up @@ -540,6 +544,7 @@ def get_result_similar(
keep_blank=keep_blank,
keep_order=keep_order,
contain_sibling_leaves=contain_sibling_leaves,
return_element=return_elements
)

def get_result_exact(
Expand All @@ -553,6 +558,7 @@ def get_result_exact(
unique=None,
attr_fuzz_ratio=1.0,
keep_blank=False,
return_elements=False
):
"""
Gets exact results based on the previously learned rules.
Expand Down Expand Up @@ -606,6 +612,7 @@ def get_result_exact(
unique,
attr_fuzz_ratio,
keep_blank=keep_blank,
return_elements=return_elements
)

def get_result(
Expand Down
3 changes: 2 additions & 1 deletion autoscraper/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ def text_match(t1, t2, ratio_limit):


class ResultItem():
def __init__(self, text, index):
def __init__(self, text, index, element):
self.text = text
self.index = index
self.element = element

def __str__(self):
return self.text
Expand Down