test/run_input: move code from Scan() to input/ScanTags.cxx

Makefile.am

@@ -1328,6 +1328,7 @@ libinput_a_SOURCES = \
 	src/input/Ptr.hxx \
 	src/input/InputPlugin.hxx \
 	src/input/RemoteTagScanner.hxx \
+	src/input/ScanTags.cxx src/input/ScanTags.hxx \
 	src/input/Reader.cxx src/input/Reader.hxx \
 	src/input/TextInputStream.cxx src/input/TextInputStream.hxx \
 	src/input/ThreadInputStream.cxx src/input/ThreadInputStream.hxx \

src/input/ScanTags.cxx

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "ScanTags.hxx"
+#include "RemoteTagScanner.hxx"
+#include "InputPlugin.hxx"
+#include "Registry.hxx"
+
+std::unique_ptr<RemoteTagScanner>
+InputScanTags(const char *uri, RemoteTagHandler &handler)
+{
+	input_plugins_for_each_enabled(plugin) {
+		if (plugin->scan_tags == nullptr)
+			continue;
+
+		auto scanner = plugin->scan_tags(uri, handler);
+		if (scanner)
+			return scanner;
+	}
+
+	/* unsupported URI */
+	return nullptr;
+}

src/input/ScanTags.hxx

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_INPUT_SCAN_TAGS_HXX
+#define MPD_INPUT_SCAN_TAGS_HXX
+
+#include "check.h"
+
+#include <memory>
+
+class RemoteTagScanner;
+class RemoteTagHandler;
+
+/**
+ * Find an #InputPlugin which supports the given URI and let it create
+ * a #RemoteTagScanner.
+ *
+ * Throws exception on error
+ *
+ * @return a #RemoteTagScanner or nullptr if the URI is not supported
+ * by any (enabled) plugin
+ */
+std::unique_ptr<RemoteTagScanner>
+InputScanTags(const char *uri, RemoteTagHandler &handler);
+
+#endif

test/run_input.cxx

@@ -26,6 +26,7 @@
 #include "input/Registry.hxx"
 #include "input/InputPlugin.hxx"
 #include "input/RemoteTagScanner.hxx"
+#include "input/ScanTags.hxx"
 #include "event/Thread.hxx"
 #include "thread/Cond.hxx"
 #include "Log.hxx"
@@ -213,21 +214,16 @@ Scan(const char *uri)
 {
 	DumpRemoteTagHandler handler;
 
-	input_plugins_for_each_enabled(plugin) {
+	auto scanner = InputScanTags(uri, handler);
-		if (plugin->scan_tags == nullptr)
+	if (!scanner) {
-			continue;
+		fprintf(stderr, "Unsupported URI\n");
+		return EXIT_FAILURE;
+	}
 
-		auto scanner = plugin->scan_tags(uri, handler);
-		if (scanner) {
 	scanner->Start();
 	tag_save(stdout, handler.Wait());
 	return EXIT_SUCCESS;
 }
-	}
-
-	fprintf(stderr, "Unsupported URI\n");
-	return EXIT_FAILURE;
-}
 
 int main(int argc, char **argv)
 try {