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

db/update/Walk: pass concatenated .mpdignore URI to storage.MapUTF8()

Browse Source 
Fixes the "Unrecognized URI" error with the udisks storage plugin,
which is caused by the kludge in UdisksStorage::MapUTF8().
This commit is contained in:
Max Kellermann
2020-07-06 17:18:48 +02:00
parent 39d6816a6d
commit 5b291ff768
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -1,6 +1,8 @@
ver 0.21.25 (not yet released) ver 0.21.25 (not yet released)
* protocol: * protocol:
- fix crash when using "rangeid" while playing - fix crash when using "rangeid" while playing
* storage
- udisks: fix reading ".mpdignore"
* input * input
- file: detect premature end of file - file: detect premature end of file
- smbclient: don't send credentials to MPD clients - smbclient: don't send credentials to MPD clients

4
src/db/update/Walk.cxx
View File

@@ -341,8 +341,8 @@ UpdateWalk::UpdateDirectory(Directory &directory,
try { try {
Mutex mutex; Mutex mutex;
auto is = InputStream::OpenReady(PathTraitsUTF8::Build(storage.MapUTF8(directory.GetPath()).c_str(), auto is = InputStream::OpenReady(storage.MapUTF8(PathTraitsUTF8::Build(directory.GetPath(),
".mpdignore").c_str(), ".mpdignore").c_str()).c_str(),
mutex); mutex);
child_exclude_list.Load(std::move(is)); child_exclude_list.Load(std::move(is));
} catch (...) { } catch (...) {