chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing lyric list coming back wrong

Browse source
This commit is contained in:
Chris Cochrun 2022-09-01 06:29:55 -05:00
parent ae5edd8cad
commit 88698a9a6c
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/songsqlmodel.cpp
View file

@ -171,7 +171,6 @@ QStringList SongSqlModel::getLyricList(const int &row) {
"Intro 1", "Intro 2", "Ending 1", "Ending 2", "Intro 1", "Intro 2", "Ending 1", "Ending 2",
"Other 1", "Other 2", "Other 3", "Other 4"}; "Other 1", "Other 2", "Other 3", "Other 4"};
bool recordVerse;
bool firstItem = true; bool firstItem = true;
QString verse; QString verse;
QString vtitle; QString vtitle;
@ -185,37 +184,40 @@ QStringList SongSqlModel::getLyricList(const int &row) {
// qDebug() << line; // qDebug() << line;
if (firstItem) { if (firstItem) {
if (keywords.contains(line)) { if (keywords.contains(line)) {
recordVerse = true; // qDebug() << line;
firstItem = false; firstItem = false;
vtitle = line; vtitle = line;
continue; continue;
} }
} else if (keywords.contains(line)) { } else if (keywords.contains(line)) {
// qDebug() << verse; // qDebug() << verse;
verse = verse.trimmed(); // qDebug() << line;
if (verse.contains("\n\n")) { if (verse.contains("\n\n")) {
qDebug() << "THIS IS A EMPTY SLIDE!" << verse; verse = verse.trimmed();
// qDebug() << "THIS IS A EMPTY SLIDE!" << verse;
QStringList multiverses = verse.split("\n\n"); QStringList multiverses = verse.split("\n\n");
foreach (verse, multiverses) foreach (verse, multiverses) {
verses.insert(vtitle, verse); verses.insert(vtitle, verse);
// qDebug() << verse;
}
verse.clear(); verse.clear();
multiverses.clear(); multiverses.clear();
vtitle = line; vtitle = line;
recordVerse = false;
continue; continue;
} }
verses.insert(vtitle, verse); verses.insert(vtitle, verse);
verse.clear(); verse.clear();
vtitle = line; vtitle = line;
recordVerse = false; continue;
} else if (rawLyrics.endsWith(line)) { } else if (rawLyrics.endsWith(line)) {
qDebug() << vtitle;
verse.append(line.trimmed() + "\n");
verses.insert(vtitle, verse); verses.insert(vtitle, verse);
break; break;
} }
if (recordVerse) { // qDebug() << line;
verse.append(line.trimmed() + "\n"); verse.append(line.trimmed() + "\n");
} // qDebug() << verse;
recordVerse = true;
} }
// qDebug() << verses; // qDebug() << verses;