storage/udisks: return file path in MapUTF8()

The absolute udisks:// URI is not usable with InputStream::Open(), and
thus we need to return the LocalStorage::MapUTF8() return value
instead.

1 files changed, 11 insertions, 3 deletions

diff --git a/src/storage/plugins/UdisksStorage.cxx b/src/storage/plugins/UdisksStorage.cxx
index da1463da5..793781a7d 100644
--- a/src/storage/plugins/UdisksStorage.cxx
+++ b/src/storage/plugins/UdisksStorage.cxx
@@ -298,10 +298,18 @@ UdisksStorage::MapUTF8(const char *uri_utf8) const noexcept
 {
 	assert(uri_utf8 != nullptr);
 
-	if (StringIsEmpty(uri_utf8))
-		return base_uri;
+	try {
+		const_cast<UdisksStorage *>(this)->MountWait();
+
+		return mounted_storage->MapUTF8(uri_utf8);
+	} catch (...) {
+		/* fallback - not usable but the best we can do */
 
-	return PathTraitsUTF8::Build(base_uri.c_str(), uri_utf8);
+		if (StringIsEmpty(uri_utf8))
+			return base_uri;
+
+		return PathTraitsUTF8::Build(base_uri.c_str(), uri_utf8);
+	}
 }
 
 const char *