marc/folkugat-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved lyrics rendering

Browse Source
This commit is contained in:
marc
2025-04-05 23:09:20 +02:00
parent 211a1fbb05
commit 7a823a98ab
6 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
folkugat_web/services/temes/lyrics.py
View File

@@ -17,9 +17,11 @@ def _sub(pattern: str, sub: str) -> Callable[[str], str]:
def _clean_string(lyrics_str: str) -> str:
return (
FnChain.transform(lyrics_str) |
_sub(r" *", " ") |
_sub(r"\s*\n\s*", "\n") |
_sub(r"\n*", "\n")
_sub(r"\t", " ") |
_sub(r" +", " ") |
_sub(r" \n", "\n") |
_sub(r"\n ", "\n") |
_sub(r"\n\n+", "\n\n")
).result()
@@ -37,9 +39,10 @@ def get_lyric_by_id(lyric_id: int, tema_id: int | None = None) -> model.Lyrics |
return next(iter(lyrics_dal.get_lyrics(lyric_id=lyric_id, tema_id=tema_id)), None)
def update_lyric(lyric: model.Lyrics):
lyric = dataclasses.replace(lyric, content=_clean_string(lyric.content))
def update_lyric(lyric: model.Lyrics, title: str, content: str):
lyric = dataclasses.replace(lyric, title=title.strip(), content=_clean_string(content))
lyrics_dal.update_lyric(lyric=lyric)
return lyric
def delete_lyric(lyric_id: int, tema_id: int | None = None):