Skip to content

Commit c0ed7cd

Browse files
author
ashariyar
committed
move ask_to_proceed() to interaction_helper.py
1 parent 8e72c08 commit c0ed7cd

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

pdfalyzer/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
from pdfalyzer.decorators.pdf_file import PdfFile
1515
from pdfalyzer.output.pdfalyzer_presenter import PdfalyzerPresenter
1616
from pdfalyzer.pdfalyzer import Pdfalyzer
17-
from pdfalyzer.util.argument_parser import ask_to_proceed, parser
17+
from pdfalyzer.util.argument_parser import parser
1818
from pdfalyzer.util.cli_tools_argument_parsers import (MAX_QUALITY, parse_combine_pdfs_args,
1919
parse_pdf_page_extraction_args, parse_text_extraction_args)
2020
from pdfalyzer.util.exceptions import PdfParserError
2121
from pdfalyzer.util.helpers.filesystem_helper import file_size_in_mb, set_max_open_files
22+
from pdfalyzer.util.helpers.interaction_helper import ask_to_proceed
2223
from pdfalyzer.util.logging import log # Trigger log setup
2324
from pdfalyzer.util.output_section import OutputSection
2425
from pdfalyzer.util.pdf_parser_manager import PdfParserManager

pdfalyzer/util/argument_parser.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"""
44
import sys
55
from argparse import ArgumentParser
6-
from typing import Type
76

87
from rich_argparse_plus import RichHelpFormatterPlus
98
from rich.prompt import Confirm
@@ -137,16 +136,3 @@
137136
# Make sure the selection section is at the top
138137
parser._action_groups = parser._action_groups[:2] + [parser._action_groups[-1]] + parser._action_groups[2:-1]
139138
is_pdfalyze_script = parser.prog.startswith(PDFALYZE) # startswith() bc on Windows we end up with 'pdfalyze.cmd'?
140-
141-
142-
#############
143-
# Helpers #
144-
#############
145-
146-
def ask_to_proceed(msg: str | Text | None = None) -> None:
147-
"""Exit if user doesn't confirm they want to proceed."""
148-
msg = msg if isinstance(msg, Text) else Text(msg or "Proceed anyway?")
149-
150-
if not Confirm.ask(msg):
151-
log_console.print('Exiting...', style='dim')
152-
sys.exit()

pdfalyzer/util/cli_tools_argument_parsers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from pdfalyzer.util.helpers.filesystem_helper import (do_all_files_exist, extract_page_number, is_pdf,
2222
with_pdf_extension)
23-
from pdfalyzer.util.argument_parser import ask_to_proceed
23+
from pdfalyzer.util.helpers.interaction_helper import ask_to_proceed
2424
from pdfalyzer.util.page_range import PageRangeArgumentValidator
2525

2626
MAX_QUALITY = 10
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
"""Helpers for dealing with user interaction."""
2+
import sys
3+
4+
from rich.prompt import Confirm
5+
from rich.text import Text
6+
from yaralyzer.util.logging import log_console
7+
8+
9+
def ask_to_proceed(msg: str | Text | None = None) -> None:
10+
"""Exit if user doesn't confirm they want to proceed."""
11+
msg = msg if isinstance(msg, Text) else Text(msg or "Proceed anyway?")
12+
13+
if not Confirm.ask(msg):
14+
log_console.print('Exiting...', style='dim')
15+
sys.exit()

0 commit comments

Comments
 (0)