Sorting option
This commit is contained in:
parent
985e3ebbea
commit
9713b92674
|
@ -181,6 +181,8 @@ Help:
|
||||||
|
|
||||||
Usage: torrents:search QUERY [OPTIONS]
|
Usage: torrents:search QUERY [OPTIONS]
|
||||||
|
|
||||||
|
Sort values \"seed\", \"leech\", \"size\", \"name\", \"id\"
|
||||||
|
|
||||||
--terms does not work (API bug)
|
--terms does not work (API bug)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -272,7 +274,8 @@ Help:
|
||||||
|
|
||||||
Usage: torrents:search:top [OPTIONS]
|
Usage: torrents:search:top [OPTIONS]
|
||||||
|
|
||||||
Period values: "100", "day", "week", "month"
|
Period values \"100\" (default), \"day\", \"week\", \"month\"
|
||||||
|
Sort values \"seed\", \"leech\", \"size\", \"name\", \"id\"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,12 +27,16 @@ class TorrentsSearchCommand extends Command
|
||||||
->addOption('sub-category', 's', InputOption::VALUE_REQUIRED, 'Filter by sub-category ID')
|
->addOption('sub-category', 's', InputOption::VALUE_REQUIRED, 'Filter by sub-category ID')
|
||||||
->addOption('category', 'c', InputOption::VALUE_REQUIRED, 'Filter by category ID')
|
->addOption('category', 'c', InputOption::VALUE_REQUIRED, 'Filter by category ID')
|
||||||
->addOption('terms', 't', InputOption::VALUE_REQUIRED, 'Filter by terms IDs (separated by ",")')
|
->addOption('terms', 't', InputOption::VALUE_REQUIRED, 'Filter by terms IDs (separated by ",")')
|
||||||
|
->addOption('sort', null, InputOption::VALUE_REQUIRED, 'Sort')
|
||||||
|
->addOption('asc', null, InputOption::VALUE_NONE, 'Ascending sort')
|
||||||
->setHelp("<info>%command.name%</info>
|
->setHelp("<info>%command.name%</info>
|
||||||
|
|
||||||
Search torrents.
|
Search torrents.
|
||||||
|
|
||||||
Usage: <comment>torrents:search</comment> <info>QUERY</info> [OPTIONS]
|
Usage: <comment>torrents:search</comment> <info>QUERY</info> [OPTIONS]
|
||||||
|
|
||||||
|
<info>Sort values</info> \"seed\", \"leech\", \"size\", \"name\", \"id\"
|
||||||
|
|
||||||
<error>--terms does not work (API bug)</error>");
|
<error>--terms does not work (API bug)</error>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,7 +100,17 @@ Usage: <comment>torrents:search</comment> <info>QUERY</info> [OPTIONS]
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Render::torrents($response->getData()['torrents'], $output);
|
$options = [];
|
||||||
|
|
||||||
|
if ($input->getOption('sort')) {
|
||||||
|
$options['sort'] = $input->getOption('sort');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($input->getOption('asc')) {
|
||||||
|
$options['asc'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Render::torrents($response->getData()['torrents'], $output, $options);
|
||||||
} catch (ClientException $e) {
|
} catch (ClientException $e) {
|
||||||
$output->writeln(sprintf('An error occured. <error>%s</error>', $e->getMessage()));
|
$output->writeln(sprintf('An error occured. <error>%s</error>', $e->getMessage()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,8 @@ class TorrentsSearchMoviesCommand extends Command
|
||||||
->addOption('offset', 'o', InputOption::VALUE_REQUIRED, 'Page number')
|
->addOption('offset', 'o', InputOption::VALUE_REQUIRED, 'Page number')
|
||||||
->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Number of results per page')
|
->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Number of results per page')
|
||||||
->addOption('terms', 't', InputOption::VALUE_REQUIRED, 'Filter by terms IDs (separated by ",")')
|
->addOption('terms', 't', InputOption::VALUE_REQUIRED, 'Filter by terms IDs (separated by ",")')
|
||||||
|
->addOption('sort', null, InputOption::VALUE_REQUIRED, 'Sort')
|
||||||
|
->addOption('asc', null, InputOption::VALUE_NONE, 'Ascending sort')
|
||||||
->setHelp("<info>%command.name%</info>
|
->setHelp("<info>%command.name%</info>
|
||||||
|
|
||||||
Search movies.
|
Search movies.
|
||||||
|
@ -37,7 +39,7 @@ Usage: <comment>torrents:search:movies</comment> <info>QUERY</info> [OPTIONS]
|
||||||
'--sub-category' => 631,
|
'--sub-category' => 631,
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach (['offset', 'limit', 'terms'] as $p) {
|
foreach (['offset', 'limit', 'terms', 'sort', 'asc'] as $p) {
|
||||||
$value = $input->getOption($p);
|
$value = $input->getOption($p);
|
||||||
|
|
||||||
if (null !== $value) {
|
if (null !== $value) {
|
||||||
|
|
|
@ -20,6 +20,8 @@ class TorrentsSearchSeriesCommand extends Command
|
||||||
->addOption('offset', 'o', InputOption::VALUE_REQUIRED, 'Page number')
|
->addOption('offset', 'o', InputOption::VALUE_REQUIRED, 'Page number')
|
||||||
->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Number of results per page')
|
->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Number of results per page')
|
||||||
->addOption('terms', 't', InputOption::VALUE_REQUIRED, 'Filter by terms IDs (separated by ",")')
|
->addOption('terms', 't', InputOption::VALUE_REQUIRED, 'Filter by terms IDs (separated by ",")')
|
||||||
|
->addOption('sort', null, InputOption::VALUE_REQUIRED, 'Sort')
|
||||||
|
->addOption('asc', null, InputOption::VALUE_NONE, 'Ascending sort')
|
||||||
->setHelp("<info>%command.name%</info>
|
->setHelp("<info>%command.name%</info>
|
||||||
|
|
||||||
Search series.
|
Search series.
|
||||||
|
@ -37,7 +39,7 @@ Usage: <comment>torrents:search:series</comment> <info>QUERY</info> [OPTIONS]
|
||||||
'--sub-category' => 433,
|
'--sub-category' => 433,
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach (['offset', 'limit', 'terms'] as $p) {
|
foreach (['offset', 'limit', 'terms', 'sort', 'asc'] as $p) {
|
||||||
$value = $input->getOption($p);
|
$value = $input->getOption($p);
|
||||||
|
|
||||||
if (null !== $value) {
|
if (null !== $value) {
|
||||||
|
|
|
@ -20,13 +20,17 @@ class TorrentsTopCommand extends Command
|
||||||
->setName('torrents:top')
|
->setName('torrents:top')
|
||||||
->setDescription('Top torrents')
|
->setDescription('Top torrents')
|
||||||
->addOption('period', 'p', InputOption::VALUE_REQUIRED, 'Period')
|
->addOption('period', 'p', InputOption::VALUE_REQUIRED, 'Period')
|
||||||
|
->addOption('sort', null, InputOption::VALUE_REQUIRED, 'Sort')
|
||||||
|
->addOption('asc', null, InputOption::VALUE_NONE, 'Ascending sort')
|
||||||
->setHelp("<info>%command.name%</info>
|
->setHelp("<info>%command.name%</info>
|
||||||
|
|
||||||
Show top torrents.
|
Show top torrents.
|
||||||
|
|
||||||
Usage: <comment>torrents:search:top</comment> [OPTIONS]
|
Usage: <comment>torrents:search:top</comment> [OPTIONS]
|
||||||
|
|
||||||
<info>Period values: \"100\" (default), \"day\", \"week\", \"month\"</info>");
|
<info>Period values</info> \"100\" (default), \"day\", \"week\", \"month\"
|
||||||
|
<info>Sort values</info> \"seed\", \"leech\", \"size\", \"name\", \"id\"
|
||||||
|
");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function execute(InputInterface $input, OutputInterface $output)
|
protected function execute(InputInterface $input, OutputInterface $output)
|
||||||
|
@ -61,7 +65,17 @@ Usage: <comment>torrents:search:top</comment> [OPTIONS]
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Render::torrents($response->getData(), $output);
|
$options = [];
|
||||||
|
|
||||||
|
if ($input->getOption('sort')) {
|
||||||
|
$options['sort'] = $input->getOption('sort');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($input->getOption('asc')) {
|
||||||
|
$options['asc'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Render::torrents($response->getData(), $output, $options);
|
||||||
} catch (ClientException $e) {
|
} catch (ClientException $e) {
|
||||||
$output->writeln(sprintf('An error occured. <error>%s</error>', $e->getMessage()));
|
$output->writeln(sprintf('An error occured. <error>%s</error>', $e->getMessage()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
namespace Helper;
|
namespace Helper;
|
||||||
|
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
use Api\ClientResponse;
|
use InvalidArgumentException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Render
|
* Class Render
|
||||||
|
@ -11,12 +11,34 @@ use Api\ClientResponse;
|
||||||
*/
|
*/
|
||||||
class Render
|
class Render
|
||||||
{
|
{
|
||||||
public static function torrents(array $torrents, OutputInterface $output)
|
public static function torrents(array $torrents, OutputInterface $output, array $options = [])
|
||||||
{
|
{
|
||||||
if (empty($torrents)) {
|
if (empty($torrents)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isset($options['sort'])) {
|
||||||
|
$sort = $options['sort'];
|
||||||
|
|
||||||
|
if (!in_array($sort, ['seed', 'leech', 'size', 'id', 'name'])) {
|
||||||
|
throw new InvalidArgumentException('Invalid option "sort".');
|
||||||
|
}
|
||||||
|
|
||||||
|
$sort = str_replace(['seed', 'leech'], ['seeders', 'leechers'], $sort);
|
||||||
|
$sortDatas = [];
|
||||||
|
|
||||||
|
foreach ($torrents as $torrent) {
|
||||||
|
$sortDatas[] = $torrent[$sort];
|
||||||
|
}
|
||||||
|
|
||||||
|
array_multisort(
|
||||||
|
$sortDatas,
|
||||||
|
isset($options['asc']) ? SORT_ASC : SORT_DESC,
|
||||||
|
$sort === 'name' ? SORT_STRING : SORT_NUMERIC,
|
||||||
|
$torrents
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$output->writeln(' SEED LEECH SIZE ID NAME');
|
$output->writeln(' SEED LEECH SIZE ID NAME');
|
||||||
|
|
||||||
foreach ($torrents as $torrent) {
|
foreach ($torrents as $torrent) {
|
||||||
|
@ -31,4 +53,3 @@ class Render
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue