fix: torrent-stat and torrent-list correct totals when limit

Now limit and sort made before count totals. Closes #21
popstas · Mar 7, 2016 · 9ff4ca4 · 9ff4ca4
1 parent 6e7f584
commit 9ff4ca4
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/Helpers/TableUtils.php b/src/Helpers/TableUtils.php
@@ -50,15 +50,20 @@ private static function parseFilter($type, $filterString)
         throw new \InvalidArgumentException('Unknown filter type');
     }
 
-    public static function filterRows(array $rows, $filters)
+    /**
+     * @param array $rows
+     * @param array $filters
+     * @return bool
+     * @throws \RuntimeException
+     */
+    public static function filterRows(array $rows, array $filters)
     {
         $filters = self::parseFilters($filters);
 
         return array_filter($rows, function ($row) use ($filters) {
             foreach ($filters as $columnKey => $filter) {
                 if (!isset($row[$columnKey])) {
                     throw new \RuntimeException('Column ' . $columnKey . ' not exists, cannot filter');
-                    continue;
                 }
                 $columnValue = $row[$columnKey];
 
@@ -102,14 +107,16 @@ public static function sortRowsByColumnNumber(array $rows, $columnNumber)
         return $rowsSorted;
     }
 
-    public static function printTable(array $tableData, OutputInterface $output, $sortColumnNumber = 1, $limit = 0)
+    public static function limitRows(array $rows, $limit)
     {
-        $tableData['rows'] = self::sortRowsByColumnNumber($tableData['rows'], $sortColumnNumber);
-
-        if ($limit && $limit < count($tableData['rows'])) {
-            $tableData['rows'] = array_slice($tableData['rows'], 0, $limit);
+        if ($limit && $limit < count($rows)) {
+            $rows = array_slice($rows, 0, $limit);
         }
+        return $rows;
+    }
 
+    public static function printTable(array $tableData, OutputInterface $output)
+    {
         $table = new Table($output);
         $table->setHeaders($tableData['headers']);
         $table->setRows($tableData['rows']);