X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/8acc22f11480dab297ad31fa80fa63bea15066c6..911470a610e47d9da5ea938b0887c3df62819b85:/src/black_primer/cli.py?ds=sidebyside diff --git a/src/black_primer/cli.py b/src/black_primer/cli.py index 83357a9..8360fc3 100644 --- a/src/black_primer/cli.py +++ b/src/black_primer/cli.py @@ -1,19 +1,26 @@ -#!/usr/bin/env python3 +# coding=utf8 import asyncio import logging import sys from datetime import datetime -from os import cpu_count from pathlib import Path from shutil import rmtree, which from tempfile import gettempdir -from typing import Any, Union +from typing import Any, Union, Optional import click from black_primer import lib +# If our environment has uvloop installed lets use it +try: + import uvloop + + uvloop.install() +except ImportError: + pass + DEFAULT_CONFIG = Path(__file__).parent / "primer.json" _timestamp = datetime.now().strftime("%Y%m%d%H%M%S") @@ -22,8 +29,8 @@ LOG = logging.getLogger(__name__) def _handle_debug( - ctx: click.core.Context, - param: Union[click.core.Option, click.core.Parameter], + ctx: Optional[click.core.Context], + param: Optional[Union[click.core.Option, click.core.Parameter]], debug: Union[bool, int, str], ) -> Union[bool, int, str]: """Turn on debugging if asked otherwise INFO default""" @@ -40,6 +47,7 @@ async def async_main( debug: bool, keep: bool, long_checkouts: bool, + no_diff: bool, rebase: bool, workdir: str, workers: int, @@ -55,13 +63,19 @@ async def async_main( try: ret_val = await lib.process_queue( - config, work_path, workers, keep, long_checkouts, rebase + config, + work_path, + workers, + keep, + long_checkouts, + rebase, + no_diff, ) return int(ret_val) finally: if not keep and work_path.exists(): LOG.debug(f"Removing {work_path}") - rmtree(work_path) + rmtree(work_path, onerror=lib.handle_PermissionError) return -2 @@ -96,6 +110,12 @@ async def async_main( show_default=True, help="Pull big projects to test", ) +@click.option( + "--no-diff", + is_flag=True, + show_default=True, + help="Disable showing source file changes in black output", +) @click.option( "-R", "--rebase", @@ -109,21 +129,21 @@ async def async_main( default=str(DEFAULT_WORKDIR), type=click.Path(exists=False), show_default=True, - help="Directory Path for repo checkouts", + help="Directory path for repo checkouts", ) @click.option( "-W", "--workers", - default=int((cpu_count() or 4) / 2) or 1, + default=2, type=int, show_default=True, help="Number of parallel worker coroutines", ) @click.pass_context def main(ctx: click.core.Context, **kwargs: Any) -> None: - """primer - prime projects for blackening ... 🏴""" + """primer - prime projects for blackening... 🏴""" LOG.debug(f"Starting {sys.argv[0]}") - # TODO: Change to asyncio.run when black >= 3.7 only + # TODO: Change to asyncio.run when Black >= 3.7 only loop = asyncio.get_event_loop() try: ctx.exit(loop.run_until_complete(async_main(**kwargs)))