update TERMINAL_SIZE globally on SIGWINCH

Author: chapmanjacobd

library/playback/torrents_info.py

@@ -883,23 +883,29 @@ def gen_row(t):
                 continue
 
             for file in torrent_files(t):
+                if invalid_state:
+                    break
+
                 for base_path in base_paths:
                     file_path = Path(base_path) / file.name
                     if file_path.exists() and not file_path.is_dir():
-                        stat = file_path.stat()
-                        if stat.st_blocks and stat.st_blocks > 12 and file.progress == 0.0:
-                            log.warning(
-                                "Skipping the rest of torrent because invalid state likely. Recheck first. %s", t.name
-                            )
-                            break  # invalid state likely
-
-                        if 0.0 < file.progress < args.delete_incomplete:
-                            print(f"Deleting incomplete file: {file_path}")
+                        if file.progress == 0.0:
+                            stat = file_path.stat()
+                            if stat.st_blocks and stat.st_blocks > 12:
+                                log.error(
+                                    "Skipping the rest of torrent because invalid state likely. Recheck first. %s",
+                                    t.name,
+                                )
+                                invalid_state = True
+                                break
+
+                        if file.progress < args.delete_incomplete:
+                            log.warning("Deleting incomplete file: %s", file_path)
                             shell_utils.trash(args, str(file_path), detach=False)
                         elif file.progress == 1.0:
-                            print(f"Keeping complete file: {file_path}")
+                            log.info("Keeping complete file: %s", file_path)
                         else:
-                            print(f"Keeping {strings.percent(1 - file.progress)} incomplete file: {file_path}")
+                            log.warning("Keeping %s incomplete file: %s", strings.percent(1 - file.progress), file_path)
                         break  # Stop after deleting first valid path
 
     alt_move_syntax = any(

library/utils/consts.py

@@ -1,4 +1,4 @@
-import errno, os, random, re, shutil, string, sys
+import errno, os, random, re, shutil, signal, string, sys
 from datetime import datetime, timezone
 from pathlib import Path
 from tempfile import gettempdir
@@ -71,8 +71,6 @@ def random_string() -> str:
 )
 REGEX_V_REDD_IT = re.compile("https?://v.redd.it/(?:[^/?#&]+)")
 APPLICATION_START = now()
-TERMINAL_SIZE = shutil.get_terminal_size(fallback=(600, 50))
-MOBILE_TERMINAL = TERMINAL_SIZE.columns < 80
 TABULATE_STYLE = "simple"
 DEFAULT_DIFFLIB_RATIO = 0.73
 DEFAULT_MIN_SPLIT = "150s"
@@ -82,6 +80,24 @@ def random_string() -> str:
 NOT_WINDOWS = os.name == "posix"
 REQUESTS_TIMEOUT = (8, 45)
 
+
+def get_terminal_size():
+    return shutil.get_terminal_size(fallback=(600, 50))
+
+
+TERMINAL_SIZE = get_terminal_size()
+MOBILE_TERMINAL = TERMINAL_SIZE.columns < 80
+
+
+def _on_winch(_signal, _frame):
+    global TERMINAL_SIZE, MOBILE_TERMINAL
+    TERMINAL_SIZE = get_terminal_size()
+    MOBILE_TERMINAL = TERMINAL_SIZE.columns < 80
+
+
+signal.signal(signal.SIGWINCH, _on_winch)
+
+
 SQLITE_INT1 = 255
 SQLITE_INT2 = 65_535
 SQLITE_INT3 = 16_777_215

library/utils/printing.py

@@ -1,4 +1,4 @@
-import csv, itertools, math, shutil, signal, sys, textwrap, time
+import csv, itertools, math, sys, textwrap, time
 from collections.abc import Callable
 from datetime import datetime, timezone
 
@@ -30,25 +30,11 @@ def print_overwrite(*text, **kwargs):
 
 
 class MultilineOverwriteConsole:
-
-    def _term_width(self):
-        try:
-            return shutil.get_terminal_size().columns
-        except Exception:
-            return consts.TERMINAL_SIZE.columns
-
-    def _on_resize(self, *_):
-        self.width = self._term_width()
-
     def __init__(self, stream=None):
         self.stream = stream or sys.stdout
         self.overwrite_enabled = self.stream.isatty()
-        self.width = consts.TERMINAL_SIZE.columns
         self.lines = 0
 
-        if self.overwrite_enabled:
-            signal.signal(signal.SIGWINCH, self._on_resize)
-
     def reset(self):
         if self.lines and self.overwrite_enabled:
             # Move cursor to initial line
@@ -60,7 +46,7 @@ def _wrapped_lines(self, text):
         rows = 0
         for line in text.splitlines() or [""]:
             width = max(0, wcswidth(line))
-            rows += max(1, (width // max(1, self.width)) + 1)
+            rows += max(1, (width // max(1, consts.TERMINAL_SIZE.columns)) + 1)
         return rows
 
     def print(self, *args, sep=" ", end="\n"):