diff --git a/pyproject.toml b/pyproject.toml index c7a977e..93cbf8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "toolong" -version = "1.1.0" +version = "1.1.1" description = "A terminal log file viewer / tailer / analyzer" authors = ["Will McGugan "] license = "MIT" diff --git a/src/toolong/log_lines.py b/src/toolong/log_lines.py index 2e702f1..f9da88e 100644 --- a/src/toolong/log_lines.py +++ b/src/toolong/log_lines.py @@ -2,6 +2,7 @@ from dataclasses import dataclass from queue import Empty, Queue +from operator import itemgetter from threading import Event, RLock, Thread from textual.message import Message @@ -386,7 +387,7 @@ def merge_log_files(self) -> None: position += log_file.size - merge_lines.sort() + merge_lines.sort(key=itemgetter(0, 1)) self.post_message(ScanComplete(total_size, total_size)) diff --git a/src/toolong/log_view.py b/src/toolong/log_view.py index 45f1e1d..a3a34ba 100644 --- a/src/toolong/log_view.py +++ b/src/toolong/log_view.py @@ -231,8 +231,7 @@ def update_meta(self) -> None: if self.line_no is not None: meta.append(f"{self.line_no + 1}") - # meta_line = " • ".join(meta) - meta_line = Text.assemble(*meta) + meta_line = " • ".join(meta) self.query_one(".meta", Label).update(meta_line) def watch_tail(self, tail: bool) -> None: