Skip to content

Save custom attribute like wait_time in SeleniumRequest into Request.meta #67

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Save custom attribute like wait_time in SeleniumRequest into Request.meta #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions scrapy_selenium/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ def __init__(self, wait_time=None, wait_until=None, screenshot=False, script=Non

"""

self.wait_time = wait_time
self.wait_until = wait_until
self.screenshot = screenshot
self.script = script

meta = {
"wait_time": wait_time,
"wait_until": wait_until,
"screenshot": screenshot,
"script": script,
}
meta.update(kwargs.pop("meta", {}))
kwargs["meta"] = meta
super().__init__(*args, **kwargs)
12 changes: 6 additions & 6 deletions scrapy_selenium/middlewares.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,16 @@ def process_request(self, request, spider):
}
)

if request.wait_until:
WebDriverWait(self.driver, request.wait_time).until(
request.wait_until
if request.meta.get('wait_until'):
WebDriverWait(self.driver, request.meta.get('wait_time')).until(
request.meta.get('wait_until')
)

if request.screenshot:
if request.meta.get('screenshot'):
request.meta['screenshot'] = self.driver.get_screenshot_as_png()

if request.script:
self.driver.execute_script(request.script)
if request.meta.get('script'):
self.driver.execute_script(request.meta.get('script'))

body = str.encode(self.driver.page_source)

Expand Down