diff --git a/src/misc/Progress.js b/src/misc/Progress.js index c5a58c6..f07f044 100644 --- a/src/misc/Progress.js +++ b/src/misc/Progress.js @@ -28,6 +28,8 @@ function init(props) { drop: 0, dup: 0, frames: 0, + cpu: 0, + memory: 0, ...props, }; @@ -54,6 +56,32 @@ export default function Progress(props) { + + + + % + + + + CPU + + + + + + + + + MB + + + + Memory + + + + + diff --git a/src/misc/modals/Process.js b/src/misc/modals/Process.js index 3eee837..37645f9 100644 --- a/src/misc/modals/Process.js +++ b/src/misc/modals/Process.js @@ -38,11 +38,26 @@ const initLogdata = (logdata) => { logdata = {}; } - return { + const data = { + command: [], prelude: [], log: [], ...logdata, }; + + if (!Array.isArray(data.command)) { + data.command = []; + } + + if (!Array.isArray(data.prelude)) { + data.prelude = []; + } + + if (!Array.isArray(data.prelude)) { + data.prelude = []; + } + + return data; }; const formatLogline = (entry) => { @@ -65,7 +80,10 @@ const formatLogline = (entry) => { const Component = function (props) { const classes = useStyles(); - const logdata = initLogdata(props.logdata); + const logdata = initLogdata({ + ...props.logdata, + command: props.progress?.command, + }); return ( @@ -77,6 +95,15 @@ const Component = function (props) {
+ + Command + +