From ece2d95845f0ae31f96cf6f9923fbb29da9cbfa3 Mon Sep 17 00:00:00 2001 From: ^_^ <8480595+ballaballaballa@users.noreply.github.com> Date: Tue, 13 Jan 2026 12:50:12 +0100 Subject: [PATCH] refactor: move output-related modules to output folder - Move pdf_converter.py to output/ - Move epub_metadata.py and epub_metadata_writers.py to output/metadata/ - Update imports in __main__.py --- grawlix/__main__.py | 4 ++-- grawlix/{ => output/metadata}/epub_metadata.py | 0 grawlix/{ => output/metadata}/epub_metadata_writers.py | 0 grawlix/{ => output}/pdf_converter.py | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename grawlix/{ => output/metadata}/epub_metadata.py (100%) rename grawlix/{ => output/metadata}/epub_metadata_writers.py (100%) rename grawlix/{ => output}/pdf_converter.py (100%) diff --git a/grawlix/__main__.py b/grawlix/__main__.py index 89bcbf6..0b4341f 100644 --- a/grawlix/__main__.py +++ b/grawlix/__main__.py @@ -166,7 +166,7 @@ async def download_with_progress(book: Book, progress: Progress, template: str, # Convert PDF-in-epub to PDF if needed (Nextory wraps PDFs in epub containers) if book.source_data and book.source_data.get('source_name') == 'nextory': from .output import format_output_location, get_default_format - from .pdf_converter import convert_pdf_epub_to_pdf, is_pdf_in_epub + from .output.pdf_converter import convert_pdf_epub_to_pdf, is_pdf_in_epub output_format = get_default_format(book) location = format_output_location(book, output_format, template) @@ -178,7 +178,7 @@ async def download_with_progress(book: Book, progress: Progress, template: str, # Write metadata if requested and available if write_metadata and book.source_data: from .output import format_output_location, get_default_format, find_output_format, get_valid_extensions - from . import epub_metadata, epub_metadata_writers + from .output.metadata import epub_metadata, epub_metadata_writers # Determine output file location _, ext = os.path.splitext(template) diff --git a/grawlix/epub_metadata.py b/grawlix/output/metadata/epub_metadata.py similarity index 100% rename from grawlix/epub_metadata.py rename to grawlix/output/metadata/epub_metadata.py diff --git a/grawlix/epub_metadata_writers.py b/grawlix/output/metadata/epub_metadata_writers.py similarity index 100% rename from grawlix/epub_metadata_writers.py rename to grawlix/output/metadata/epub_metadata_writers.py diff --git a/grawlix/pdf_converter.py b/grawlix/output/pdf_converter.py similarity index 100% rename from grawlix/pdf_converter.py rename to grawlix/output/pdf_converter.py