1 files changed, 38 insertions, 59 deletions

diff --git a/src/command/QueueCommands.cxx b/src/command/QueueCommands.cxx
index a21eb75f0..f14beb872 100644
--- a/src/command/QueueCommands.cxx
+++ b/src/command/QueueCommands.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
@@ -20,13 +20,13 @@
 #include "config.h"
 #include "QueueCommands.hxx"
 #include "CommandError.hxx"
-#include "DatabaseQueue.hxx"
+#include "db/DatabaseQueue.hxx"
+#include "db/Selection.hxx"
 #include "SongFilter.hxx"
-#include "DatabaseSelection.hxx"
+#include "SongLoader.hxx"
 #include "Playlist.hxx"
 #include "PlaylistPrint.hxx"
-#include "ClientFile.hxx"
-#include "Client.hxx"
+#include "client/Client.hxx"
 #include "Partition.hxx"
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
@@ -39,79 +39,58 @@
 
 #include <string.h>
 
-CommandResult
-handle_add(Client &client, gcc_unused int argc, char *argv[])
+static const char *
+translate_uri(Client &client, const char *uri)
 {
-	char *uri = argv[1];
-	PlaylistResult result;
-
-	if (memcmp(uri, "file:///", 8) == 0) {
-		const char *path_utf8 = uri + 7;
-		const auto path_fs = AllocatedPath::FromUTF8(path_utf8);
-
-		if (path_fs.IsNull()) {
-			command_error(client, ACK_ERROR_NO_EXIST,
-				      "unsupported file name");
-			return CommandResult::ERROR;
-		}
-
-		Error error;
-		if (!client_allow_file(client, path_fs, error))
-			return print_error(client, error);
-
-		result = client.partition.AppendFile(path_utf8);
-		return print_playlist_result(client, result);
+	if (memcmp(uri, "file:///", 8) == 0)
+		/* drop the "file://", leave only an absolute path
+		   (starting with a slash) */
+		return uri + 7;
+
+	if (PathTraitsUTF8::IsAbsolute(uri)) {
+		command_error(client, ACK_ERROR_NO_EXIST, "Malformed URI");
+		return nullptr;
 	}
 
-	if (uri_has_scheme(uri)) {
-		if (!uri_supported_scheme(uri)) {
-			command_error(client, ACK_ERROR_NO_EXIST,
-				      "unsupported URI scheme");
-			return CommandResult::ERROR;
-		}
+	return uri;
+}
 
-		result = client.partition.AppendURI(uri);
+CommandResult
+handle_add(Client &client, gcc_unused int argc, char *argv[])
+{
+	const char *const uri = translate_uri(client, argv[1]);
+	if (uri == nullptr)
+		return CommandResult::ERROR;
+
+	if (uri_has_scheme(uri) || PathTraitsUTF8::IsAbsolute(uri)) {
+		const SongLoader loader(client);
+		auto result = client.partition.AppendURI(loader, uri);
 		return print_playlist_result(client, result);
 	}
 
+#ifdef ENABLE_DATABASE
 	const DatabaseSelection selection(uri, true);
 	Error error;
 	return AddFromDatabase(client.partition, selection, error)
 		? CommandResult::OK
 		: print_error(client, error);
+#else
+	command_error(client, ACK_ERROR_NO_EXIST, "No database");
+	return CommandResult::ERROR;
+#endif
 }
 
 CommandResult
 handle_addid(Client &client, int argc, char *argv[])
 {
-	char *uri = argv[1];
-	unsigned added_id;
-	PlaylistResult result;
-
-	if (memcmp(uri, "file:///", 8) == 0) {
-		const char *path_utf8 = uri + 7;
-		const auto path_fs = AllocatedPath::FromUTF8(path_utf8);
-
-		if (path_fs.IsNull()) {
-			command_error(client, ACK_ERROR_NO_EXIST,
-				      "unsupported file name");
-			return CommandResult::ERROR;
-		}
+	const char *const uri = translate_uri(client, argv[1]);
+	if (uri == nullptr)
+		return CommandResult::ERROR;
 
-		Error error;
-		if (!client_allow_file(client, path_fs, error))
-			return print_error(client, error);
+	const SongLoader loader(client);
 
-		result = client.partition.AppendFile(path_utf8, &added_id);
-	} else {
-		if (uri_has_scheme(uri) && !uri_supported_scheme(uri)) {
-			command_error(client, ACK_ERROR_NO_EXIST,
-				      "unsupported URI scheme");
-			return CommandResult::ERROR;
-		}
-
-		result = client.partition.AppendURI(uri, &added_id);
-	}
+	unsigned added_id;
+	auto result = client.partition.AppendURI(loader, uri, &added_id);
 
 	if (result != PlaylistResult::SUCCESS)
 		return print_playlist_result(client, result);