From d37db9fb86c40d9b83adf85d6a79d2fdc4aa40b0 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 22 Sep 2021 12:46:18 +0300 Subject: [PATCH] add file param --- pub1c-rest.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pub1c-rest.py b/pub1c-rest.py index eb30105..2abceb4 100644 --- a/pub1c-rest.py +++ b/pub1c-rest.py @@ -115,10 +115,10 @@ class WebPub1C: return publication_data(publication) - def add(self, ibname: str, url: Optional[str] = None) -> str: + def add(self, ibname: str, url: Optional[str] = None, file: str = '') -> str: """ Add new publication """ - publication = self._apache_cfg.create_publication(ibname, url) + publication = self._apache_cfg.create_publication(ibname, url, file) self._apache_cfg.add_publication(publication) self._log.info(f'publication added: {ibname}') return publication.url_path @@ -145,9 +145,11 @@ class WebPub1C: pub_parser = reqparse.RequestParser() pub_parser.add_argument('name', required=True, type=str, help='name required') pub_parser.add_argument('url', type=str) +pub_parser.add_argument('file', type=str) url_parser = reqparse.RequestParser() url_parser.add_argument('url', type=str) +url_parser.add_argument('file', type=str) url_req_parser = reqparse.RequestParser() url_req_parser.add_argument('url', type=str, required=True) @@ -234,7 +236,7 @@ class Publications(Resource): if args.name in webpub.list(): abort(409, message=f'publication exists: {args.name}') try: - url = webpub.add(args.name, url) + url = webpub.add(args.name, url, args.file) except Exception as e: abort(422, message=f'publication failed: {args.name}', traceback=traceback.format_exc()) return {'message': 'created', 'name': args.name, 'url': url}, 201 @@ -257,7 +259,7 @@ class Publication(Resource): if name in webpub.list(): abort(409, message=f'publication exists: {name}') try: - url = webpub.add(name, url) + url = webpub.add(name, url, args.file) except Exception as e: abort(422, message=f'publication failed: {name}', traceback=traceback.format_exc()) return {'message': 'created', 'name': name, 'url': url}, 201