Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/controllers/api/show/cast.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from sqlalchemy import select
from tornado import escape

from models.script import Script, ScriptLine, ScriptRevision
from models.script import Script, ScriptLine, ScriptLineType, ScriptRevision
from models.show import Cast, Character, Show
from rbac.role import Role
from schemas.schemas import CastSchema
Expand Down Expand Up @@ -192,7 +192,7 @@ async def get(self):
line_counts = defaultdict(lambda: defaultdict(lambda: defaultdict(int)))
for line_association in revision.line_associations:
line: ScriptLine = line_association.line
if line.stage_direction:
if line.line_type != ScriptLineType.DIALOGUE:
continue
for line_part in line.line_parts:
if line_part.line_part_cuts is not None:
Expand Down
4 changes: 2 additions & 2 deletions server/controllers/api/show/characters.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from sqlalchemy import select
from tornado import escape

from models.script import Script, ScriptLine, ScriptRevision
from models.script import Script, ScriptLine, ScriptLineType, ScriptRevision
from models.show import Cast, Character, CharacterGroup, Show
from rbac.role import Role
from schemas.schemas import CharacterGroupSchema, CharacterSchema
Expand Down Expand Up @@ -204,7 +204,7 @@ async def get(self):
line_counts = defaultdict(lambda: defaultdict(lambda: defaultdict(int)))
for line_association in revision.line_associations:
line: ScriptLine = line_association.line
if line.stage_direction:
if line.line_type != ScriptLineType.DIALOGUE:
continue
for line_part in line.line_parts:
if line_part.line_part_cuts is not None:
Expand Down
11 changes: 6 additions & 5 deletions server/test/utils/show/test_mic_assignment.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from unittest.mock import MagicMock
from collections import defaultdict

from models.script import ScriptLineType
from utils.show.mic_assignment import (
SceneMetadata,
swap_cost,
Expand Down Expand Up @@ -81,7 +82,7 @@ def mock_revision(self):
# Create mock line associations
line1 = MagicMock()
line1.scene_id = 1
line1.stage_direction = False
line1.line_type = ScriptLineType.DIALOGUE

line_part1 = MagicMock()
line_part1.character_id = 10
Expand All @@ -96,7 +97,7 @@ def mock_revision(self):
# Line 2 - same character in different scene
line2 = MagicMock()
line2.scene_id = 2
line2.stage_direction = False
line2.line_type = ScriptLineType.DIALOGUE

line_part2 = MagicMock()
line_part2.character_id = 10
Expand Down Expand Up @@ -156,7 +157,7 @@ def test_stage_directions_ignored(self):
# Create stage direction line
line = MagicMock()
line.scene_id = 1
line.stage_direction = True
line.line_type = ScriptLineType.STAGE_DIRECTION

line_part = MagicMock()
line_part.character_id = 10
Expand Down Expand Up @@ -184,7 +185,7 @@ def test_cut_lines_ignored(self):
# Create cut line
line = MagicMock()
line.scene_id = 1
line.stage_direction = False
line.line_type = ScriptLineType.DIALOGUE

line_part = MagicMock()
line_part.character_id = 10
Expand Down Expand Up @@ -212,7 +213,7 @@ def test_character_groups_expanded(self):
# Create line with character group
line = MagicMock()
line.scene_id = 1
line.stage_direction = False
line.line_type = ScriptLineType.DIALOGUE

line_part = MagicMock()
line_part.character_id = None
Expand Down
4 changes: 2 additions & 2 deletions server/utils/show/mic_assignment.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from sqlalchemy.orm import Session

from models.mics import MicrophoneAllocation
from models.script import ScriptLine, ScriptRevision
from models.script import ScriptLine, ScriptLineType, ScriptRevision
from models.show import Character, CharacterGroup


Expand Down Expand Up @@ -124,7 +124,7 @@ def collect_character_appearances(
line: ScriptLine = line_assoc.line

# Skip stage directions
if line.stage_direction:
if line.line_type != ScriptLineType.DIALOGUE:
continue

# Count lines per character
Expand Down
Loading