Skip to content

Commit

Permalink
Ensure Combiner service writes combos.json to the "root" video folder
Browse files Browse the repository at this point in the history
Change-Id: Ieb333b3d226c2b07267bde4746cf4c76c09d9fe7
  • Loading branch information
mohabfekry committed May 2, 2024
1 parent 5d22142 commit 32c3a6d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion service/combiner/combiner.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,8 @@ def render(self):
file_path=combos_json_path,
bucket_name=self.gcs_bucket_name,
destination_file_name=os.path.join(
self.render_file.gcs_folder, ConfigService.OUTPUT_COMBINATIONS_FILE
self.render_file.gcs_root_folder,
ConfigService.OUTPUT_COMBINATIONS_FILE
),
overwrite=True,
)
Expand Down
6 changes: 6 additions & 0 deletions service/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ def __init__(self, filepath: str):
self.file_name = file_path.name
self.file_ext = file_ext[1:]
self.gcs_folder = str(file_path.parents[0])
self.gcs_root_folder = (
str(file_path.parents[1])
if len(file_path.parents) > 2 else self.gcs_folder
)

self.video_metadata = VideoMetadata(self.gcs_folder)
self.full_gcs_path = filepath
self.file_name_ext = f'{self.file_name}.{self.file_ext}'
Expand All @@ -109,6 +114,7 @@ def __str__(self):
f'TriggerFile(file_name_ext={self.file_name_ext}, '
f'full_gcs_path={self.full_gcs_path}, '
f'gcs_folder={self.gcs_folder}, '
f'gcs_root_folder={self.gcs_root_folder}, '
f'video_metadata={self.video_metadata})'
)

Expand Down

0 comments on commit 32c3a6d

Please sign in to comment.