Skip to content

Commit 4b8f4c2

Browse files
committed
refactor: improve Jackett search results formatting
- Reorganize result display with title on first line and details on second - Add thousands separator formatting for seeds/peers counts - Fix GB size formatting to always show 2 decimal places - Remove unused re import from main.py
1 parent 2f13f48 commit 4b8f4c2

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

feral_services/jackett.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def format_and_filter_results(results: list, user_id: int, user_id_to_results: d
5454

5555
returned_results = []
5656
user_id_to_results[user_id] = {}
57+
5758
for result in reversed(results_by_top_seeds):
5859
if result['Seeders'] < 1:
5960
continue
@@ -62,7 +63,6 @@ def format_and_filter_results(results: list, user_id: int, user_id_to_results: d
6263
count = 0
6364
while req_id in user_id_to_results[user_id] and count < 5:
6465
req_id = str(random.randint(10000, 99999))
65-
6666
count += 1
6767
if count > 4:
6868
return 'id collision happened?...'
@@ -75,14 +75,20 @@ def format_and_filter_results(results: list, user_id: int, user_id_to_results: d
7575
'size': round((result['Size'] / 1024 / 1024 / 1024), 2),
7676
}
7777

78-
returned_results.append(
79-
f"/get{req_id} - {result['Tracker']}, "
80-
f"Seeds: {result['Seeders']}, "
81-
f"Peers: {result['Peers']}, "
82-
f"Size: {round((result['Size'] / 1024 / 1024 / 1024), 2)}GB\n"
83-
f"{result['Title']}",
78+
details = (
79+
f"└─ {result['Tracker']} | "
80+
f"Seeds: {format(result['Seeders'], ',')} | "
81+
f"Peers: {format(result['Peers'], ',')} | "
82+
f"Size: {format(round(result['Size'] / 1024 / 1024 / 1024, 2), '.2f')} GB"
8483
)
8584

86-
result_count_str = f'Results ({len(returned_results)}/{len(results)})'
85+
formatted_result = (
86+
f"/get{req_id} - {result['Title']}\n"
87+
f"{details}"
88+
)
89+
90+
returned_results.append(formatted_result)
91+
92+
result_count = f"Results ({len(returned_results)}/{len(results)})"
8793
returned_results_str = '\n\n'.join(returned_results)
88-
return f'{result_count_str}\n\n{returned_results_str}'
94+
return f"{result_count}\n\n{returned_results_str}"

main.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import contextlib
44
import json
55
import os
6-
import re
76
import threading
87

98
import requests

0 commit comments

Comments
 (0)