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
11 changes: 11 additions & 0 deletions tests/services/test_index_service.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
from unittest.mock import patch

from tests.base import ApiDBTestCase

from zou.app.services import assets_service, index_service
from zou.app.services.exception import SequenceNotFoundException


class IndexServiceTestCase(ApiDBTestCase):
Expand Down Expand Up @@ -65,3 +68,11 @@ def test_search_assets_after_deletion(self):
assets_service.remove_asset(asset["id"])
assets = index_service.search_assets("girafe")
self.assertEqual(len(assets), 0)

def test_reset_index_with_orphan_shot(self):
with patch.object(
index_service.shots_service,
"get_sequence",
side_effect=SequenceNotFoundException,
):
index_service.reset_index()
22 changes: 17 additions & 5 deletions zou/app/services/index_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
projects_service,
shots_service,
)
from zou.app.services.exception import (
EpisodeNotFoundException,
SequenceNotFoundException,
)


def get_index(index_name):
Expand Down Expand Up @@ -414,18 +418,26 @@ def prepare_shot(shot, index=None):

episode_id = ""
episode = None
sequence = None
sequence_id = shot_serialized.get("parent_id", "")
if sequence_id != "":
sequence = shots_service.get_sequence(sequence_id)
episode_id = sequence.get("parent_id", "")
if episode_id not in ["", "None", None]:
episode = shots_service.get_episode(episode_id)
try:
sequence = shots_service.get_sequence(sequence_id)
except SequenceNotFoundException:
sequence_id = ""
else:
episode_id = sequence.get("parent_id", "") or ""
if episode_id not in ["", "None", None]:
try:
episode = shots_service.get_episode(episode_id)
except EpisodeNotFoundException:
episode_id = ""

shot_name = shot_serialized["name"]
name = shot_name + " " + shot_name.replace("_", " ").replace("-", " ")
if episode is not None:
shot_name = f'{episode["name"]} {sequence["name"]} {name}'
else:
elif sequence is not None:
shot_name = f'{sequence["name"]} {name}'

metadatas = {}
Expand Down
Loading