From bb6fbcfd373bafabfe5fd09c3b95c03dd4cc4fae Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 Aug 2022 21:32:31 -0700 Subject: [PATCH 1/6] Update __main__.py Print more fields to --available-tags --- ptulsconv/__main__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ptulsconv/__main__.py b/ptulsconv/__main__.py index 996981b..6d0e582 100644 --- a/ptulsconv/__main__.py +++ b/ptulsconv/__main__.py @@ -17,8 +17,9 @@ from ptulsconv.reporting import print_status_style, print_banner_style, print_se def dump_field_map(output=sys.stdout): from ptulsconv.docparser.tag_mapping import TagMapping - from ptulsconv.docparser.adr_entity import ADRLine - + from ptulsconv.docparser.adr_entity import ADRLine, GenericEvent + + TagMapping.print_rules(GenericEvent, output=output) TagMapping.print_rules(ADRLine, output=output) From 8877982a473744eb0af6385af611944109519344 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 Aug 2022 21:32:45 -0700 Subject: [PATCH 2/6] Update summary_log.py Add "OMITTED" to ADR summary pdf --- ptulsconv/pdf/summary_log.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ptulsconv/pdf/summary_log.py b/ptulsconv/pdf/summary_log.py index 5d3fc2f..b68a884 100644 --- a/ptulsconv/pdf/summary_log.py +++ b/ptulsconv/pdf/summary_log.py @@ -34,6 +34,9 @@ def build_aux_data_field(line: ADRLine): elif line.adlib: bg_color = 'purple' tag_field += "%s " % (bg_color, fg_color, "ADLIB") + elif line.omitted: + bg_color = 'green' + tag_field += "%s" % (bg_color, fg_color, "OMITTED") entries.append(tag_field) From 41b1a3185fd18607e48f5ecac3dac5cf7fb1183d Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 Aug 2022 21:32:53 -0700 Subject: [PATCH 3/6] Update __init__.py Nudge version --- ptulsconv/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ptulsconv/__init__.py b/ptulsconv/__init__.py index fc5dc5d..1818d79 100644 --- a/ptulsconv/__init__.py +++ b/ptulsconv/__init__.py @@ -1,5 +1,5 @@ from ptulsconv.docparser.ptuls_grammar import protools_text_export_grammar -__version__ = '0.8.3' +__version__ = '0.8.4' __author__ = 'Jamie Hardt' __license__ = 'MIT' From 9f8e3cf8245c1ec6642f83710d1d62a21c53b057 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 Aug 2022 22:21:16 -0700 Subject: [PATCH 4/6] Update line_count.py Fixed a bug with omitted cues --- ptulsconv/pdf/line_count.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/ptulsconv/pdf/line_count.py b/ptulsconv/pdf/line_count.py index d3f28a3..8c5bb60 100644 --- a/ptulsconv/pdf/line_count.py +++ b/ptulsconv/pdf/line_count.py @@ -148,7 +148,7 @@ def populate_columns(lines: List[ADRLine], columns, include_omitted, _page_size) styles = list() columns_widths = list() - sorted_character_numbers = sorted(set([x.character_id for x in lines]), + sorted_character_numbers: List[str] = sorted(set([x.character_id for x in lines]), key=lambda x: str(x)) # construct column styles @@ -164,18 +164,21 @@ def populate_columns(lines: List[ADRLine], columns, include_omitted, _page_size) for n in sorted_character_numbers: char_records = [x for x in lines if x.character_id == n] - row_data = list() - row_data2 = list() - for col in columns: - row1_index = len(data) - row2_index = row1_index + 1 - row_data.append(col['value_getter'](list(char_records))) - row_data2.append(col['value_getter2'](list(char_records))) - styles.extend([('TEXTCOLOR', (0, row2_index), (-1, row2_index), colors.red), - ('LINEBELOW', (0, row2_index), (-1, row2_index), 0.5, colors.black)]) + if len(char_records) > 0: + row_data = list() + row_data2 = list() - data.append(row_data) - data.append(row_data2) + for col in columns: + row1_index = len(data) + row2_index = row1_index + 1 + row_data.append(col['value_getter'](list(char_records))) + row_data2.append(col['value_getter2'](list(char_records))) + + styles.extend([('TEXTCOLOR', (0, row2_index), (-1, row2_index), colors.red), + ('LINEBELOW', (0, row2_index), (-1, row2_index), 0.5, colors.black)]) + + data.append(row_data) + data.append(row_data2) summary_row1 = list() summary_row2 = list() From c26fa8dd754f0d2e631005dcf2e584d4972ae60a Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 17 Aug 2022 22:21:26 -0700 Subject: [PATCH 5/6] Update summary_log.py Added more metadata readout --- ptulsconv/pdf/summary_log.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ptulsconv/pdf/summary_log.py b/ptulsconv/pdf/summary_log.py index b68a884..11d1cd6 100644 --- a/ptulsconv/pdf/summary_log.py +++ b/ptulsconv/pdf/summary_log.py @@ -34,9 +34,9 @@ def build_aux_data_field(line: ADRLine): elif line.adlib: bg_color = 'purple' tag_field += "%s " % (bg_color, fg_color, "ADLIB") - elif line.omitted: + elif line.optional: bg_color = 'green' - tag_field += "%s" % (bg_color, fg_color, "OMITTED") + tag_field += "%s" % (bg_color, fg_color, "OPTIONAL") entries.append(tag_field) From 05ea48078f4f583bb9f319d58c0ad8ada23494a5 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sun, 4 Sep 2022 14:36:13 -0700 Subject: [PATCH 6/6] Fixed a bug, talent sides weren't sorting by time --- ptulsconv/pdf/talent_sides.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ptulsconv/pdf/talent_sides.py b/ptulsconv/pdf/talent_sides.py index aed7933..cd969d7 100644 --- a/ptulsconv/pdf/talent_sides.py +++ b/ptulsconv/pdf/talent_sides.py @@ -24,7 +24,7 @@ def output_report(lines: List[ADRLine], tc_display_format: TimecodeFormat, font_ char_lines = [line for line in lines if not line.omitted and line.character_id == n] character_name = char_lines[0].character_name - sorted(char_lines, key=lambda line: line.start) + char_lines = sorted(char_lines, key=lambda line: line.start) title = "%s (%s) %s ADR Script" % (char_lines[0].title, character_name, n) filename = "%s_%s_%s_ADR Script.pdf" % (char_lines[0].title, n, character_name)