Skip to content

fix(Command): Stop re-rendering tables for each row #2042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 1 commit into from
Jul 14, 2025
Merged

fix(Command): Stop re-rendering tables for each row #2042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions lib/Command/CirclesList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,25 +223,26 @@ private function displayCircles(array $circles): void {
$table->setHeaders(
['Single Id', 'Name', 'Config', 'Source', 'Owner', 'Instance', 'Population']
);
$table->render();

$displayName = $this->input->getOption('display-name');
$display = ($this->input->getOption('def') ? Circle::FLAGS_LONG : Circle::FLAGS_SHORT);
$rows = [];
foreach ($circles as $circle) {
$owner = $circle->getOwner();
$table->appendRow(
[
$circle->getSingleId(),
$this->cut(($displayName ? $circle->getDisplayName() : $circle->getName()), 40),
json_encode(Circle::getCircleFlags($circle, $display)),
Circle::$DEF_SOURCE[$circle->getSource()],
$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
$this->configService->displayInstance($owner->getInstance()),
((string)$circle->getPopulation()) . '/'
. ((string)$this->getInt('members_limit', $circle->getSettings(), -1))
. ' (' . ((string)$circle->getPopulationInherited()) . ')'
]
);
$rows[] = [
$circle->getSingleId(),
$this->cut(($displayName ? $circle->getDisplayName() : $circle->getName()), 40),
json_encode(Circle::getCircleFlags($circle, $display)),
Circle::$DEF_SOURCE[$circle->getSource()],
$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
$this->configService->displayInstance($owner->getInstance()),
((string)$circle->getPopulation()) . '/'
. ((string)$this->getInt('members_limit', $circle->getSettings(), -1))
. ' (' . ((string)$circle->getPopulationInherited()) . ')'
];
}

$table->setRows($rows);
$table->render();
}
}
25 changes: 13 additions & 12 deletions lib/Command/CirclesMemberships.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,28 +357,29 @@ private function manageAllMemberships() {
$output = $output->section();
$table = new Table($output);
$table->setHeaders(['Circle Id', 'Name', 'Source', 'Owner', 'Instance', 'Updated', 'Memberships']);
$table->render();

$count = 0;
$rows = [];
foreach ($circles as $circle) {
$owner = $circle->getOwner();

$updated = $this->membershipService->manageMemberships($circle->getSingleId());
$count += $updated;
$federatedUser = $this->circleRequest->getFederatedUserBySingleId($circle->getSingleId());
$table->appendRow(
[
$circle->getSingleId(),
$circle->getDisplayName(),
($circle->getSource() > 0) ? Circle::$DEF_SOURCE[$circle->getSource()] : '',
$owner->getUserId(),
$this->configService->displayInstance($owner->getInstance()),
$updated,
sizeof($federatedUser->getMemberships())
]
);
$rows[] = [
$circle->getSingleId(),
$circle->getDisplayName(),
($circle->getSource() > 0) ? Circle::$DEF_SOURCE[$circle->getSource()] : '',
$owner->getUserId(),
$this->configService->displayInstance($owner->getInstance()),
$updated,
sizeof($federatedUser->getMemberships())
];
}

$table->setRows($rows);
$table->render();

$output->writeln(((string)$count) . ' memberships updated');
}
}
23 changes: 12 additions & 11 deletions lib/Command/CirclesRemote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ private function checkRemoteInstances(): void {
$output = $output->section();
$table = new Table($output);
$table->setHeaders(['Instance', 'Type', 'iface', 'UID', 'Authed', 'Aliases']);
$table->render();

$rows = [];
foreach ($instances as $instance) {
try {
$current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance());
Expand All @@ -475,17 +475,18 @@ private function checkRemoteInstances(): void {
$currentUid = '<error>' . $e->getMessage() . '</error>';
}

$table->appendRow(
[
$instance->getInstance(),
$instance->getType(),
InterfaceService::$LIST_IFACE[$instance->getInterface()],
$instance->getUid(),
$currentUid,
json_encode($instance->getAliases())
]
);
$rows[] = [
$instance->getInstance(),
$instance->getType(),
InterfaceService::$LIST_IFACE[$instance->getInterface()],
$instance->getUid(),
$currentUid,
json_encode($instance->getAliases())
];
}

$table->setRows($rows);
$table->render();
}


