vikingowl/polyscribe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[refactor] centralize speaker name resolution to improve readability and reduce redundancy

Browse Source
This commit is contained in:
vikingowl
2025-08-12 06:23:22 +02:00
parent ab57553949
commit 4916aa6224
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main.rs
View File

@@ -316,6 +316,20 @@ fn run() -> Result<()> {
)); ));
} }
// Collect all speaker names up front (one per input), before any file reading/transcription
let speakers: Vec<String> = inputs
.iter()
.map(|input_path| {
let path = Path::new(input_path);
let default_speaker = sanitize_speaker_name(
path.file_stem()
.and_then(|s| s.to_str())
.unwrap_or("speaker"),
);
prompt_speaker_name_for_path(path, &default_speaker, args.set_speaker_names)
})
.collect();
if args.merge_and_separate { if args.merge_and_separate {
polyscribe::dlog!(1, "Mode: merge-and-separate; output_dir={:?}", output_path); polyscribe::dlog!(1, "Mode: merge-and-separate; output_dir={:?}", output_path);
// Combined mode: write separate outputs per input and also a merged output set // Combined mode: write separate outputs per input and also a merged output set
@@ -332,15 +346,9 @@ fn run() -> Result<()> {
let mut merged_entries: Vec<OutputEntry> = Vec::new(); let mut merged_entries: Vec<OutputEntry> = Vec::new();
for input_path in &inputs { for (idx, input_path) in inputs.iter().enumerate() {
let path = Path::new(input_path); let path = Path::new(input_path);
let default_speaker = sanitize_speaker_name( let speaker = speakers[idx].clone();
path.file_stem()
.and_then(|s| s.to_str())
.unwrap_or("speaker"),
);
let speaker =
prompt_speaker_name_for_path(path, &default_speaker, args.set_speaker_names);
// Collect entries per file and extend merged // Collect entries per file and extend merged
let mut entries: Vec<OutputEntry> = Vec::new(); let mut entries: Vec<OutputEntry> = Vec::new();
@@ -484,15 +492,9 @@ fn run() -> Result<()> {
polyscribe::dlog!(1, "Mode: merge; output_base={:?}", output_path); polyscribe::dlog!(1, "Mode: merge; output_base={:?}", output_path);
// MERGED MODE (previous default) // MERGED MODE (previous default)
let mut entries: Vec<OutputEntry> = Vec::new(); let mut entries: Vec<OutputEntry> = Vec::new();
for input_path in &inputs { for (idx, input_path) in inputs.iter().enumerate() {
let path = Path::new(input_path); let path = Path::new(input_path);
let default_speaker = sanitize_speaker_name( let speaker = speakers[idx].clone();
path.file_stem()
.and_then(|s| s.to_str())
.unwrap_or("speaker"),
);
let speaker =
prompt_speaker_name_for_path(path, &default_speaker, args.set_speaker_names);
let mut buf = String::new(); let mut buf = String::new();
if is_audio_file(path) { if is_audio_file(path) {
@@ -627,15 +629,9 @@ fn run() -> Result<()> {
} }
} }
for input_path in &inputs { for (idx, input_path) in inputs.iter().enumerate() {
let path = Path::new(input_path); let path = Path::new(input_path);
let default_speaker = sanitize_speaker_name( let speaker = speakers[idx].clone();
path.file_stem()
.and_then(|s| s.to_str())
.unwrap_or("speaker"),
);
let speaker =
prompt_speaker_name_for_path(path, &default_speaker, args.set_speaker_names);
// Collect entries per file // Collect entries per file
let mut entries: Vec<OutputEntry> = Vec::new(); let mut entries: Vec<OutputEntry> = Vec::new();