reimplement sorting

pirate/data/sorts.json

@@ -1,15 +1,15 @@
 {
-"TitleDsc": 1, 
+"TitleDsc": [1, "name", true],
-"TitleAsc": 2,
+"TitleAsc": [2, "name", false],
-"DateDsc": 3, 
+"DateDsc":  [3, "raw_uploaded", true],
-"DateAsc": 4,
+"DateAsc":  [4, "raw_uploaded", false],
-"SizeDsc": 5, 
+"SizeDsc":  [5, "raw_size", true],
-"SizeAsc": 6,
+"SizeAsc":  [6, "raw_size", false],
-"SeedersDsc": 7, 
+"SeedersDsc": [7, "seeders", true],
-"SeedersAsc": 8,
+"SeedersAsc": [8, "seeders", false],
-"LeechersDsc": 9, 
+"LeechersDsc": [9, "leechers", true],
-"LeechersAsc": 10,
+"LeechersAsc": [10, "leechers", false],
-"CategoryDsc": 13, 
+"CategoryDsc": [13, "category", true],
-"CategoryAsc": 14,
+"CategoryAsc": [14, "category", false],
-"Default": 99
+"Default": [99, "seeders", true]
 }

pirate/pirate.py

@@ -344,7 +344,7 @@ def pirate_main(args):
         cur_color = 'zebra_0'
         for key, value in sorted(pirate.data.sorts.items()):
             cur_color = 'zebra_0' if cur_color == 'zebra_1' else 'zebra_1'
-            printer.print(str(value), '\t', key, sep='', color=cur_color)
+            printer.print(str(value[0]), '\t', key, sep='', color=cur_color)
         return
 
     # fetch torrents

pirate/torrent.py

@@ -33,13 +33,42 @@ def parse_sort(printer, sort):
         sort = int(sort)
     except ValueError:
         pass
-    if sort in pirate.data.sorts.values():
+    for key, val in pirate.data.sorts.items():
-        return sort
+        if sort == key or sort == val[0]:
-    elif sort in pirate.data.sorts.keys():
+            return val[1:]
-        return pirate.data.sorts[sort]
     else:
         printer.print('Invalid sort ignored', color='WARN')
-        return 99
+        return pirate.data.sorts['Default'][1:]
+
+
+def parse_page(page):
+    results = []
+    try:
+        data = json.load(page)
+    except json.decoder.JSONDecodeError:
+        raise IOError('invalid JSON in API reply: blocked mirror?')
+
+    if len(data) == 1 and 'No results' in data[0]['name']:
+        return results
+
+    for res in data:
+        res['raw_size'] = int(res['size'])
+        res['size'] = pretty_size(int(res['size']))
+        res['magnet'] = build_magnet(res['name'], res['info_hash'])
+        res['info_hash'] = int(res['info_hash'], 16)
+        res['raw_uploaded'] = int(res['added'])
+        res['uploaded'] = pretty_date(res['added'])
+        res['seeders'] = int(res['seeders'])
+        res['leechers'] = int(res['leechers'])
+        res['category'] = int(res['category'])
+        results.append(res)
+
+    return results
+
+
+def sort_results(sort, res):
+    key, reverse = sort
+    return sorted(res, key=lambda x: x[key], reverse=reverse)
 
 
 def pretty_size(size):
@@ -59,31 +88,11 @@ def pretty_date(ts):
     return date.strftime('%Y-%m-%d %H:%M')
 
 
-def make_magnet(name, info_hash):
+def build_magnet(name, info_hash):
     return 'magnet:?xt=urn:btih:{}&dn={}'.format(
         info_hash, parse.quote(name, ''))
 
 
-def parse_page(page):
-    results = []
-    try:
-        data = json.load(page)
-    except json.decoder.JSONDecodeError:
-        raise IOError('invalid JSON in API reply: blocked mirror?')
-
-    if len(data) == 1 and 'No results' in data[0]['name']:
-        return results
-
-    for res in data:
-        res['size'] = pretty_size(int(res['size']))
-        res['magnet'] = make_magnet(res['name'], res['info_hash'])
-        res['info_hash'] = int(res['info_hash'], 16)
-        res['uploaded'] = pretty_date(res['added'])
-        results.append(res)
-
-    return results
-
-
 def build_request_path(mode, category, terms):
     if mode == 'search':
         query = '/q.php?q={}&cat={}'.format(' '.join(terms), category)
@@ -114,12 +123,12 @@ def remote(printer, category, sort, mode, terms, mirror, timeout):
 
         if f.info().get('Content-Encoding') == 'gzip':
             f = gzip.GzipFile(fileobj=BytesIO(f.read()))
-        return parse_page(f)
-
     except KeyboardInterrupt:
         printer.print('\nCancelled.')
         sys.exit(0)
 
+    return sort_results(sort, parse_page(f))
+
 
 def find_api(mirror, timeout):
     # try common paths

tests/test_torrent.py

@@ -38,6 +38,7 @@ class TestTorrent(unittest.TestCase):
             expected = json.load(file)
         with util.open_data('debian_iso.json') as res:
             actual = pirate.torrent.parse_page(res)
+        json.dump(actual, open('result.json', 'w'))
         self.assertEqual(actual, expected)
 
     def test_parse_category(self):
@@ -54,13 +55,17 @@ class TestTorrent(unittest.TestCase):
 
     def test_parse_sort(self):
         sort = pirate.torrent.parse_sort(MagicMock(Printer), 'SeedersDsc')
-        self.assertEqual(7, sort)
+        self.assertEqual(['seeders', True], sort)
+        sort = pirate.torrent.parse_sort(MagicMock(Printer), 'CategoryAsc')
+        self.assertEqual(['category', False], sort)
+        sort = pirate.torrent.parse_sort(MagicMock(Printer), 'DateAsc')
+        self.assertEqual(['raw_uploaded', False], sort)
         sort = pirate.torrent.parse_sort(MagicMock(Printer), '7')
-        self.assertEqual(7, sort)
+        self.assertEqual(['seeders', True], sort)
         sort = pirate.torrent.parse_sort(MagicMock(Printer), 'asdf')
-        self.assertEqual(99, sort)
+        self.assertEqual(['seeders', True], sort)
         sort = pirate.torrent.parse_sort(MagicMock(Printer), '7000')
-        self.assertEqual(99, sort)
+        self.assertEqual(['seeders', True], sort)
 
     def test_request_path(self):
         # the args are (mode, category, terms)
@@ -144,10 +149,12 @@ class TestTorrent(unittest.TestCase):
             info = mock.MagicMock(return_value=MockInfo())
         res_obj = MockResponse()
 
+        sort = pirate.torrent.parse_sort(MagicMock(Printer), 10)
+
         with patch('urllib.request.Request', return_value=req_obj) as req:
             with patch('urllib.request.urlopen', return_value=res_obj) as res:
                 results = pirate.torrent.remote(
-                    MagicMock(Printer), 100, 10, 'top',
+                    MagicMock(Printer), 100, sort, 'top',
                     [], 'http://example.com', 9)
                 req.assert_called_once_with(
                     'http://example.com/precompiled/data_top100_100.json',