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

Fixes the "Unrecognized URI" error with the udisks storage plugin, which is caused by the kludge in UdisksStorage::MapUTF8().

db/update/Walk: pass concatenated .mpdignore URI to storage.MapUTF8()
5b291ff7 · Max Kellermann · 39d6816a · 5b291ff7 · 5b291ff7
Commit 5b291ff7 authored Jul 06, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

NEWS NEWS +2 -0

Walk.cxx src/db/update/Walk.cxx +2 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.25 (not yet released)
 * protocol:
  - fix crash when using "rangeid" while playing
+* storage
+  - udisks: fix reading ".mpdignore"
 * input
  - file: detect premature end of file
  - smbclient: don't send credentials to MPD clients

--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -341,8 +341,8 @@ UpdateWalk::UpdateDirectory(Directory &directory,
 	try {
 		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);
 		child_exclude_list.Load(std::move(is));
 	} catch (...) {