Commit acc1bd62 authored by James D. Smith's avatar James D. Smith Committed by Max Kellermann

playlist/PlaylistSong: Remove dots from playlist file paths.

parent 49ed9dae
......@@ -24,6 +24,7 @@
#include "fs/Traits.hxx"
#include "song/DetachedSong.hxx"
#include "util/UriExtract.hxx"
#include "util/UriUtil.hxx"
#include <algorithm>
#include <string>
......@@ -96,8 +97,14 @@ playlist_check_translate_song(DetachedSong &song, std::string_view base_uri,
#endif
if (base_uri.data() != nullptr &&
!PathTraitsUTF8::IsAbsoluteOrHasScheme(uri))
!PathTraitsUTF8::IsAbsoluteOrHasScheme(uri)) {
song.SetURI(PathTraitsUTF8::Build(base_uri, uri));
uri = song.GetURI();
}
/* Remove dot segments */
std::string new_uri = uri_squash_dot_segments(uri);
song.SetURI(std::move(new_uri));
return playlist_check_load_song(song, loader);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment