db/simple/Directory: add LookupResult::uri

src/db/plugins/simple/Directory.cxx

@@ -133,7 +133,7 @@ Directory::LookupDirectory(const char *_uri) noexcept
 	assert(_uri != nullptr);
 
 	if (isRootDirectory(_uri))
-		return { this, nullptr };
+		return { this, _uri, nullptr };
 
 	StringView uri(_uri);
 
@@ -156,7 +156,7 @@ Directory::LookupDirectory(const char *_uri) noexcept
 		uri = rest;
 	} while (uri != nullptr);
 
-	return { d, uri.data };
+	return { d, StringView(_uri, uri.data - 1), uri.data };
 }
 
 void

src/db/plugins/simple/Directory.hxx

@@ -182,6 +182,11 @@ public:
 		 */
 		Directory *directory;
 
+		/**
+		 * The URI part which resolved to the #directory.
+		 */
+		std::string_view uri;
+
 		/**
 		 * The remaining URI part (without leading slash) or
 		 * nullptr if the given URI was consumed completely.

src/db/plugins/simple/SimpleDatabasePlugin.cxx

@@ -217,7 +217,7 @@ SimpleDatabase::GetSong(const char *uri) const
 			return nullptr;
 
 		prefixed_light_song =
-			new PrefixedLightSong(*song, r.directory->GetPath());
+			new PrefixedLightSong(*song, r.uri);
 		r.directory->mounted_database->ReturnSong(song);
 		return prefixed_light_song;
 	}
@@ -289,7 +289,7 @@ SimpleDatabase::Visit(const DatabaseSelection &selection,
 		/* pass the request and the remaining uri to the mounted database */
 		protect.unlock();
 
-		WalkMount(r.directory->GetPath(), *(r.directory->mounted_database),
+		WalkMount(r.uri, *(r.directory->mounted_database),
 			  (r.rest == nullptr)?"":r.rest, selection,
 			  visit_directory, visit_song, visit_playlist);
 

src/db/update/Service.cxx

@@ -196,11 +196,7 @@ UpdateService::Enqueue(const char *path, bool discard)
 			storage2 = storage.GetMount(path);
 			path = "";
 		} else {
-			assert(lr.rest > path);
+			const std::string mountpoint(lr.uri);
-			assert(lr.rest < path + strlen(path));
-			assert(lr.rest[-1] == '/');
-
-			const std::string mountpoint(path, lr.rest - 1);
 			storage2 = storage.GetMount(mountpoint.c_str());
 			path = lr.rest;
 		}