Expand Down
33 changes: 17 additions & 16 deletions lib/Command/CirclesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$output = new ConsoleOutput();
$table = new Table($output->section());
$table->setHeaders(['SingleId', 'Circle Name', 'Type']);
$table->render();

$rows = [];
foreach ($circles as $entry) {
$table->appendRow(
[
$entry->getSingleId(),
$entry->getDisplayName(),
Circle::$DEF_SOURCE[$entry->getSource()]
]
);
$rows[] = [
$entry->getSingleId(),
$entry->getDisplayName(),
Circle::$DEF_SOURCE[$entry->getSource()]
];
}

$table->setRows($rows);
$table->render();

return 0;
$federatedUser = $circlesManager->getFederatedUser('test1', Member::TYPE_USER);
Expand Down Expand Up @@ -204,18 +204,19 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$output = new ConsoleOutput();
$table = new Table($output->section());
$table->setHeaders(['SingleId', 'Circle Name', 'Type']);
$table->render();

$rows = [];
foreach ($circles as $entry) {
$table->appendRow(
[
$entry->getSingleId(),
$entry->getDisplayName(),
Circle::$DEF_SOURCE[$entry->getSource()]
]
);
$rows[] = [
$entry->getSingleId(),
$entry->getDisplayName(),
Circle::$DEF_SOURCE[$entry->getSource()]
];
}

$table->setRows($rows);
$table->render();


// exit
return 0;
Expand Down
43 changes: 22 additions & 21 deletions lib/Command/MembersList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,37 +215,38 @@ protected function execute(InputInterface $input, OutputInterface $output): int
'Username', 'Level', 'Invited By'
]
);
$table->render();

$rows = [];
foreach ($members as $member) {
if ($member->getCircleId() === $circleId) {
$level = $member->getLevel();
} else {
$level = $member->getInheritanceFrom()->getLevel();
}

$table->appendRow(
[
$member->getCircleId(),
$member->getCircle()->getDisplayName(),
$member->getId(),
$member->getSingleId(),
Member::$TYPE[$member->getUserType()],
$member->hasBasedOn() ? Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()] : '',
$this->configService->displayFederatedUser(
$member,
$this->input->getOption('display-name')
),
($level > 0) ? Member::$DEF_LEVEL[$level] :
'(' . strtolower($member->getStatus()) . ')',
($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
$member->getInvitedBy(),
$this->input->getOption('display-name')
) : 'Unknown'
]
);
$rows[] = [
$member->getCircleId(),
$member->getCircle()->getDisplayName(),
$member->getId(),
$member->getSingleId(),
Member::$TYPE[$member->getUserType()],
$member->hasBasedOn() ? Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()] : '',
$this->configService->displayFederatedUser(
$member,
$this->input->getOption('display-name')
),
($level > 0) ? Member::$DEF_LEVEL[$level] :
'(' . strtolower($member->getStatus()) . ')',
($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
$member->getInvitedBy(),
$this->input->getOption('display-name')
) : 'Unknown'
];
}

$table->setRows($rows);
$table->render();

return 0;
}

Expand Down
19 changes: 10 additions & 9 deletions lib/Command/MembersSearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,21 @@ private function displaySearchResult(array $result) {
$output = $output->section();
$table = new Table($output);
$table->setHeaders(['SingleId', 'UserId', 'UserType', 'Instance']);
$table->render();

$rows = [];
foreach ($result as $entry) {
if (!$result instanceof IFederatedUser) {
continue;
}
$table->appendRow(
[
$entry->getSingleId(),
$entry->getUserId(),
Member::$TYPE[$entry->getUserType()],
$this->configService->displayInstance($entry->getInstance())
]
);
$rows[] = [
$entry->getSingleId(),
$entry->getUserId(),
Member::$TYPE[$entry->getUserType()],
$this->configService->displayInstance($entry->getInstance())
];
}

$table->setRows($rows);
$table->render();
}
}
7 changes: 5 additions & 2 deletions lib/Command/SharesFiles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ private function displayShares(
}

$table->setHeaders($headers);
$table->render();

$rows = [];
foreach ($shareWrappers as $share) {
if (!$filterRecipient) {
$recipient = $share->getInitiator();
Expand Down Expand Up @@ -230,8 +230,11 @@ private function displayShares(
);
}

$table->appendRow($row);
$rows[] = $row;
}

$table->setRows($rows);
$table->render();
}


Expand Down
Loading