From a575c0cfe362729dcb6fb2682728e2ecb9b96872 Mon Sep 17 00:00:00 2001 From: Master-Guy <566429+Master-Guy@users.noreply.github.com> Date: Thu, 17 Mar 2022 17:50:39 +0100 Subject: [PATCH] Tabelize linked output of `ls` --- src/Terminal/commands/ls.tsx | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/Terminal/commands/ls.tsx b/src/Terminal/commands/ls.tsx index ff001a064..409822683 100644 --- a/src/Terminal/commands/ls.tsx +++ b/src/Terminal/commands/ls.tsx @@ -139,10 +139,12 @@ export function ls( }), )(); - const rowSplit = row - .split(" ") - .map((x) => x.trim()) - .filter((x) => !!x); + console.log(row); + + const rowSplit = row.split("~"); + let rowSplitArray = rowSplit.map((x) => [x.trim(), x.replace(x.trim(), "")]); + console.log(rowSplitArray); + rowSplitArray = rowSplitArray.filter((x) => !!x); function onScriptLinkClick(filename: string): void { if (player.getCurrentServer().hostname !== hostname) { @@ -156,9 +158,14 @@ export function ls( return ( - {rowSplit.map((rowItem) => ( - onScriptLinkClick(rowItem)}> - {rowItem} + {rowSplitArray.map((rowItem) => ( + + onScriptLinkClick(rowItem[0])}> + {rowItem[0]} + + + {rowItem[1]} + ))} @@ -174,16 +181,19 @@ export function ls( if (!(i < segments.length)) break; row += segments[i]; row += " ".repeat(maxLength * (col + 1) - row.length); + if(linked) { + row += "~"; + } i++; } i--; if (!style) { terminal.print(row); } else if (linked) { - terminal.printRaw(); - } else { - terminal.printRaw({row}); - } + terminal.printRaw(); + } else { + terminal.printRaw({row}); + } } }