Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

ParserBase: Make the path absolute and try canonical path 

Somehow I got this mixed up in commit 2953f9e :(

Fixes #1448
This commit is contained in:
Jonas Kvinge 2024-05-29 00:18:39 +02:00
parent 6e90e72b4a
commit f0f5300891
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/playlistparsers/parserbase.cpp
View File

@ -64,6 +64,12 @@ void ParserBase::LoadSong(const QString &filename_or_url, const qint64 beginning
}
filename = QDir::cleanPath(filename);
// Make the path absolute
if (!QDir::isAbsolutePath(filename)) {
filename = dir.absoluteFilePath(filename);
}
const QUrl url = QUrl::fromLocalFile(filename);
// Search the collection
@ -75,16 +81,16 @@ void ParserBase::LoadSong(const QString &filename_or_url, const qint64 beginning
if (!collection_song.is_valid()) {
collection_song = collection_backend_->GetSongByUrl(url, beginning);
}
// Try absolute path
if (!collection_song.is_valid() && !QDir::isAbsolutePath(filename)) {
QString absolute_filename = dir.absoluteFilePath(filename);
if (absolute_filename != filename) {
const QUrl absolute_url = QUrl::fromLocalFile(absolute_filename);
// Try canonical path
if (!collection_song.is_valid()) {
const QString canonical_filepath = QFileInfo(filename).canonicalFilePath();
if (canonical_filepath != filename) {
const QUrl canonical_filepath_url = QUrl::fromLocalFile(canonical_filepath);
if (track > 0) {
collection_song = collection_backend_->GetSongByUrlAndTrack(absolute_url, track);
collection_song = collection_backend_->GetSongByUrlAndTrack(canonical_filepath_url, track);
}
if (!collection_song.is_valid()) {
collection_song = collection_backend_->GetSongByUrl(absolute_url, beginning);
collection_song = collection_backend_->GetSongByUrl(canonical_filepath_url, beginning);
}
}
}