morgan/gnome-shell-extension-freon
1
0
Fork 0
mirror of https://github.com/morgan9e/gnome-shell-extension-freon synced 2026-04-15 00:44:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

commandLineUtil: refactor to use GSubprocess

Browse Source 
This means doing all IO in a background thread, rather than popping
lines synchronously off a pipe.
This commit is contained in:
Andy Holmes
2021-04-25 21:49:36 -07:00
parent 3222eb7bfa
commit e37b6c6c6e
1 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
freon@UshakovVasilii_Github.yahoo.com/commandLineUtil.js
View File

@@ -12,42 +12,23 @@ var CommandLineUtil = class {
execute(callback) {
try{
this._callback = callback;
let [exit, pid, stdinFd, stdoutFd, stderrFd] =
GLib.spawn_async_with_pipes(null, /* cwd */
this._argv, /* args */
null, /* env */
GLib.SpawnFlags.DO_NOT_REAP_CHILD,
null /* child_setup */);
let stdout = new Gio.UnixInputStream({fd: stdoutFd, close_fd: true});
let outReader = new Gio.DataInputStream({base_stream: stdout});
let stderr = new Gio.UnixInputStream({fd: stderrFd, close_fd: true});
let errReader = new Gio.DataInputStream({base_stream: stderr});
let proc = Gio.Subprocess.new(this._argv,
Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE);
GLib.close(stdinFd);
proc.communicate_utf8_async(null, null, (proc, result) => {
try {
let [, stdout, stderr] = proc.communicate_utf8_finish(result);
let childWatch = GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, (pid, status, requestObj) => {
let output = [];
let error_output = [];
let [line, size] = [null, 0];
while (([line, size] = outReader.read_line(null)) != null && line != null) {
if(line)
output.push(ByteArray.toString(line));
this._output = stdout ? stdout.split('\n') : [];
this._error_output = stderr ? stderr.split('\n') : [];
} catch (e) {
logError(e);
} finally {
this._updated = true;
callback();
}
stdout.close(null);
while (([line, size] = errReader.read_line(null)) != null && line != null) {
if(line)
error_output.push(ByteArray.toString(line));
}
stderr.close(null);
GLib.source_remove(childWatch);
this._output = output;
this._error_output = error_output;
this._updated = true;
callback();
});
} catch(e){
global.log(e.toString());