PyJSONProxy

commit

f09b4979da9f5a785fd85e4583e900890fd411ec

parent

8f587670839d77ce94adbc4f77b7d0b87e78ac61

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2015-02-05 17:15

better command line interface

Diffstat

1 files changed, 11 insertions, 19 deletions

diff --git a/jsonproxy/__init__.py b/jsonproxy/__init__.py

@@ -2,9 +2,9 @@ from __future__ import absolute_import
    2     2 
    3     3 import os
    4     4 import sys
   -1     5 import argparse
    5     6 
    6     7 from flask import Flask
    7    -1 from flask.helpers import find_package
    8     8 
    9     9 from .api import api
   10    10 
@@ -12,13 +12,6 @@ TYPES = ['proxy', 'scrape_item', 'scrape_list']
   12    12 ENDPOINTS = 'ENDPOINTS'
   13    13 
   14    14 
   15    -1 def etc_path(app):  # pragma: no cover
   16    -1 	prefix, package_path = find_package(app.import_name)
   17    -1 	if prefix is None:
   18    -1 		return os.path.join(package_path, 'etc')
   19    -1 	return os.path.join(prefix, 'etc')
   20    -1 
   21    -1 
   22    15 def check_config(config):
   23    16 	errors = []
   24    17 
@@ -42,11 +35,16 @@ def check_config(config):
   42    35 	return errors
   43    36 
   44    37 
   45    -1 def create_app(name, settings_override=None):  # pragma: no cover
   46    -1 	app = Flask(name)
   -1    38 def main():
   -1    39 	parser = argparse.ArgumentParser(description='simple proxy and scraper')
   -1    40 	parser.add_argument('config')
   -1    41 	parser.add_argument('-d', '--debug', action='store_true')
   -1    42 	parser.add_argument('-p', '--port', type=int)
   -1    43 	parser.add_argument('-H', '--host')
   -1    44 	args = parser.parse_args()
   47    45 
   48    -1 	app.config.from_pyfile(os.path.join(etc_path(app), 'settings.cfg'))
   49    -1 	app.config.from_object(settings_override)
   -1    46 	app = Flask(__name__)
   -1    47 	app.config.from_pyfile(os.path.abspath(args.config))
   50    48 
   51    49 	errors = check_config(app.config)
   52    50 	if errors:
@@ -55,13 +53,7 @@ def create_app(name, settings_override=None):  # pragma: no cover
   55    53 		sys.exit(1)
   56    54 
   57    55 	app.register_blueprint(api)
   58    -1 
   59    -1 	return app
   60    -1 
   61    -1 
   62    -1 def main():
   63    -1 	app = create_app(__name__)
   64    -1 	app.run()
   -1    56 	app.run(host=args.host, port=args.port, debug=args.debug)
   65    57 
   66    58 
   67    59 if __name__ == '__main__':