From 983969ed9ec01606702dbd469001ac2a8c54ea38 Mon Sep 17 00:00:00 2001 From: retoor Date: Tue, 10 Dec 2024 01:35:43 +0100 Subject: [PATCH] Update name. --- dist/Zhurnal-1.4.37-py3-none-any.whl | Bin 6011 -> 0 bytes dist/zhurnal-1.3.37.tar.gz | Bin 5172 -> 0 bytes setup.cfg | 5 +++-- src/Zhurnal.egg-info/PKG-INFO | 1 + src/Zhurnal.egg-info/requires.txt | 1 + src/zhurnal/app.py | 26 +++++++++++++++++++++----- 6 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 dist/Zhurnal-1.4.37-py3-none-any.whl delete mode 100644 dist/zhurnal-1.3.37.tar.gz diff --git a/dist/Zhurnal-1.4.37-py3-none-any.whl b/dist/Zhurnal-1.4.37-py3-none-any.whl deleted file mode 100644 index 6ae44a8be792f12a0bdb006299928b9b0db8034a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6011 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 Ko`D}V3iv+^%yNSO diff --git a/dist/zhurnal-1.3.37.tar.gz b/dist/zhurnal-1.3.37.tar.gz deleted file mode 100644 index bc303b90e8915591ea8da2c220576011d4efbab9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5172 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 diff --git a/setup.cfg b/setup.cfg index 0d58825..040c49b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = Zhurnal +name = zhurnal version = 1.4.37 description = Web executor and logger author = retoor @@ -15,7 +15,8 @@ package_dir = python_requires = >=3.7 install_requires = aiohttp - + app @ git+https://molodetz.nl/retoor/app.git + [options.packages.find] where = src diff --git a/src/Zhurnal.egg-info/PKG-INFO b/src/Zhurnal.egg-info/PKG-INFO index 47e97dc..7b29970 100644 --- a/src/Zhurnal.egg-info/PKG-INFO +++ b/src/Zhurnal.egg-info/PKG-INFO @@ -8,6 +8,7 @@ License: MIT Requires-Python: >=3.7 Description-Content-Type: text/markdown Requires-Dist: aiohttp +Requires-Dist: app@ git+https://molodetz.nl/retoor/app.git # Zhurnal diff --git a/src/Zhurnal.egg-info/requires.txt b/src/Zhurnal.egg-info/requires.txt index ee4ba4f..b290cb7 100644 --- a/src/Zhurnal.egg-info/requires.txt +++ b/src/Zhurnal.egg-info/requires.txt @@ -1 +1,2 @@ aiohttp +app@ git+https://molodetz.nl/retoor/app.git diff --git a/src/zhurnal/app.py b/src/zhurnal/app.py index 801ac8d..ce60390 100644 --- a/src/zhurnal/app.py +++ b/src/zhurnal/app.py @@ -4,7 +4,7 @@ import shlex import time from datetime import datetime from typing import List - +from app.app import Application as BaseApplication from aiohttp import web from zhurnal import log @@ -199,7 +199,7 @@ let scrollTop = window.scrollY; // Current scroll position """ -class Zhurnal(web.Application): +class Zhurnal(BaseApplication): def __init__(self, commands: List[str], *args, **kwargs): self.commands = commands or [] @@ -307,18 +307,34 @@ def parse_args(): "--host", type=str, default="localhost", + required=False, help="Hostname or IP address (default: localhost).", ) parser.add_argument( - "--port", type=int, default=8080, help="Port number (default: 8080)." + "--port", + type=int, + default=0, + required=False, + help="Port number (default: 8080).", + ) + parser.add_argument( + "--username", type=str, default=None, help="Username if auth is required." + ) + parser.add_argument( + "--password", type=str, default=None, help="Password if auth is required." ) return parser.parse_args() def cli(): args = parse_args() - app = Zhurnal(commands=args.commands) + app = Zhurnal( + commands=args.commands, + basic_username=args.username, + basic_password=args.password, + ) for command in args.commands: log.info(f"Preparing execution of {command}.") log.info(f"Host: {args.host} Port: {args.port}") - web.run_app(app, host=args.host, port=args.port) + + app.run(host=args.host, port=args.port)