fxreader.online/freelance-project-34-marketing-blog
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[~] Refactor

Browse Source
This commit is contained in:
Siarhei Siniak 2023-01-01 21:23:41 +03:00
parent bc0c8cc85c
commit c27d6f5760
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dotfiles/.local/bin/commands
View File

@ -58,8 +58,12 @@ def intercept_output(
current_subprocess, current_subprocess,
return_aggregated=None, return_aggregated=None,
transform_callback=None, transform_callback=None,
real_time=None,
timeout=None, timeout=None,
): ):
if real_time is None:
real_time = False
start_timestamp = datetime.datetime.now() start_timestamp = datetime.datetime.now()
if not return_aggregated: if not return_aggregated:
@ -74,7 +78,7 @@ def intercept_output(
while not ( while not (
not current_subprocess.poll() is None and \ not current_subprocess.poll() is None and \
not last_data is None and len(last_data) == 0 not last_data is None
): ):
if not timeout is None and \ if not timeout is None and \
(datetime.datetime.now() - start_timestamp).total_seconds() > timeout: (datetime.datetime.now() - start_timestamp).total_seconds() > timeout:
@ -97,7 +101,7 @@ def intercept_output(
if not t5 is None: if not t5 is None:
t6 = t5 t6 = t5
os.write(sys.stdout.fileno(), t6) os.write(sys.stdout.fileno(), t6)
else: elif real_time:
yield dict( yield dict(
data=b'', data=b'',
aggregated=False, aggregated=False,
@ -1050,7 +1054,6 @@ def pass_ssh_osx(argv):
data2 = None data2 = None
if pinentry_delimeter in data: if pinentry_delimeter in data:
hide_password = True hide_password = True
pos = data.rfind(pinentry_delimeter) pos = data.rfind(pinentry_delimeter)
@ -1072,7 +1075,8 @@ def pass_ssh_osx(argv):
current_subprocess=p, current_subprocess=p,
return_aggregated=True, return_aggregated=True,
transform_callback=transform_callback, transform_callback=transform_callback,
timeout=10, real_time=True,
#timeout=10,
): ):
if chunk['aggregated']: if chunk['aggregated']:
last_chunk = chunk last_chunk = chunk
@ -1259,7 +1263,10 @@ def desktop_services(argv):
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
) )
self.output = intercept_output(self.swayidle) self.output = intercept_output(
self.swayidle,
real_time=True,
)
self.events = [] self.events = []
self.data = [] self.data = []
@ -1463,7 +1470,7 @@ def socat_ssh(argv):
) )
options, args = parser.parse_args(argv) options, args = parser.parse_args(argv)
ssh_command = ['ssh', '-T'] ssh_command = ['ssh', '-T', '-C']
if not options.ssh_key is None: if not options.ssh_key is None:
subprocess.check_call(['ssh-add', options.ssh_key]) subprocess.check_call(['ssh-add', options.ssh_key])