Page MenuHomestyx hydra
Files F128479

No OneTemporary
Actions

View Options

diff --git a/src/applications/paste/controller/PhabricatorPasteListController.php b/src/applications/paste/controller/PhabricatorPasteListController.php
index c46b4cae43..c4134972ca 100644
--- a/src/applications/paste/controller/PhabricatorPasteListController.php
+++ b/src/applications/paste/controller/PhabricatorPasteListController.php
@@ -1,82 +1,26 @@
<?php
-/**
- * @group paste
- */
-final class PhabricatorPasteListController extends PhabricatorPasteController
- implements PhabricatorApplicationSearchResultsControllerInterface {
+final class PhabricatorPasteListController extends PhabricatorPasteController {
private $queryKey;
public function shouldAllowPublic() {
return true;
}
public function willProcessRequest(array $data) {
$this->queryKey = idx($data, 'queryKey');
}
public function processRequest() {
$request = $this->getRequest();
$controller = id(new PhabricatorApplicationSearchController($request))
->setQueryKey($this->queryKey)
->setSearchEngine(new PhabricatorPasteSearchEngine())
->setNavigation($this->buildSideNavView());
return $this->delegateToController($controller);
}
- public function renderResultsList(
- array $pastes,
- PhabricatorSavedQuery $query) {
- assert_instances_of($pastes, 'PhabricatorPaste');
-
- $user = $this->getRequest()->getUser();
-
- $this->loadHandles(mpull($pastes, 'getAuthorPHID'));
-
- $lang_map = PhabricatorEnv::getEnvConfig('pygments.dropdown-choices');
-
- $list = new PHUIObjectItemListView();
- $list->setUser($user);
- foreach ($pastes as $paste) {
- $created = phabricator_date($paste->getDateCreated(), $user);
- $author = $this->getHandle($paste->getAuthorPHID())->renderLink();
- $source_code = $this->buildSourceCodeView($paste, 5)->render();
-
- $source_code = phutil_tag(
- 'div',
- array(
- 'class' => 'phabricator-source-code-summary',
- ),
- $source_code);
-
- $line_count = count(explode("\n", $paste->getContent()));
- $line_count = pht(
- '%s Line(s)',
- new PhutilNumber($line_count));
-
- $title = nonempty($paste->getTitle(), pht('(An Untitled Masterwork)'));
-
- $item = id(new PHUIObjectItemView())
- ->setObjectName('P'.$paste->getID())
- ->setHeader($title)
- ->setHref('/P'.$paste->getID())
- ->setObject($paste)
- ->addByline(pht('Author: %s', $author))
- ->addIcon('none', $line_count)
- ->appendChild($source_code);
-
- $lang_name = $paste->getLanguage();
- if ($lang_name) {
- $lang_name = idx($lang_map, $lang_name, $lang_name);
- $item->addIcon('none', $lang_name);
- }
-
- $list->addItem($item);
- }
-
- return $list;
- }
}
diff --git a/src/applications/paste/query/PhabricatorPasteSearchEngine.php b/src/applications/paste/query/PhabricatorPasteSearchEngine.php
index 542931edb9..18e63e3b2e 100644
--- a/src/applications/paste/query/PhabricatorPasteSearchEngine.php
+++ b/src/applications/paste/query/PhabricatorPasteSearchEngine.php
@@ -1,129 +1,189 @@
<?php
-/**
- * @group paste
- */
final class PhabricatorPasteSearchEngine
extends PhabricatorApplicationSearchEngine {
public function buildSavedQueryFromRequest(AphrontRequest $request) {
$saved = new PhabricatorSavedQuery();
$saved->setParameter(
'authorPHIDs',
$this->readUsersFromRequest($request, 'authors'));
$languages = $request->getStrList('languages');
if ($request->getBool('noLanguage')) {
$languages[] = null;
}
$saved->setParameter('languages', $languages);
$saved->setParameter('createdStart', $request->getStr('createdStart'));
$saved->setParameter('createdEnd', $request->getStr('createdEnd'));
return $saved;
}
public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
$query = id(new PhabricatorPasteQuery())
- ->needContent(true)
+ ->needRawContent(true)
->withAuthorPHIDs($saved->getParameter('authorPHIDs', array()))
->withLanguages($saved->getParameter('languages', array()));
$start = $this->parseDateTime($saved->getParameter('createdStart'));
$end = $this->parseDateTime($saved->getParameter('createdEnd'));
if ($start) {
$query->withDateCreatedAfter($start);
}
if ($end) {
$query->withDateCreatedBefore($end);
}
return $query;
}
public function buildSearchForm(
AphrontFormView $form,
PhabricatorSavedQuery $saved_query) {
$phids = $saved_query->getParameter('authorPHIDs', array());
$author_handles = id(new PhabricatorHandleQuery())
->setViewer($this->requireViewer())
->withPHIDs($phids)
->execute();
$languages = $saved_query->getParameter('languages', array());
$no_language = false;
foreach ($languages as $key => $language) {
if ($language === null) {
$no_language = true;
unset($languages[$key]);
continue;
}
}
$form
->appendChild(
id(new AphrontFormTokenizerControl())
->setDatasource('/typeahead/common/users/')
->setName('authors')
->setLabel(pht('Authors'))
->setValue($author_handles))
->appendChild(
id(new AphrontFormTextControl())
->setName('languages')
->setLabel(pht('Languages'))
->setValue(implode(', ', $languages)))
->appendChild(
id(new AphrontFormCheckboxControl())
->addCheckbox(
'noLanguage',
1,
pht('Find Pastes with no specified language.'),
$no_language));
$this->buildDateRange(
$form,
$saved_query,
'createdStart',
pht('Created After'),
'createdEnd',
pht('Created Before'));
}
protected function getURI($path) {
return '/paste/'.$path;
}
public function getBuiltinQueryNames() {
$names = array(
'all' => pht('All Pastes'),
);
if ($this->requireViewer()->isLoggedIn()) {
$names['authored'] = pht('Authored');
}
return $names;
}
public function buildSavedQueryFromBuiltin($query_key) {
$query = $this->newSavedQuery();
$query->setQueryKey($query_key);
switch ($query_key) {
case 'all':
return $query;
case 'authored':
return $query->setParameter(
'authorPHIDs',
array($this->requireViewer()->getPHID()));
}
return parent::buildSavedQueryFromBuiltin($query_key);
}
+ protected function getRequiredHandlePHIDsForResultList(
+ array $pastes,
+ PhabricatorSavedQuery $query) {
+ return mpull($pastes, 'getAuthorPHID');
+ }
+
+ protected function renderResultList(
+ array $pastes,
+ PhabricatorSavedQuery $query,
+ array $handles) {
+ assert_instances_of($pastes, 'PhabricatorPaste');
+
+ $viewer = $this->requireViewer();
+
+ $lang_map = PhabricatorEnv::getEnvConfig('pygments.dropdown-choices');
+
+ $list = new PHUIObjectItemListView();
+ $list->setUser($viewer);
+ foreach ($pastes as $paste) {
+ $created = phabricator_date($paste->getDateCreated(), $viewer);
+ $author = $handles[$paste->getAuthorPHID()]->renderLink();
+
+ $lines = phutil_split_lines($paste->getRawContent());
+
+ $preview = id(new PhabricatorSourceCodeView())
+ ->setLimit(5)
+ ->setLines($lines)
+ ->setURI(new PhutilURI($paste->getURI()));
+
+ $source_code = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phabricator-source-code-summary',
+ ),
+ $preview);
+
+ $line_count = count($lines);
+ $line_count = pht(
+ '%s Line(s)',
+ new PhutilNumber($line_count));
+
+ $title = nonempty($paste->getTitle(), pht('(An Untitled Masterwork)'));
+
+ $item = id(new PHUIObjectItemView())
+ ->setObjectName('P'.$paste->getID())
+ ->setHeader($title)
+ ->setHref('/P'.$paste->getID())
+ ->setObject($paste)
+ ->addByline(pht('Author: %s', $author))
+ ->addIcon('none', $line_count)
+ ->appendChild($source_code);
+
+ $lang_name = $paste->getLanguage();
+ if ($lang_name) {
+ $lang_name = idx($lang_map, $lang_name, $lang_name);
+ $item->addIcon('none', $lang_name);
+ }
+
+ $list->addItem($item);
+ }
+
+ return $list;
+ }
}

File Metadata

Mime Type
text/x-diff
Expires
Wed, Apr 30, 6:53 PM (1 d, 8 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
108794
Default Alt Text
(8 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!)