Merge pull request #40081 from owncloud/issue-39930

phil-davis · web-flow · commit c464ff4e38c1 · 2022-05-19T22:03:16.000+05:45
Display each app only once in app:list --minimal
diff --git a/changelog/unreleased/39930 b/changelog/unreleased/39930
@@ -0,0 +1,7 @@
+Bugfix: List apps only once
+
+`occ app:list --minimal`
+could display apps twice in the listing. Each app is now displayed only once.
+
+https://github.com/owncloud/core/issues/39930
+https://github.com/owncloud/core/pull/40081
diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php
@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 				$appDetailRecord = [];
 
 				if ($minimalView) {
-					$apps['enabled'][] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');
+					$apps['enabled'][$app] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');
 					continue;
 				}
 
@@ -141,7 +141,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 				$appDetailRecord = [];
 
 				if ($minimalView) {
-					$apps['disabled'][] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');
+					$apps['disabled'][$app] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');
 					continue;
 				}
 
@@ -154,6 +154,14 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			}
 		}
 
+		if ($minimalView) {
+			// For minimal view we do not want writeArrayInOutputFormat to write a key-value format
+			// The app name and version are already formatted in the string that is the array value.
+			// So just keep the array values.
+			$apps['enabled'] = \array_values($apps['enabled']);
+			$apps['disabled'] = \array_values($apps['disabled']);
+		}
+
 		$this->writeAppList($input, $output, $apps);
 		return 0;
 	}

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {`
`122`	`122`	`$appDetailRecord = [];`
`123`	`123`
`124`	`124`	`if ($minimalView) {`
`125`		`- $apps['enabled'][] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');`
	`125`	`+ $apps['enabled'][$app] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');`
`126`	`126`	`continue;`
`127`	`127`	`}`
`128`	`128`
`@@ -141,7 +141,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {`
`141`	`141`	`$appDetailRecord = [];`
`142`	`142`
`143`	`143`	`if ($minimalView) {`
`144`		`- $apps['disabled'][] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');`
	`144`	`+ $apps['disabled'][$app] = sprintf('%s%s', $app, isset($versions[$app]) ? ' '.$versions[$app] : '');`
`145`	`145`	`continue;`
`146`	`146`	`}`
`147`	`147`
`@@ -154,6 +154,14 @@ protected function execute(InputInterface $input, OutputInterface $output) {`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ if ($minimalView) {`
	`158`	`+ // For minimal view we do not want writeArrayInOutputFormat to write a key-value format`
	`159`	`+ // The app name and version are already formatted in the string that is the array value.`
	`160`	`+ // So just keep the array values.`
	`161`	`+ $apps['enabled'] = \array_values($apps['enabled']);`
	`162`	`+ $apps['disabled'] = \array_values($apps['disabled']);`
	`163`	`+ }`
	`164`	`+`
`157`	`165`	`$this->writeAppList($input, $output, $apps);`
`158`	`166`	`return 0;`
`159`	`167`	`}`