yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated cmd.py with Mic92 changes to fit previous changes

Browse Source
This commit is contained in:
Qubasa
2024-01-10 17:18:21 +01:00
parent 7049573d28
commit 6f27cd8b6a
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/clan-cli/clan_cli/cmd.py
View File

@@ -19,8 +19,13 @@ class CmdOut(NamedTuple):
stderr: str stderr: str
cwd: Path cwd: Path
class Log(Enum):
STDERR = 1
STDOUT = 2
BOTH = 3
def handle_output(process: subprocess.Popen) -> tuple[str, str]:
def handle_output(process: subprocess.Popen, log: Log) -> tuple[str, str]:
rlist = [process.stdout, process.stderr] rlist = [process.stdout, process.stderr]
stdout_buf = b"" stdout_buf = b""
stderr_buf = b"" stderr_buf = b""
@@ -37,21 +42,25 @@ def handle_output(process: subprocess.Popen) -> tuple[str, str]:
return b"" return b""
ret = handle_fd(process.stdout) ret = handle_fd(process.stdout)
sys.stdout.buffer.write(ret) if log in [Log.STDOUT, Log.BOTH]:
sys.stdout.buffer.write(ret)
stdout_buf += ret stdout_buf += ret
ret = handle_fd(process.stderr) ret = handle_fd(process.stderr)
sys.stderr.buffer.write(ret)
if log in [Log.STDERR, Log.BOTH]:
sys.stderr.buffer.write(ret)
stderr_buf += ret stderr_buf += ret
return stdout_buf.decode("utf-8"), stderr_buf.decode("utf-8") return stdout_buf.decode("utf-8"), stderr_buf.decode("utf-8")
def run(cmd: list[str], cwd: Path = Path.cwd()) -> CmdOut: def run(cmd: list[str], cwd: Path = Path.cwd(), log = Log.BOTH) -> CmdOut:
# Start the subprocess # Start the subprocess
process = subprocess.Popen( process = subprocess.Popen(
cmd, cwd=str(cwd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True cmd, cwd=str(cwd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
) )
stdout_buf, stderr_buf = handle_output(process) stdout_buf, stderr_buf = handle_output(process, log)
# Wait for the subprocess to finish # Wait for the subprocess to finish
rc = process.wait() rc = process.wait()