Page MenuHomestyx hydra
Files F233746

No OneTemporary
Actions

View Options

diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php
index 8b5af5fc19..7d5bb68e50 100644
--- a/src/applications/repository/query/PhabricatorRepositoryQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php
@@ -1,133 +1,172 @@
<?php
final class PhabricatorRepositoryQuery
extends PhabricatorCursorPagedPolicyAwareQuery {
private $ids;
private $phids;
private $callsigns;
+ const STATUS_OPEN = 'status-open';
+ const STATUS_CLOSED = 'status-closed';
+ const STATUS_ALL = 'status-all';
+ private $status = self::STATUS_ALL;
+
private $needMostRecentCommits;
private $needCommitCounts;
public function withIDs(array $ids) {
$this->ids = $ids;
return $this;
}
public function withPHIDs(array $phids) {
$this->phids = $phids;
return $this;
}
public function withCallsigns(array $callsigns) {
$this->callsigns = $callsigns;
return $this;
}
protected function getReversePaging() {
return true;
}
+ public function withStatus($status) {
+ $this->status = $status;
+ return $this;
+ }
+
public function needCommitCounts($need_counts) {
$this->needCommitCounts = $need_counts;
return $this;
}
public function needMostRecentCommits($need_commits) {
$this->needMostRecentCommits = $need_commits;
return $this;
}
+
protected function loadPage() {
$table = new PhabricatorRepository();
$conn_r = $table->establishConnection('r');
$data = queryfx_all(
$conn_r,
'SELECT * FROM %T r %Q %Q %Q %Q',
$table->getTableName(),
$this->buildJoinsClause($conn_r),
$this->buildWhereClause($conn_r),
$this->buildOrderClause($conn_r),
$this->buildLimitClause($conn_r));
$repositories = $table->loadAllFromArray($data);
if ($this->needCommitCounts) {
$sizes = ipull($data, 'size', 'id');
foreach ($repositories as $id => $repository) {
$repository->attachCommitCount(nonempty($sizes[$id], 0));
}
}
if ($this->needMostRecentCommits) {
$commit_ids = ipull($data, 'lastCommitID', 'id');
$commit_ids = array_filter($commit_ids);
if ($commit_ids) {
$commits = id(new DiffusionCommitQuery())
->setViewer($this->getViewer())
->withIDs($commit_ids)
->execute();
} else {
$commits = array();
}
foreach ($repositories as $id => $repository) {
$commit = null;
if (idx($commit_ids, $id)) {
$commit = idx($commits, $commit_ids[$id]);
}
$repository->attachMostRecentCommit($commit);
}
}
return $repositories;
}
+ public function willFilterPage(array $repositories) {
+ assert_instances_of($repositories, 'PhabricatorRepository');
+
+ // TODO: Denormalize repository status into the PhabricatorRepository
+ // table so we can do this filtering in the database.
+ foreach ($repositories as $key => $repo) {
+ $status = $this->status;
+ switch ($status) {
+ case self::STATUS_OPEN:
+ if (!$repo->isTracked()) {
+ unset($repositories[$key]);
+ }
+ break;
+ case self::STATUS_CLOSED:
+ if ($repo->isTracked()) {
+ unset($repositories[$key]);
+ }
+ break;
+ case self::STATUS_ALL:
+ break;
+ default:
+ throw new Exception("Unknown status '{$status}'!");
+ }
+ }
+
+ return $repositories;
+ }
+
private function buildJoinsClause(AphrontDatabaseConnection $conn_r) {
$joins = array();
$join_summary_table = $this->needCommitCounts ||
$this->needMostRecentCommits;
if ($join_summary_table) {
$joins[] = qsprintf(
$conn_r,
'LEFT JOIN %T summary ON r.id = summary.repositoryID',
PhabricatorRepository::TABLE_SUMMARY);
}
return implode(' ', $joins);
}
private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
$where = array();
if ($this->ids) {
$where[] = qsprintf(
$conn_r,
'r.id IN (%Ld)',
$this->ids);
}
if ($this->phids) {
$where[] = qsprintf(
$conn_r,
'r.phid IN (%Ls)',
$this->phids);
}
if ($this->callsigns) {
$where[] = qsprintf(
$conn_r,
'r.callsign IN (%Ls)',
$this->callsigns);
}
$where[] = $this->buildPagingClause($conn_r);
return $this->formatWhereClause($where);
}
}
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
index f4aaa74f1d..51c8d68641 100644
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -1,66 +1,98 @@
<?php
final class PhabricatorRepositorySearchEngine
extends PhabricatorApplicationSearchEngine {
public function buildSavedQueryFromRequest(AphrontRequest $request) {
$saved = new PhabricatorSavedQuery();
$saved->setParameter('callsigns', $request->getStrList('callsigns'));
+ $saved->setParameter('status', $request->getStr('status'));
return $saved;
}
public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
$query = id(new PhabricatorRepositoryQuery())
->needCommitCounts(true)
->needMostRecentCommits(true);
$callsigns = $saved->getParameter('callsigns');
if ($callsigns) {
$query->withCallsigns($callsigns);
}
+ $status = $saved->getParameter('status');
+ $status = idx($this->getStatusValues(), $status);
+ if ($status) {
+ $query->withStatus($status);
+ }
+
return $query;
}
public function buildSearchForm(
AphrontFormView $form,
PhabricatorSavedQuery $saved_query) {
$callsigns = $saved_query->getParameter('callsigns', array());
$form
->appendChild(
id(new AphrontFormTextControl())
->setName('callsigns')
->setLabel(pht('Callsigns'))
- ->setValue(implode(', ', $callsigns)));
+ ->setValue(implode(', ', $callsigns)))
+ ->appendChild(
+ id(new AphrontFormSelectControl())
+ ->setName('status')
+ ->setLabel(pht('Status'))
+ ->setValue($saved_query->getParameter('status'))
+ ->setOptions($this->getStatusOptions()));
}
protected function getURI($path) {
return '/diffusion/'.$path;
}
public function getBuiltinQueryNames() {
$names = array(
+ 'active' => pht('Active Repositories'),
'all' => pht('All Repositories'),
);
return $names;
}
public function buildSavedQueryFromBuiltin($query_key) {
$query = $this->newSavedQuery();
$query->setQueryKey($query_key);
switch ($query_key) {
+ case 'active':
+ return $query->setParameter('status', 'open');
case 'all':
return $query;
}
return parent::buildSavedQueryFromBuiltin($query_key);
}
+ private function getStatusOptions() {
+ return array(
+ '' => pht('Active and Inactive Repositories'),
+ 'open' => pht('Active Repositories'),
+ 'closed' => pht('Inactive Repositories'),
+ );
+ }
+
+ private function getStatusValues() {
+ return array(
+ '' => PhabricatorRepositoryQuery::STATUS_ALL,
+ 'open' => PhabricatorRepositoryQuery::STATUS_OPEN,
+ 'closed' => PhabricatorRepositoryQuery::STATUS_CLOSED,
+ );
+ }
+
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Jul 28, 10:50 AM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
186718
Default Alt Text
(7 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)