add addition args for phantomjs

9hao · Nov 21, 2015 · 6b71bb3 · 6b71bb3
1 parent fcf5bfd
commit 6b71bb3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/docs/Command-Line.md b/docs/Command-Line.md
@@ -228,16 +228,21 @@ phantomjs
 ---------
 
 ```
-Usage: pyspider phantomjs [OPTIONS]
+Usage: run.py phantomjs [OPTIONS] [ARGS]...
 
   Run phantomjs fetcher if phantomjs is installed.
 
 Options:
   --phantomjs-path TEXT  phantomjs path
   --port INTEGER         phantomjs port
+  --auto-restart TEXT    auto restart phantomjs if crashed
   --help                 Show this message and exit.
 ```
 
+#### ARGS
+
+Addition args pass to phantomjs command line.
+
 fetcher
 -------
 

diff --git a/docs/apis/Response.md b/docs/apis/Response.md
@@ -19,12 +19,16 @@ Content of response, in bytes.
 
 ### Response.doc
 
-A [PyQuery](https://pythonhosted.org/pyquery/) object of the request's content. Links have made as absolute by default.
+A [PyQuery](https://pythonhosted.org/pyquery/) object of the response's content. Links have made as absolute by default.
 
 Refer to the documentation of PyQuery: [https://pythonhosted.org/pyquery/](https://pythonhosted.org/pyquery/)
 
 It's important that I will repeat, refer to the documentation of PyQuery: [https://pythonhosted.org/pyquery/](https://pythonhosted.org/pyquery/)
 
+### Response.etree
+
+A [lxml](http://lxml.de/) object of the response's content.
+
 ### Response.json
 
 The JSON-encoded content of the response, if any.

diff --git a/pyspider/run.py b/pyspider/run.py
@@ -375,8 +375,9 @@ def webui(ctx, host, port, cdn, scheduler_rpc, fetcher_rpc, max_rate, max_burst,
 @click.option('--phantomjs-path', default='phantomjs', help='phantomjs path')
 @click.option('--port', default=25555, help='phantomjs port')
 @click.option('--auto-restart', default=False, help='auto restart phantomjs if crashed')
+@click.argument('args', nargs=-1)
 @click.pass_context
-def phantomjs(ctx, phantomjs_path, port, auto_restart):
+def phantomjs(ctx, phantomjs_path, port, auto_restart, args):
     """
     Run phantomjs fetcher if phantomjs is installed.
     """
@@ -386,11 +387,10 @@ def phantomjs(ctx, phantomjs_path, port, auto_restart):
     phantomjs_fetcher = os.path.join(
         os.path.dirname(pyspider.__file__), 'fetcher/phantomjs_fetcher.js')
     cmd = [phantomjs_path,
-           '--ssl-protocol=any',
-           '--disk-cache=true',
            # this may cause memory leak: https://github.com/ariya/phantomjs/issues/12903
            #'--load-images=false',
-           phantomjs_fetcher, str(port)]
+           '--ssl-protocol=any',
+           '--disk-cache=true'] + list(args or []) + [phantomjs_fetcher, str(port)]
 
     try:
         _phantomjs = subprocess.Popen(cmd)