sam/shlax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Proc.quiet

Browse Source
This commit is contained in:
jpic 2020-05-30 18:32:36 +02:00
parent b044dd015e
commit e62d44514a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
shlax/proc.py
View File

@ -32,21 +32,21 @@ class PrefixStreamProtocol(asyncio.subprocess.SubprocessStreamProtocol):
make asynchronous output readable. make asynchronous output readable.
""" """
def __init__(self, output, *args, **kwargs): def __init__(self, proc, *args, **kwargs):
self.output = output self.proc = proc
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
def pipe_data_received(self, fd, data): def pipe_data_received(self, fd, data):
if self.output.debug is True or 'out' in str(self.output.debug): if self.proc.output.debug is True or 'out' in str(self.proc.output.debug):
if fd in (1, 2): if fd in (1, 2):
self.output(data) self.proc.output(data)
super().pipe_data_received(fd, data) super().pipe_data_received(fd, data)
def protocol_factory(output): def protocol_factory(proc):
def _p(): def _p():
return PrefixStreamProtocol( return PrefixStreamProtocol(
output, proc,
limit=asyncio.streams._DEFAULT_LIMIT, limit=asyncio.streams._DEFAULT_LIMIT,
loop=asyncio.events.get_event_loop() loop=asyncio.events.get_event_loop()
) )
@ -69,7 +69,10 @@ class Proc:
""" """
test = False test = False
def __init__(self, *args, prefix=None, raises=True, output=None): def __init__(self, *args, prefix=None, raises=True, output=None, quiet=False):
if quiet:
self.output = Output(debug=False)
else:
self.output = output or Output() self.output = output or Output()
self.cmd = ' '.join(args) self.cmd = ' '.join(args)
self.args = args self.args = args
@ -112,7 +115,7 @@ class Proc:
loop = asyncio.events.get_event_loop() loop = asyncio.events.get_event_loop()
transport, protocol = await loop.subprocess_exec( transport, protocol = await loop.subprocess_exec(
protocol_factory(self.output), *self.args) protocol_factory(self), *self.args)
self.proc = asyncio.subprocess.Process(transport, protocol, loop) self.proc = asyncio.subprocess.Process(transport, protocol, loop)
self.called = True self.called = True