Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

pipeclient.py: stop reader if pipe broken

Browse Source 
Prevent 100% cpu if Audacity quits while pipeclient still running.
This commit is contained in:
SteveDaulton 2020-06-15 23:17:13 +01:00
parent 7892e95d39
commit d31db975ee
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/piped-work/pipeclient.py Normal file → Executable file
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Automate Audacity via mod-script-pipe. """Automate Audacity via mod-script-pipe.
@ -93,7 +93,7 @@ else:
EOL = '\n' EOL = '\n'
class PipeClient(object): class PipeClient():
"""Write / read client access to Audacity via named pipes. """Write / read client access to Audacity via named pipes.
Normally there should be just one instance of this class. If Normally there should be just one instance of this class. If
@ -204,17 +204,19 @@ class PipeClient(object):
# Connection should occur as soon as _write_pipe has connected. # Connection should occur as soon as _write_pipe has connected.
read_pipe = open(READ_NAME, 'r') read_pipe = open(READ_NAME, 'r')
message = '' message = ''
while True: pipe_ok = True
while pipe_ok:
line = read_pipe.readline() line = read_pipe.readline()
# Stop timer as soon as we get first line of response. # Stop timer as soon as we get first line of response.
stop_time = time.time() stop_time = time.time()
while line != '\n': while pipe_ok and line != '\n':
message += line message += line
line = read_pipe.readline() line = read_pipe.readline()
if line == '': if line == '':
# No data in read_pipe indicates that the pipe is broken # No data in read_pipe indicates that the pipe is broken
# (Audacity may have crashed). # (Audacity may have crashed).
PipeClient.reader_pipe_broken.set() PipeClient.reader_pipe_broken.set()
pipe_ok = False
if self.timer: if self.timer:
xtime = (stop_time - self._start_time) * 1000 xtime = (stop_time - self._start_time) * 1000
message += 'Execution time: {0:.2f}ms'.format(xtime) message += 'Execution time: {0:.2f}ms'.format(xtime)
@ -236,18 +238,17 @@ class PipeClient(object):
""" """
if not PipeClient.reply_ready.isSet(): if not PipeClient.reply_ready.isSet():
return '' return ''
else: return self.reply
return self.reply
def bool_from_string(strval): def bool_from_string(strval):
"""Return boolean value from string""" """Return boolean value from string"""
if strval.lower() in ('true', 't', '1', 'yes', 'y'): if strval.lower() in ('true', 't', '1', 'yes', 'y'):
return True return True
elif strval.lower() in ('false', 'f', '0', 'no', 'n'): if strval.lower() in ('false', 'f', '0', 'no', 'n'):
return False return False
else: raise argparse.ArgumentTypeError('Boolean value expected.')
raise argparse.ArgumentTypeError('Boolean value expected.')
def main(): def main():
"""Interactive command-line for PipeClient""" """Interactive command-line for PipeClient"""
@ -271,10 +272,9 @@ def main():
while True: while True:
reply = '' reply = ''
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
#pylint: disable=undefined-variable message = input("\nEnter command or 'Q' to quit: ")
message = raw_input("\nEnter command or 'Q' to quit: ")
else: else:
message = input( #pylint: disable=bad-builtin message = input(
"\nEnter command or 'Q' to quit: ") "\nEnter command or 'Q' to quit: ")
start = time.time() start = time.time()
if message.upper() == 'Q': if message.upper() == 'Q':