From 41cc31c124686304f2ce7098c16ab27b5f88057e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 1 Mar 2015 00:48:44 +0100 Subject: SongUpdate: use OpenArchiveInputStream() to open archive file Don't pass Path::c_str() to tag_stream_scan() which requires a UTF-8 string. --- src/SongUpdate.cxx | 6 +++++- src/TagArchive.cxx | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/TagArchive.hxx | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 src/TagArchive.cxx create mode 100644 src/TagArchive.hxx (limited to 'src') diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index 2df429175..a8b19a8d1 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -37,6 +37,10 @@ #include "TagFile.hxx" #include "TagStream.hxx" +#ifdef ENABLE_ARCHIVE +#include "TagArchive.hxx" +#endif + #include #include #include @@ -140,7 +144,7 @@ Song::UpdateFileInArchive(const Storage &storage) return false; TagBuilder tag_builder; - if (!tag_stream_scan(path_fs.c_str(), full_tag_handler, &tag_builder)) + if (!tag_archive_scan(path_fs, full_tag_handler, &tag_builder)) return false; tag_builder.Commit(tag); diff --git a/src/TagArchive.cxx b/src/TagArchive.cxx new file mode 100644 index 000000000..49f66d8f5 --- /dev/null +++ b/src/TagArchive.cxx @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2003-2015 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 "TagArchive.hxx" +#include "TagStream.hxx" +#include "fs/Path.hxx" +#include "util/Error.hxx" +#include "input/InputStream.hxx" +#include "input/plugins/ArchiveInputPlugin.hxx" +#include "thread/Cond.hxx" + +#include + +bool +tag_archive_scan(Path path, const tag_handler &handler, void *handler_ctx) +{ + assert(!path.IsNull()); + + Mutex mutex; + Cond cond; + auto *is = OpenArchiveInputStream(path, mutex, cond, IgnoreError()); + if (is == nullptr) + return false; + + bool result = tag_stream_scan(*is, handler, handler_ctx); + delete is; + return result; +} diff --git a/src/TagArchive.hxx b/src/TagArchive.hxx new file mode 100644 index 000000000..f14d892ff --- /dev/null +++ b/src/TagArchive.hxx @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2003-2015 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_TAG_ARCHIVE_HXX +#define MPD_TAG_ARCHIVE_HXX + +#include "check.h" + +class Path; +struct tag_handler; + +/** + * Scan the tags of a song file inside an archive. Invokes matching + * decoder plugins, but does not invoke the special "APE" and "ID3" + * scanners. + * + * @return true if the file was recognized (even if no metadata was + * found) + */ +bool +tag_archive_scan(Path path, const tag_handler &handler, void *handler_ctx); + +#endif -- cgit v1.2.3