Skip to content

Commit 1f8771f

Browse files
committed
use meta to specify attrs
1 parent 5c752d7 commit 1f8771f

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

gerapy_pyppeteer/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
VERSION = (0, 0, '6')
1+
VERSION = (0, 0, '7a1')
22

33
version = __version__ = '.'.join(map(str, VERSION))

gerapy_pyppeteer/downloadermiddlewares.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ async def _process_request(self, request, spider):
165165

166166
# get pyppeteer meta
167167
pyppeteer_meta = request.meta.get('pyppeteer')
168-
print('pyppeteer_meta', pyppeteer_meta)
168+
logger.debug('pyppeteer_meta %s', pyppeteer_meta)
169+
169170
# set proxy
170171
proxy = pyppeteer_meta.get('proxy')
171172
if not proxy:

gerapy_pyppeteer/request.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,20 @@ def __init__(self, url, callback=None, wait_until=None, wait_for=None, script=No
2121
:param args:
2222
:param kwargs:
2323
"""
24-
self.wait_until = wait_until or 'domcontentloaded'
25-
self.wait_for = wait_for
26-
self.script = script
27-
self.sleep = sleep
28-
self.proxy = proxy
29-
self.timeout = timeout
30-
self.ignore_resource_types = ignore_resource_types
31-
32-
# use meta info to save above args
24+
# use meta info to save args
3325
meta = copy.deepcopy(meta) or {}
26+
pyppeteer_mata = meta.get('pyppeteer') or {}
27+
28+
self.wait_until = pyppeteer_mata.get('wait_until') if pyppeteer_mata.get(
29+
'wait_until') is not None else (wait_until or 'domcontentloaded')
30+
self.wait_for = pyppeteer_mata.get('wait_for') if pyppeteer_mata.get('wait_for') is not None else wait_for
31+
self.script = pyppeteer_mata.get('script') if pyppeteer_mata.get('script') is not None else script
32+
self.sleep = pyppeteer_mata.get('sleep') if pyppeteer_mata.get('sleep') is not None else sleep
33+
self.proxy = pyppeteer_mata.get('proxy') if pyppeteer_mata.get('proxy') is not None else proxy
34+
self.timeout = pyppeteer_mata.get('timeout') if pyppeteer_mata.get('timeout') is not None else timeout
35+
self.ignore_resource_types = pyppeteer_mata.get('ignore_resource_types') if pyppeteer_mata.get(
36+
'ignore_resource_types') is not None else ignore_resource_types
37+
3438
pyppeteer_mata = meta.setdefault('pyppeteer', {})
3539
pyppeteer_mata['wait_until'] = self.wait_until
3640
pyppeteer_mata['wait_for'] = self.wait_for

0 commit comments

Comments
 (0)