1 files changed, 71 insertions, 23 deletions

diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx
index eecc3102f..e5cc9690f 100644
--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,16 +22,18 @@
 #include "CommandError.hxx"
 #include "protocol/Ack.hxx"
 #include "protocol/Result.hxx"
-#include "ClientFile.hxx"
-#include "Client.hxx"
+#include "client/Client.hxx"
 #include "util/CharUtil.hxx"
+#include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 #include "tag/TagHandler.hxx"
 #include "tag/ApeTag.hxx"
 #include "tag/TagId3.hxx"
+#include "TagStream.hxx"
 #include "TagFile.hxx"
-#include "Mapper.hxx"
+#include "storage/StorageInterface.hxx"
 #include "fs/AllocatedPath.hxx"
+#include "ls.hxx"
 
 #include <assert.h>
 
@@ -80,6 +82,41 @@ static constexpr tag_handler print_comment_handler = {
 	print_pair,
 };
 
+static CommandResult
+read_stream_comments(Client &client, const char *uri)
+{
+	if (!uri_supported_scheme(uri)) {
+		command_error(client, ACK_ERROR_NO_EXIST,
+			      "unsupported URI scheme");
+		return CommandResult::ERROR;
+	}
+
+	if (!tag_stream_scan(uri, print_comment_handler, &client)) {
+		command_error(client, ACK_ERROR_NO_EXIST,
+			      "Failed to load file");
+		return CommandResult::ERROR;
+	}
+
+	return CommandResult::OK;
+
+}
+
+static CommandResult
+read_file_comments(Client &client, const Path path_fs)
+{
+	if (!tag_file_scan(path_fs, print_comment_handler, &client)) {
+		command_error(client, ACK_ERROR_NO_EXIST,
+			      "Failed to load file");
+		return CommandResult::ERROR;
+	}
+
+	tag_ape_scan2(path_fs, &print_comment_handler, &client);
+	tag_id3_scan(path_fs, &print_comment_handler, &client);
+
+	return CommandResult::OK;
+
+}
+
 CommandResult
 handle_read_comments(Client &client, gcc_unused int argc, char *argv[])
 {
@@ -87,12 +124,10 @@ handle_read_comments(Client &client, gcc_unused int argc, char *argv[])
 
 	const char *const uri = argv[1];
 
-	AllocatedPath path_fs = AllocatedPath::Null();
-
 	if (memcmp(uri, "file:///", 8) == 0) {
 		/* read comments from arbitrary local file */
 		const char *path_utf8 = uri + 7;
-		path_fs = AllocatedPath::FromUTF8(path_utf8);
+		AllocatedPath path_fs = AllocatedPath::FromUTF8(path_utf8);
 		if (path_fs.IsNull()) {
 			command_error(client, ACK_ERROR_NO_EXIST,
 				      "unsupported file name");
@@ -100,28 +135,41 @@ handle_read_comments(Client &client, gcc_unused int argc, char *argv[])
 		}
 
 		Error error;
-		if (!client_allow_file(client, path_fs, error))
+		if (!client.AllowFile(path_fs, error))
 			return print_error(client, error);
-	} else if (*uri != '/') {
-		path_fs = map_uri_fs(uri);
-		if (path_fs.IsNull()) {
+
+		return read_file_comments(client, path_fs);
+	} else if (uri_has_scheme(uri)) {
+		return read_stream_comments(client, uri);
+	} else if (!PathTraitsUTF8::IsAbsolute(uri)) {
+#ifdef ENABLE_DATABASE
+		const Storage *storage = client.GetStorage();
+		if (storage == nullptr) {
+#endif
 			command_error(client, ACK_ERROR_NO_EXIST,
-				      "No such file");
+				      "No database");
 			return CommandResult::ERROR;
+#ifdef ENABLE_DATABASE
 		}
-	} else {
+
+		{
+			AllocatedPath path_fs = storage->MapFS(uri);
+			if (!path_fs.IsNull())
+				return read_file_comments(client, path_fs);
+		}
+
+		{
+			const std::string uri2 = storage->MapUTF8(uri);
+			if (uri_has_scheme(uri2.c_str()))
+				return read_stream_comments(client,
+							    uri2.c_str());
+		}
+
 		command_error(client, ACK_ERROR_NO_EXIST, "No such file");
 		return CommandResult::ERROR;
-	}
-
-	if (!tag_file_scan(path_fs, &print_comment_handler, &client)) {
-		command_error(client, ACK_ERROR_NO_EXIST,
-			      "Failed to load file");
+#endif
+	} else {
+		command_error(client, ACK_ERROR_NO_EXIST, "No such file");
 		return CommandResult::ERROR;
 	}
-
-	tag_ape_scan2(path_fs, &print_comment_handler, &client);
-	tag_id3_scan(path_fs, &print_comment_handler, &client);
-
-	return CommandResult::OK;
 }