dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CueParser: Formatting

Browse Source
This commit is contained in:
Jonas Kvinge
2024-06-14 21:17:59 +02:00
parent a684b35203
commit 87c69f7456
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/playlistparsers/cueparser.cpp
View File

@@ -98,7 +98,7 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const
#endif #endif
QString dir_path = dir.absolutePath(); QString dir_path = dir.absolutePath();
// read the first line already // Read the first line already
QString line = text_stream.readLine(); QString line = text_stream.readLine();
QList<CueEntry> entries; QList<CueEntry> entries;
@@ -120,14 +120,20 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const
do { do {
QStringList splitted = SplitCueLine(line); QStringList splitted = SplitCueLine(line);
// uninteresting or incorrect line // Uninteresting or incorrect line
if (splitted.size() < 2) { if (splitted.size() < 2) {
continue; continue;
} }
const QString &line_name = splitted[0]; const QString &line_name = splitted[0];
const QString &line_value = splitted[1]; const QString &line_value = splitted[1];
if (line_name.compare(QLatin1String(kPerformer), Qt::CaseInsensitive) == 0) { if (line_name.compare(QLatin1String(kFile), Qt::CaseInsensitive) == 0) {
file = QDir::isAbsolutePath(line_value) ? line_value : dir.absoluteFilePath(line_value);
if (splitted.size() > 2) {
file_type = splitted[2];
}
}
else if (line_name.compare(QLatin1String(kPerformer), Qt::CaseInsensitive) == 0) {
album_artist = line_value; album_artist = line_value;
} }
else if (line_name.compare(QLatin1String(kTitle), Qt::CaseInsensitive) == 0) { else if (line_name.compare(QLatin1String(kTitle), Qt::CaseInsensitive) == 0) {
@@ -139,12 +145,6 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const
else if (line_name.compare(QLatin1String(kComposer), Qt::CaseInsensitive) == 0) { else if (line_name.compare(QLatin1String(kComposer), Qt::CaseInsensitive) == 0) {
album_composer = line_value; album_composer = line_value;
} }
else if (line_name.compare(QLatin1String(kFile), Qt::CaseInsensitive) == 0) {
file = QDir::isAbsolutePath(line_value) ? line_value : dir.absoluteFilePath(line_value);
if (splitted.size() > 2) {
file_type = splitted[2];
}
}
else if (line_name.compare(QLatin1String(kRem), Qt::CaseInsensitive) == 0) { else if (line_name.compare(QLatin1String(kRem), Qt::CaseInsensitive) == 0) {
if (splitted.size() < 3) { if (splitted.size() < 3) {
break; break;
@@ -159,20 +159,20 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const
disc = splitted[2]; disc = splitted[2];
} }
} }
// end of the header -> go into the track mode // End of the header -> go into the track mode
else if (line_name.compare(QLatin1String(kTrack), Qt::CaseInsensitive) == 0) { else if (line_name.compare(QLatin1String(kTrack), Qt::CaseInsensitive) == 0) {
files++; files++;
break; break;
} }
// just ignore the rest of possible field types for now... // Ignore the rest of possible field types for now...
} while (!(line = text_stream.readLine()).isNull()); } while (!(line = text_stream.readLine()).isNull());
if (line.isNull()) { if (line.isNull()) {
qLog(Warning) << "the .cue file from " << dir_path << " defines no tracks!"; qLog(Warning) << "The .cue file from" << dir_path << "defines no tracks!";
return ret; return ret;
} }
// if this is a data file, all of its tracks will be ignored // If this is a data file, all of its tracks will be ignored
bool valid_file = file_type.compare(QLatin1String("BINARY"), Qt::CaseInsensitive) != 0 && file_type.compare(QLatin1String("MOTOROLA"), Qt::CaseInsensitive) != 0; bool valid_file = file_type.compare(QLatin1String("BINARY"), Qt::CaseInsensitive) != 0 && file_type.compare(QLatin1String("MOTOROLA"), Qt::CaseInsensitive) != 0;
QString track_type; QString track_type;
@@ -187,7 +187,7 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const
do { do {
QStringList splitted = SplitCueLine(line); QStringList splitted = SplitCueLine(line);
// uninteresting or incorrect line // Uninteresting or incorrect line
if (splitted.size() < 2) { if (splitted.size() < 2) {
continue; continue;
} }
@@ -198,13 +198,13 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const
if (line_name.compare(QLatin1String(kTrack), Qt::CaseInsensitive) == 0) { if (line_name.compare(QLatin1String(kTrack), Qt::CaseInsensitive) == 0) {
// the beginning of another track's definition - we're saving the current one for later (if it's valid of course) // The beginning of another track's definition - we're saving the current one for later (if it's valid of course)
// please note that the same code is repeated just after this 'do-while' loop // please note that the same code is repeated just after this 'do-while' loop
if (valid_file && !index.isEmpty() && (track_type.isEmpty() || track_type.compare(QLatin1String(kAudioTrackType), Qt::CaseInsensitive) == 0)) { if (valid_file && !index.isEmpty() && (track_type.isEmpty() || track_type.compare(QLatin1String(kAudioTrackType), Qt::CaseInsensitive) == 0)) {
entries.append(CueEntry(file, index, title, artist, album_artist, album, composer, album_composer, (genre.isEmpty() ? album_genre : genre), (date.isEmpty() ? album_date : date), disc)); entries.append(CueEntry(file, index, title, artist, album_artist, album, composer, album_composer, (genre.isEmpty() ? album_genre : genre), (date.isEmpty() ? album_date : date), disc));
} }
// clear the state // Clear the state
track_type = index = artist = composer = title = date = genre = QLatin1String(""); track_type = index = artist = composer = title = date = genre = QLatin1String("");
if (!line_additional.isEmpty()) { if (!line_additional.isEmpty()) {
@@ -284,13 +284,13 @@ SongList CueParser::Load(QIODevice *device, const QString &playlist_path, const
// The last TRACK for every FILE gets it's 'end' marker from the media file's length // The last TRACK for every FILE gets it's 'end' marker from the media file's length
if (i + 1 < entries.size() && entries.at(i).file == entries.at(i + 1).file) { if (i + 1 < entries.size() && entries.at(i).file == entries.at(i + 1).file) {
// incorrect indices? // Incorrect indices?
if (!UpdateSong(entry, entries.at(i + 1).index, &song)) { if (!UpdateSong(entry, entries.at(i + 1).index, &song)) {
continue; continue;
} }
} }
else { else {
// incorrect index? // Incorrect index?
if (!UpdateLastSong(entry, &song)) { if (!UpdateLastSong(entry, &song)) {
continue; continue;
} }