Simplify single-file vs. multi-file modes
This commit is contained in:
parent
8429f3a63b
commit
15d5e36ea3
53
black.py
53
black.py
@ -200,23 +200,31 @@ def main(
|
|||||||
return
|
return
|
||||||
|
|
||||||
elif len(sources) == 1:
|
elif len(sources) == 1:
|
||||||
return_code = run_single_file_mode(
|
return_code = reformat_one(sources[0], line_length, fast, quiet, write_back)
|
||||||
line_length, check, fast, quiet, write_back, sources[0]
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
return_code = run_multi_file_mode(line_length, fast, quiet, write_back, sources)
|
loop = asyncio.get_event_loop()
|
||||||
|
executor = ProcessPoolExecutor(max_workers=os.cpu_count())
|
||||||
|
return_code = 1
|
||||||
|
try:
|
||||||
|
return_code = loop.run_until_complete(
|
||||||
|
schedule_formatting(
|
||||||
|
sources, line_length, write_back, fast, quiet, loop, executor
|
||||||
|
)
|
||||||
|
)
|
||||||
|
finally:
|
||||||
|
shutdown(loop)
|
||||||
ctx.exit(return_code)
|
ctx.exit(return_code)
|
||||||
|
|
||||||
|
|
||||||
def run_single_file_mode(
|
def reformat_one(
|
||||||
line_length: int,
|
src: Path, line_length: int, fast: bool, quiet: bool, write_back: WriteBack
|
||||||
check: bool,
|
|
||||||
fast: bool,
|
|
||||||
quiet: bool,
|
|
||||||
write_back: WriteBack,
|
|
||||||
src: Path,
|
|
||||||
) -> int:
|
) -> int:
|
||||||
report = Report(check=check, quiet=quiet)
|
"""Reformat a single file under `src` without spawning child processes.
|
||||||
|
|
||||||
|
If `quiet` is True, non-error messages are not output. `line_length`,
|
||||||
|
`write_back`, and `fast` options are passed to :func:`format_file_in_place`.
|
||||||
|
"""
|
||||||
|
report = Report(check=write_back is WriteBack.NO, quiet=quiet)
|
||||||
try:
|
try:
|
||||||
changed = Changed.NO
|
changed = Changed.NO
|
||||||
if not src.is_file() and str(src) == "-":
|
if not src.is_file() and str(src) == "-":
|
||||||
@ -246,27 +254,6 @@ def run_single_file_mode(
|
|||||||
return report.return_code
|
return report.return_code
|
||||||
|
|
||||||
|
|
||||||
def run_multi_file_mode(
|
|
||||||
line_length: int,
|
|
||||||
fast: bool,
|
|
||||||
quiet: bool,
|
|
||||||
write_back: WriteBack,
|
|
||||||
sources: List[Path],
|
|
||||||
) -> int:
|
|
||||||
loop = asyncio.get_event_loop()
|
|
||||||
executor = ProcessPoolExecutor(max_workers=os.cpu_count())
|
|
||||||
return_code = 1
|
|
||||||
try:
|
|
||||||
return_code = loop.run_until_complete(
|
|
||||||
schedule_formatting(
|
|
||||||
sources, line_length, write_back, fast, quiet, loop, executor
|
|
||||||
)
|
|
||||||
)
|
|
||||||
finally:
|
|
||||||
shutdown(loop)
|
|
||||||
return return_code
|
|
||||||
|
|
||||||
|
|
||||||
async def schedule_formatting(
|
async def schedule_formatting(
|
||||||
sources: List[Path],
|
sources: List[Path],
|
||||||
line_length: int,
|
line_length: int,
|
||||||
|
Loading…
Reference in New Issue
Block a user