add --behavior-parameters argument to brozzler-new-site

This commit is contained in:
Noah Levitt 2016-11-09 13:12:36 -08:00
parent 953e50d9a6
commit 8e115b44fa
2 changed files with 11 additions and 3 deletions

View File

@ -224,6 +224,12 @@ def brozzler_new_site():
'Warcprox-Meta http request header to send with each request; ' 'Warcprox-Meta http request header to send with each request; '
'must be a json blob, ignored unless warcprox features are ' 'must be a json blob, ignored unless warcprox features are '
'enabled')) 'enabled'))
arg_parser.add_argument(
'--behavior-parameters', dest='behavior_parameters',
default=None, help=(
'json blob of parameters to populate the javascript behavior '
'template, e.g. {"parameter_username":"x",'
'"parameter_password":"y"}'))
_add_common_options(arg_parser) _add_common_options(arg_parser)
args = arg_parser.parse_args(args=sys.argv[1:]) args = arg_parser.parse_args(args=sys.argv[1:])
@ -234,8 +240,10 @@ def brozzler_new_site():
time_limit=int(args.time_limit) if args.time_limit else None, time_limit=int(args.time_limit) if args.time_limit else None,
ignore_robots=args.ignore_robots, ignore_robots=args.ignore_robots,
enable_warcprox_features=args.enable_warcprox_features, enable_warcprox_features=args.enable_warcprox_features,
warcprox_meta=( warcprox_meta=json.loads(
json.loads(args.warcprox_meta) if args.warcprox_meta else None)) args.warcprox_meta) if args.warcprox_meta else None,
behavior_parameters=json.loads(
args.behavior_parameters) if args.behavior_parameters else None)
r = rethinkstuff.Rethinker( r = rethinkstuff.Rethinker(
args.rethinkdb_servers.split(","), args.rethinkdb_db) args.rethinkdb_servers.split(","), args.rethinkdb_db)

View File

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup( setuptools.setup(
name='brozzler', name='brozzler',
version='1.1b7.dev119', version='1.1b7.dev120',
description='Distributed web crawling with browsers', description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler', url='https://github.com/internetarchive/brozzler',
author='Noah Levitt', author='Noah Levitt',