diff --git a/src/ptulsconv/pdf/__init__.py b/src/ptulsconv/pdf/__init__.py index 3fabcbd..115314e 100644 --- a/src/ptulsconv/pdf/__init__.py +++ b/src/ptulsconv/pdf/__init__.py @@ -1,5 +1,6 @@ +from __future__ import annotations + import datetime -from typing import List from reportlab.lib.units import inch from reportlab.pdfbase import pdfmetrics @@ -70,10 +71,10 @@ def make_doc_template( client: str, document_subheader: str, left_margin=0.5 * inch, - fonts: List[TTFont] = [], + fonts: list[TTFont] = [], ) -> ADRDocTemplate: right_margin = top_margin = bottom_margin = 0.5 * inch - page_box = GRect(0.0, 0.0, page_size[0], page_size[1]) + page_box: GRect = GRect(0.0, 0.0, page_size[0], page_size[1]) _, page_box = page_box.split_x(left_margin, direction="l") _, page_box = page_box.split_x(right_margin, direction="r") _, page_box = page_box.split_y(bottom_margin, direction="u") diff --git a/src/ptulsconv/pdf/continuity.py b/src/ptulsconv/pdf/continuity.py index 29a2928..2e1ca75 100644 --- a/src/ptulsconv/pdf/continuity.py +++ b/src/ptulsconv/pdf/continuity.py @@ -1,5 +1,4 @@ from fractions import Fraction -from typing import List, Tuple from reportlab.lib.pagesizes import letter, portrait from reportlab.lib.styles import getSampleStyleSheet @@ -9,8 +8,6 @@ from reportlab.platypus import Paragraph, Table from ptulsconv.broadcast_timecode import TimecodeFormat from ptulsconv.pdf import make_doc_template -# TODO: A Continuity - def table_for_scene(scene, tc_format, font_name="Helvetica"): scene_style = getSampleStyleSheet()["Normal"] @@ -19,11 +16,8 @@ def table_for_scene(scene, tc_format, font_name="Helvetica"): scene_style.leftPadding = 0.0 scene_style.spaceAfter = 18.0 - tc_data = "%s
%s" % ( - tc_format.seconds_to_smpte(scene[2]), - tc_format.seconds_to_smpte(scene[3]), - ) - + tc_data = f"{tc_format.seconds_to_smpte(scene[2])}
{tc_format.seconds_to_smpte(scene[3])}" + row = [ Paragraph(tc_data, scene_style), Paragraph(scene[1], scene_style), @@ -40,14 +34,14 @@ def table_for_scene(scene, tc_format, font_name="Helvetica"): def output_report( - scenes: List[Tuple[str, str, Fraction, Fraction]], + scenes: list[tuple[str, str, Fraction, Fraction]], tc_display_format: TimecodeFormat, title: str, client: str, supervisor, paper_size=letter, ): - filename = "%s Continuity.pdf" % title + filename = f"{title} Continuity.pdf" document_header = "Continuity" doc = make_doc_template( @@ -61,7 +55,7 @@ def output_report( document_header=document_header, left_margin=0.5 * inch, ) - story = list() + story = [] # story.append(Spacer(height=0.5 * inch, width=1.)) for scene in scenes: story.append(table_for_scene(scene, tc_display_format))