From 8407d31333564f7539c7a4dfe2de3d2f743ed5c0 Mon Sep 17 00:00:00 2001
From: Jamie Hardt <jamiehardt@me.com>
Date: Fri, 4 Nov 2022 18:03:29 -0700
Subject: [PATCH] Update adr_entity.py

---
 ptulsconv/docparser/adr_entity.py | 112 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 57 deletions(-)

diff --git a/ptulsconv/docparser/adr_entity.py b/ptulsconv/docparser/adr_entity.py
index ed05195..20834ec 100644
--- a/ptulsconv/docparser/adr_entity.py
+++ b/ptulsconv/docparser/adr_entity.py
@@ -1,5 +1,5 @@
 from ptulsconv.docparser.tag_compiler import Event
-from typing import Optional, List, Tuple, Any
+from typing import Optional, List, Tuple 
 from dataclasses import dataclass
 from fractions import Fraction
 
@@ -11,12 +11,10 @@ def make_entities(from_events: List[Event]) -> Tuple[List['GenericEvent'], List[
     adr_lines = list()
 
     for event in from_events:
-        result: Any = make_entity(event)
+        result = make_entity(event)
         if type(result) is ADRLine:
-            result: ADRLine
             adr_lines.append(result)
         elif type(result) is GenericEvent:
-            result: GenericEvent
             generic_events.append(result)
 
     return generic_events, adr_lines
@@ -41,17 +39,17 @@ def make_entity(from_event: Event) -> Optional[object]:
 
 @dataclass
 class GenericEvent:
-    title: Optional[str]
-    supervisor: Optional[str]
-    client: Optional[str]
-    scene: Optional[str]
-    version: Optional[str]
-    reel: Optional[str]
-    start: Optional[Fraction]
-    finish: Optional[Fraction]
-    omitted: bool
-    note: Optional[str]
-    requested_by: Optional[str]
+    title: str = ""
+    supervisor: Optional[str] = None
+    client: Optional[str] = None
+    scene: Optional[str] = None
+    version: Optional[str] = None
+    reel: Optional[str] = None
+    start: Fraction = Fraction(0,1)
+    finish: Fraction = Fraction(0,1)
+    omitted: bool = False
+    note: Optional[str] = None
+    requested_by: Optional[str] = None
 
     tag_mapping = [
         TagMapping(source='Title', target="title", alt=TagMapping.ContentSource.Session),
@@ -69,21 +67,21 @@ class GenericEvent:
 
 @dataclass
 class ADRLine(GenericEvent):
-    priority: Optional[int]
-    cue_number: Optional[str]
-    character_id: Optional[str]
-    character_name: Optional[str]
-    actor_name: Optional[str]
-    prompt: Optional[str]
-    reason: Optional[str]
-    time_budget_mins: Optional[float]
-    spot: Optional[str]
-    shot: Optional[str]
-    effort: bool
-    tv: bool
-    tbw: bool
-    adlib: bool
-    optional: bool
+    priority: Optional[int] = None
+    cue_number: Optional[str] = None
+    character_id: Optional[str] = None
+    character_name: Optional[str] = None
+    actor_name: Optional[str] = None
+    prompt: Optional[str] = None
+    reason: Optional[str] = None
+    time_budget_mins: Optional[float] = None
+    spot: Optional[str] = None
+    shot: Optional[str] = None
+    effort: bool = False
+    tv: bool = False
+    tbw: bool = False
+    adlib: bool = False
+    optional: bool = False
 
     tag_mapping = [
 
@@ -111,30 +109,30 @@ class ADRLine(GenericEvent):
                    formatter=(lambda x: len(x) > 0))
     ]
 
-    def __init__(self):
-        self.title = None
-        self.supervisor = None
-        self.client = None
-        self.scene = None
-        self.version = None
-        self.reel = None
-        self.start = None
-        self.finish = None
-        self.priority = None
-        self.cue_number = None
-        self.character_id = None
-        self.character_name = None
-        self.actor_name = None
-        self.prompt = None
-        self.reason = None
-        self.requested_by = None
-        self.time_budget_mins = None
-        self.note = None
-        self.spot = None
-        self.shot = None
-        self.effort = False
-        self.tv = False
-        self.tbw = False
-        self.omitted = False
-        self.adlib = False
-        self.optional = False
+    # def __init__(self):
+    #     self.title = None
+    #     self.supervisor = None
+    #     self.client = None
+    #     self.scene = None
+    #     self.version = None
+    #     self.reel = None
+    #     self.start = None
+    #     self.finish = None
+    #     self.priority = None
+    #     self.cue_number = None
+    #     self.character_id = None
+    #     self.character_name = None
+    #     self.actor_name = None
+    #     self.prompt = None
+    #     self.reason = None
+    #     self.requested_by = None
+    #     self.time_budget_mins = None
+    #     self.note = None
+    #     self.spot = None
+    #     self.shot = None
+    #     self.effort = False
+    #     self.tv = False
+    #     self.tbw = False
+    #     self.omitted = False
+    #     self.adlib = False
+    #     self.optional = False