torrent-info: fix categories sorting

Author: chapmanjacobd

xklb/playback/torrents_info.py

@@ -92,7 +92,7 @@ def torrents_info():
     ]
 
     tbl = []
-    for state in interesting_states:
+    for state in {*interesting_states} - {"uploading", "downloading"}:
         torrents = torrents_by_state.get(state)
         if not torrents:
             continue
@@ -185,6 +185,14 @@ def torrents_info():
                 "file_count": sum(len(t.files) for t in torrents) if args.verbose >= 1 else None,  # a bit slow
             }
         )
+
+    categories = sorted(
+        categories,
+        key=lambda d: (
+            d["state"].endswith(("downloading", "DL")),
+            iterables.safe_index(interesting_states, d["state"]),
+        ),
+    )
     printing.table(iterables.list_dict_filter_bool(categories))
     print()
 

xklb/utils/iterables.py

@@ -55,6 +55,15 @@ def safe_len(list_) -> Any | None:
         return len(str(list_))
 
 
+def safe_index(list_, value) -> int:
+    if not list_:
+        return 0
+    try:
+        return list_.index(value)
+    except ValueError:
+        return -1
+
+
 def get_all_lists(nested_dict):
     list_ = []
 

xklb/utils/printing.py

@@ -1,4 +1,4 @@
-import csv, itertools, math, sys, textwrap, time
+import csv, itertools, math, sys, textwrap, time, json
 from collections.abc import Callable
 from datetime import datetime, timezone
 
@@ -21,8 +21,13 @@ def print_overwrite(*text, **kwargs):
 
 
 def table(tbl, **kwargs) -> None:
+    table_text = tabulate(tbl, tablefmt=consts.TABULATE_STYLE,             headers="keys", showindex=False, **kwargs)
+    longest_line = max(len(s) for s in table_text.splitlines())
     try:
-        print(tabulate(tbl, tablefmt=consts.TABULATE_STYLE, headers="keys", showindex=False, **kwargs))
+        if longest_line > consts.TERMINAL_SIZE.columns:
+            print(json.dumps(tbl, indent=3))
+        else:
+            print(table_text)
     except BrokenPipeError:
         sys.stdout = None
         sys.exit(141)