From d21e545f28f9aa6b4a169bb45d3940a5591b681f Mon Sep 17 00:00:00 2001
From: Sting <lallegre26@gmail.com>
Date: Sun, 26 Nov 2023 14:55:28 +0100
Subject: [PATCH] Skip detection of blank lines in lyrics
---
autokara/autosyl/assUtils.py | 39 ++++++++++++++++++------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/autokara/autosyl/assUtils.py b/autokara/autosyl/assUtils.py
index 0362147..32521d7 100644
--- a/autokara/autosyl/assUtils.py
+++ b/autokara/autosyl/assUtils.py
@@ -32,25 +32,26 @@ def getSyls(ass_file):
LINES_KARA = re.compile(r"(?:Comment|Dialogue):.*(\d+:\d{2}:\d{2}.\d{2}),(\d+:\d{2}:\d{2}.\d{2}),([^,]*),([^,]*),(\d+),(\d+),(\d+),(?:(?!fx|template|code)\w)*,(.*)\n")
RGX_TAGS = re.compile(r"\{\\k(\d+)\}([^\{\n\r]*)")
for line in LINES_KARA.findall(CONTENT):
- syl_line = []
- lastTime = dateToTime(line[0])
- syl_line_index = 0
- for couple in RGX_TAGS.findall(line[7]):
- if couple[1] != '' and not strip_regex.sub('', couple[1]) == '':
- syl_line.append([lastTime, couple[1], int(couple[0])])
- syl_line_index += 1
- if couple[1].isspace() and len(couple[1]) > 0 and syl_line_index > 0:
- syl_line[syl_line_index - 1][1] += " "
- lastTime += int(couple[0])
- syl_line.append([lastTime, '', 0])
- SYLS.append(syl_line)
- line_meta = {}
- line_meta['stylename'] = line[2]
- line_meta['actor'] = line[3]
- line_meta['margin_l'] = int(line[4])
- line_meta['margin_r'] = int(line[5])
- line_meta['margin_v'] = int(line[6])
- META.append(line_meta)
+ if line[7].strip() != "":
+ syl_line = []
+ lastTime = dateToTime(line[0])
+ syl_line_index = 0
+ for couple in RGX_TAGS.findall(line[7]):
+ if couple[1] != '' and not strip_regex.sub('', couple[1]) == '':
+ syl_line.append([lastTime, couple[1], int(couple[0])])
+ syl_line_index += 1
+ if couple[1].isspace() and len(couple[1]) > 0 and syl_line_index > 0:
+ syl_line[syl_line_index - 1][1] += " "
+ lastTime += int(couple[0])
+ syl_line.append([lastTime, '', 0])
+ SYLS.append(syl_line)
+ line_meta = {}
+ line_meta['stylename'] = line[2]
+ line_meta['actor'] = line[3]
+ line_meta['margin_l'] = int(line[4])
+ line_meta['margin_r'] = int(line[5])
+ line_meta['margin_v'] = int(line[6])
+ META.append(line_meta)
return SYLS, META
--
GitLab