oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist/Song: support backslash in relative URIs

Browse Source 
Closes https://github.com/MusicPlayerDaemon/MPD/issues/607
This commit is contained in:
Max Kellermann
2019-07-29 09:52:18 +02:00
parent 83b0871248
commit 90ea3bf985
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/playlist/PlaylistSong.cxx
View File

@@ -66,6 +66,22 @@ playlist_check_translate_song(DetachedSong &song, const char *base_uri,
base_uri = nullptr;
const char *uri = song.GetURI();
#ifdef _WIN32
if (!PathTraitsUTF8::IsAbsolute(uri) && strchr(uri, '\\') != nullptr) {
/* Windows uses the backslash as path separator, but
the MPD protocol uses the (forward) slash by
definition; to allow backslashes in relative URIs
loaded from playlist files, this step converts all
backslashes to (forward) slashes */
std::string new_uri(uri);
std::replace(new_uri.begin(), new_uri.end(), '\\', '/');
song.SetURI(std::move(new_uri));
uri = song.GetURI();
}
#endif
if (base_uri != nullptr && !uri_has_scheme(uri) &&
!PathTraitsUTF8::IsAbsolute(uri))
song.SetURI(PathTraitsUTF8::Build(base_uri, uri));