Use a normal textual Widget rather than a ScrollView for logs to remo…

…ve memory leak

src/murfey/client/customlogging.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import List
 
-from rich.console import Console, RenderableType
+from rich.console import RenderableType
 from rich.containers import Renderables
 from rich.logging import RichHandler
 from rich.text import Text
@@ -37,7 +37,6 @@ def __init__(self, queue: Queue, **kwargs):
         super().__init__(**kwargs)
         self._queue = queue
         self.redirect = False
-        self._console = Console()
         self._last_time = None
 
     def get_log_row(self, record, message_renderable) -> list:
@@ -46,7 +45,7 @@ def get_log_row(self, record, message_renderable) -> list:
         path = Path(record.pathname).name
         level = self.get_level_text(record)
         time_format = None if self.formatter is None else self.formatter.datefmt
-        log_time = datetime.fromtimestamp(record.created) or self.console.get_datetime()
+        log_time = datetime.fromtimestamp(record.created) or datetime.now()
         time_format = time_format or self._log_render.time_format
         link_path = record.pathname if self.enable_link_path else None
         if callable(time_format):

src/murfey/client/tui/app.py

@@ -2,6 +2,7 @@
 
 # import asyncio
 # import contextlib
+import copy
 import logging
 import string
 import threading
@@ -377,7 +378,7 @@ async def on_key(self, key: events.Key) -> None:
             key.stop()
 
 
-class LogBook(ScrollView):
+class LogBook(Widget):
     def __init__(self, queue, *args, **kwargs):
         self._queue = queue
         self._next_log = None
@@ -392,6 +393,9 @@ def on_mount(self):
     def _load_from_queue(self) -> bool:
         if not self._queue.empty():
             num_logs = 0
+            if self._next_log:
+                for nl in self._next_log:
+                    del nl
             self._next_log = []
             while not self._queue.empty() and num_logs < 10:
                 msg = self._queue.get_nowait()
@@ -400,6 +404,13 @@ def _load_from_queue(self) -> bool:
             return True
         return False
 
+    def render(self) -> Panel:
+        panel_msg = self._logs or ""
+        return Panel(
+            panel_msg,
+            box=SQUARE,
+        )
+
     async def tick(self):
         loaded = self._load_from_queue()
         if loaded:
@@ -412,13 +423,14 @@ async def tick(self):
                 for nl in self._next_log:
                     self._log_cache.append(nl)
                     self._logs.add_row(*nl[0])
-            await self.update(self._logs, home=False)
-            if len(self._logs.rows) > 50:
+            if len(self._log_cache) > 50:
                 self._logs = self._log_cache[-50][1]
-                for r in self._log_cache[-49:]:
+                curr_log_cache = copy.deepcopy(self._log_cache)
+                for r in curr_log_cache[-49:]:
                     self._logs.add_row(*r[0])
-                self._log_cache = self._log_cache[-50:]
-            self.page_down()
+                self._log_cache = curr_log_cache[-50:]
+                del curr_log_cache
+            self.refresh()
 
 
 class DCParametersTomo(BaseModel):

src/murfey/client/watchdir.py

@@ -39,12 +39,9 @@ def __repr__(self) -> str:
 
     def scan(self, modification_time: float | None = None, transfer_all: bool = False):
         try:
-            # t_start = time.perf_counter()
             filelist = self._scan_directory(
                 modification_time=self._modification_overwrite or modification_time
             )
-            # t_scan = time.perf_counter() - t_start
-            # log.info(f"Scan of {self._basepath} completed in {t_scan:.1f} seconds")
             scan_completion = time.time()
 
             for entry, entry_info in filelist.items():