💄 chore: optimize cli logic

This commit is contained in:
SigureMo 2021-05-05 18:26:51 +08:00
parent 1bc1769448
commit 1421656bcc
No known key found for this signature in database
GPG Key ID: F99A3CD7BD76B247
3 changed files with 11 additions and 34 deletions

View File

@ -1,12 +0,0 @@
FROM python:3.10.0a7-alpine3.13
RUN set -x; apk add gcc \
&& apk add musl-dev \
&& apk add build-base \
&& pip install -U setuptools pip \
&& pip install cython \
&& pip install pytest \
&& pip install aiohttp \
&& pip install aiofiles \
&& pip install asyncio \
&& pip install uvloop

View File

@ -1,14 +1,3 @@
DOCKER_NAME := "siguremo/yutto-env:v1"
docker-run:
docker run -it --mount type=bind,source=`pwd`,destination=/src/yutto -w /src/yutto siguremo/{{DOCKER_NAME}} python -m yutto
docker-test:
docker run -it --mount type=bind,source=`pwd`,destination=/src/yutto -w /src/yutto siguremo/{{DOCKER_NAME}} pytest
docker-build-env:
docker build -t siguremo/{{DOCKER_NAME}} .
run:
python3 -m yutto
@ -20,7 +9,7 @@ release:
just clean-builds
upgrade-pip:
python3 -m pip install --upgrade yutto
python3 -m pip install --upgrade --pre yutto
upgrade:
python3 setup.py build

View File

@ -47,7 +47,7 @@ def main():
parser.add_argument("--embed-subtitle", default=None, help="(待实现)将字幕文件嵌入到视频中(需输入语言代码)")
parser.add_argument("--no-color", action="store_true", help="不使用颜色")
parser.add_argument("--debug", action="store_true", help="启用 debug 模式")
parser.set_defaults(action=run)
# parser.set_defaults(action=run)
subparsers = parser.add_subparsers()
# 子命令 get
@ -56,7 +56,7 @@ def main():
# 子命令 info
# TODO
# 子命令 batch
parser_batch = subparsers.add_parser("batch", help="批量获取视频")
parser_batch = subparsers.add_parser("batch", help="批量获取视频(需使用其子命令 get/info")
subparsers_batch = parser_batch.add_subparsers()
# 子命令 batch get
parser_batch_get = subparsers_batch.add_parser("get", help="批量获取视频")
@ -65,14 +65,14 @@ def main():
# TODO
# 执行各自的 action
args = parser.parse_args()
check_options.check_basic_options(args)
args.action(args)
def run(args: argparse.Namespace):
Logger.error("未指定子命令 (get, info, batch)")
Logger.info("yutto version: {}".format(colored_string(__version__, fore="green")))
Logger.info("FFmpeg version: {}".format(colored_string(FFmpeg().version, fore="blue")))
if "action" in args:
check_options.check_basic_options(args)
args.action(args)
else:
Logger.error("未指定子命令 (get, info, batch)")
Logger.info("yutto version: {}".format(colored_string(__version__, fore="green")))
Logger.info("FFmpeg version: {}".format(colored_string(FFmpeg().version, fore="blue")))
parser.print_help()
if __name__ == "__main__":