From da82ee1d4ed23d7f80c29068f74b7e7e60226c65 Mon Sep 17 00:00:00 2001 From: mrsobakin <68982655+mrsobakin@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:12:25 +0300 Subject: [PATCH] Fixed kugou to lrc conversion --- lyrics_dl/providers/kugou.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lyrics_dl/providers/kugou.py b/lyrics_dl/providers/kugou.py index 9d57bb9..c140b0b 100644 --- a/lyrics_dl/providers/kugou.py +++ b/lyrics_dl/providers/kugou.py @@ -13,7 +13,7 @@ from lyrics_dl.registry import lyrics_provider KRC_ENCODE_KEY = [64, 71, 97, 119, 94, 50, 116, 71, 81, 54, 49, 45, 206, 210, 110, 105] -RE_KRC_JUNK = re.compile(r"^\[((id|ar|ti|by|hash|al|sign|qq|total|language):|offset:0\]|.*\]<.*>?(Written by：|Lyrics by：|Composed by：|Producer：|作曲 :|作词 :)).*$") +RE_KRC_JUNK = re.compile(r"^\[((id|ar|ti|by|hash|al|sign|qq|total|language):|offset:0\]|.*\](<.*>)?(Written by：|Lyrics by：|Composed by：|Producer：|作曲 :|作词 :)).*$") RE_WORD_TIMING = re.compile(r"<\d+,\d+,\d+>") @@ -33,8 +33,6 @@ def reformat_timings(lines: Iterable[str]) -> Iterable[str]: yield line continue - line = RE_WORD_TIMING.sub("", line) - raw_timings, text = line.split("]", 1) beginning, _ = map(int, raw_timings[1:].split(",")) @@ -75,6 +73,7 @@ class Kugou(AbstractProvider): krc = decode_krc(r["content"]) + krc = RE_WORD_TIMING.sub("", krc) lines = reformat_timings(islice(filterfalse(RE_KRC_JUNK.match, krc.splitlines()), 1, None)) return "\n".join(lines)