Skip to content

Commit 299cc7c

Browse files
author
ashariyar
committed
move highlighter insantiations to highlighter.py
1 parent 4857852 commit 299cc7c

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

pdfalyzer/output/highlighter.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,8 @@ def _debug_highlight_patterns(cls):
9090

9191
class PdfHighlighter(LogHighlighter):
9292
base_style = PDF_OBJ_STYLE_PREFIX
93+
94+
95+
# Instantiate highlighters
96+
log_highlighter = LogHighlighter()
97+
pdf_highlighter = PdfHighlighter()

pdfalyzer/output/theme.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
from pypdf.generic import (ArrayObject, ByteStringObject, EncodedStreamObject, IndirectObject,
1414
NullObject, StreamObject, TextStringObject)
15-
from rich.panel import Panel
16-
from rich.padding import Padding
1715
from rich.theme import Theme
1816
from yaralyzer.output.console import console
1917
from yaralyzer.output.theme import BYTES_NO_DIM, YARALYZER_THEME_DICT

pdfalyzer/util/logging.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Other files could import yaralyzer's log directly but they do it from here to trigger logging setup
1111
from yaralyzer.util.logging import DEFAULT_LOG_HANDLER_KWARGS, log, log_console, log_trace
1212

13-
from pdfalyzer.output.highlighter import PYPDF_LOG_PFX_PATTERN, LogHighlighter, PdfHighlighter
13+
from pdfalyzer.output.highlighter import PYPDF_LOG_PFX_PATTERN, log_highlighter, pdf_highlighter
1414

1515
PYPDF_LOG_PFX = PYPDF_LOG_PFX_PATTERN.replace("\\", '')
1616

@@ -19,9 +19,10 @@ def highlight(text: str | Text) -> Text:
1919
return pdf_highlighter(log_highlighter(text))
2020

2121

22-
log_highlighter = LogHighlighter()
23-
pdf_highlighter = PdfHighlighter()
24-
log_handler_kwargs = {'highlighter': log_highlighter, **DEFAULT_LOG_HANDLER_KWARGS}
22+
log_handler_kwargs = {
23+
'highlighter': log_highlighter,
24+
**DEFAULT_LOG_HANDLER_KWARGS
25+
}
2526

2627
# Redirect pypdf logs
2728
pypdf_log_handler = RichHandler(**log_handler_kwargs)

0 commit comments

Comments
 (0)