capture-pipeline: Add helpers for output base

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

1 files changed, 22 insertions, 6 deletions

diff --git a/capture-pipeline b/capture-pipeline
index 59051b3..5aff00e 100755
--- a/capture-pipeline
+++ b/capture-pipeline
@@ -108,8 +108,16 @@ def audio_source_path(sequence, shot, take):
 
 	return None
 
+def audio_output_base(sequence, shot):
+	base = settings_item_entry(shot, "audio-output")
+
+	if "label" in sequence:
+		base = os.path.join(base, sequence["label"])
+
+	return base
+
 def audio_output_name(sequence, shot, take, part = None):
-	base = os.path.join(settings["audio-output"], sequence["label"])
+	base = audio_output_base(sequence, shot)
 	label = shot_label(shot)
 	prefix = shot_prefix(shot)
 	suffix = audio_suffix(shot)
@@ -137,8 +145,8 @@ def audio_output_name(sequence, shot, take, part = None):
 	return name
 
 def audio_output_prepare(sequence, shot, take, part = None):
+	base = audio_output_base(sequence, shot)
 	name = audio_output_name(sequence, shot, take, part)
-	base = os.path.join(settings["audio-output"], sequence["label"])
 
 	try:
 		os.stat(base)
@@ -151,7 +159,7 @@ def audio_output_prepare(sequence, shot, take, part = None):
 				sequence["audio-registry"][name]["index"] += 1
 
 def audio_output_path(sequence, shot, take, part = None):
-	base = os.path.join(settings["audio-output"], sequence["label"])
+	base = audio_output_base(sequence, shot)
 	name = audio_output_name(sequence, shot, take, part)
 	suffix = audio_suffix(shot)
 
@@ -287,8 +295,16 @@ def video_source_path(sequence, shot, take):
 
 	return None
 
+def video_output_base(sequence, shot):
+	base = settings_item_entry(shot, "video-output")
+
+	if "label" in sequence:
+		base = os.path.join(base, sequence["label"])
+
+	return base
+
 def video_output_name(sequence, shot, take, part = None):
-	base = os.path.join(settings["video-output"], sequence["label"])
+	base = video_output_base(sequence, shot)
 	label = shot_label(shot)
 	prefix = shot_prefix(shot)
 	suffix = video_suffix(shot)
@@ -319,8 +335,8 @@ def video_output_name(sequence, shot, take, part = None):
 	return name
 
 def video_output_prepare(sequence, shot, take, part = None):
+	base = video_output_base(sequence, shot)
 	name = video_output_name(sequence, shot, take, part)
-	base = os.path.join(settings["video-output"], sequence["label"])
 
 	try:
 		os.stat(base)
@@ -333,7 +349,7 @@ def video_output_prepare(sequence, shot, take, part = None):
 				sequence["video-registry"][name]["index"] += 1
 
 def video_output_path(sequence, shot, take, part = None):
-	base = os.path.join(settings["video-output"], sequence["label"])
+	base = video_output_base(sequence, shot)
 	name = video_output_name(sequence, shot, take, part)
 	suffix = video_suffix(shot)