From 97391fd4b975eab7049c31c88b8a118be430c427 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 24 Jan 2014 16:26:42 +0100 Subject: DespotifyUtils, Expat: move to lib/ --- src/DespotifyUtils.cxx | 153 ----------------------- src/DespotifyUtils.hxx | 71 ----------- src/Expat.cxx | 92 -------------- src/Expat.hxx | 129 ------------------- src/db/plugins/upnp/Device.cxx | 2 +- src/db/plugins/upnp/Directory.cxx | 2 +- src/input/plugins/DespotifyInputPlugin.cxx | 2 +- src/lib/despotify/DespotifyUtils.cxx | 153 +++++++++++++++++++++++ src/lib/despotify/DespotifyUtils.hxx | 71 +++++++++++ src/lib/expat/ExpatParser.cxx | 92 ++++++++++++++ src/lib/expat/ExpatParser.hxx | 129 +++++++++++++++++++ src/playlist/plugins/AsxPlaylistPlugin.cxx | 2 +- src/playlist/plugins/DespotifyPlaylistPlugin.cxx | 2 +- src/playlist/plugins/RssPlaylistPlugin.cxx | 2 +- src/playlist/plugins/XspfPlaylistPlugin.cxx | 2 +- 15 files changed, 452 insertions(+), 452 deletions(-) delete mode 100644 src/DespotifyUtils.cxx delete mode 100644 src/DespotifyUtils.hxx delete mode 100644 src/Expat.cxx delete mode 100644 src/Expat.hxx create mode 100644 src/lib/despotify/DespotifyUtils.cxx create mode 100644 src/lib/despotify/DespotifyUtils.hxx create mode 100644 src/lib/expat/ExpatParser.cxx create mode 100644 src/lib/expat/ExpatParser.hxx (limited to 'src') diff --git a/src/DespotifyUtils.cxx b/src/DespotifyUtils.cxx deleted file mode 100644 index 47a83e49b..000000000 --- a/src/DespotifyUtils.cxx +++ /dev/null @@ -1,153 +0,0 @@ -/* - * 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 - * 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 "DespotifyUtils.hxx" -#include "tag/Tag.hxx" -#include "tag/TagBuilder.hxx" -#include "config/ConfigGlobal.hxx" -#include "config/ConfigOption.hxx" -#include "util/Domain.hxx" -#include "Log.hxx" - -extern "C" { -#include -} - -#include - -const Domain despotify_domain("despotify"); - -static struct despotify_session *g_session; -static void (*registered_callbacks[8])(struct despotify_session *, - int, void *, void *); -static void *registered_callback_data[8]; - -static void -callback(struct despotify_session* ds, int sig, - void *data, gcc_unused void *callback_data) -{ - size_t i; - - for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) { - void (*cb)(struct despotify_session *, int, void *, void *) = registered_callbacks[i]; - void *cb_data = registered_callback_data[i]; - - if (cb) - cb(ds, sig, data, cb_data); - } -} - -bool mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, void *, void *), - void *cb_data) -{ - size_t i; - - for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) { - - if (!registered_callbacks[i]) { - registered_callbacks[i] = cb; - registered_callback_data[i] = cb_data; - - return true; - } - } - - return false; -} - -void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, void *, void *)) -{ - size_t i; - - for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) { - - if (registered_callbacks[i] == cb) { - registered_callbacks[i] = nullptr; - } - } -} - -Tag -mpd_despotify_tag_from_track(const ds_track &track) -{ - char tracknum[20]; - char comment[80]; - char date[20]; - - if (!track.has_meta_data) - return Tag(); - - TagBuilder tag; - snprintf(tracknum, sizeof(tracknum), "%d", track.tracknumber); - snprintf(date, sizeof(date), "%d", track.year); - snprintf(comment, sizeof(comment), "Bitrate %d Kbps, %sgeo restricted", - track.file_bitrate / 1000, - track.geo_restricted ? "" : "not "); - tag.AddItem(TAG_TITLE, track.title); - tag.AddItem(TAG_ARTIST, track.artist->name); - tag.AddItem(TAG_TRACK, tracknum); - tag.AddItem(TAG_ALBUM, track.album); - tag.AddItem(TAG_DATE, date); - tag.AddItem(TAG_COMMENT, comment); - tag.SetTime(track.length / 1000); - - return tag.Commit(); -} - -struct despotify_session *mpd_despotify_get_session(void) -{ - const char *user; - const char *passwd; - bool high_bitrate; - - if (g_session) - return g_session; - - user = config_get_string(CONF_DESPOTIFY_USER, nullptr); - passwd = config_get_string(CONF_DESPOTIFY_PASSWORD, nullptr); - high_bitrate = config_get_bool(CONF_DESPOTIFY_HIGH_BITRATE, true); - - if (user == nullptr || passwd == nullptr) { - LogDebug(despotify_domain, - "disabling despotify because account is not configured"); - return nullptr; - } - - if (!despotify_init()) { - LogWarning(despotify_domain, "Can't initialize despotify"); - return nullptr; - } - - g_session = despotify_init_client(callback, nullptr, - high_bitrate, true); - if (!g_session) { - LogWarning(despotify_domain, - "Can't initialize despotify client"); - return nullptr; - } - - if (!despotify_authenticate(g_session, user, passwd)) { - LogWarning(despotify_domain, - "Can't authenticate despotify session"); - despotify_exit(g_session); - return nullptr; - } - - return g_session; -} diff --git a/src/DespotifyUtils.hxx b/src/DespotifyUtils.hxx deleted file mode 100644 index 835b901a2..000000000 --- a/src/DespotifyUtils.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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 - * 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_DESPOTIFY_H -#define MPD_DESPOTIFY_H - -struct Tag; -struct despotify_session; -struct ds_track; - -extern const class Domain despotify_domain; - -/** - * Return the current despotify session. - * - * If the session isn't initialized, this function will initialize - * it and connect to Spotify. - * - * @return a pointer to the despotify session, or nullptr if it can't - * be initialized (e.g., if the configuration isn't supplied) - */ -struct despotify_session *mpd_despotify_get_session(void); - -/** - * Create a MPD tags structure from a spotify track - * - * @param track the track to convert - * - * @return filled in #Tag structure - */ -Tag -mpd_despotify_tag_from_track(const ds_track &track); - -/** - * Register a despotify callback. - * - * Despotify calls this e.g., when a track ends. - * - * @param cb the callback - * @param cb_data the data to pass to the callback - * - * @return true if the callback could be registered - */ -bool mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, void *, void *), - void *cb_data); - -/** - * Unregister a despotify callback. - * - * @param cb the callback to unregister. - */ -void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, void *, void *)); - -#endif - diff --git a/src/Expat.cxx b/src/Expat.cxx deleted file mode 100644 index b6e3a5f8f..000000000 --- a/src/Expat.cxx +++ /dev/null @@ -1,92 +0,0 @@ -/* - * 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 - * 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 "Expat.hxx" -#include "input/InputStream.hxx" -#include "util/ASCII.hxx" -#include "util/Error.hxx" -#include "util/Domain.hxx" - -#include - -static constexpr Domain expat_domain("expat"); - -void -ExpatParser::SetError(Error &error) -{ - XML_Error code = XML_GetErrorCode(parser); - error.Format(expat_domain, int(code), "XML parser failed: %s", - XML_ErrorString(code)); -} - -bool -ExpatParser::Parse(const char *data, size_t length, bool is_final, - Error &error) -{ - bool success = XML_Parse(parser, data, length, - is_final) == XML_STATUS_OK; - if (!success) - SetError(error); - - return success; -} - -bool -ExpatParser::Parse(InputStream &is, Error &error) -{ - assert(is.ready); - - while (true) { - char buffer[4096]; - size_t nbytes = is.LockRead(buffer, sizeof(buffer), error); - if (nbytes == 0) - break; - - if (!Parse(buffer, nbytes, false, error)) - return false; - } - - if (error.IsDefined()) - return false; - - return Parse("", 0, true, error); -} - -const char * -ExpatParser::GetAttribute(const XML_Char **atts, - const char *name) -{ - for (unsigned i = 0; atts[i] != nullptr; i += 2) - if (strcmp(atts[i], name) == 0) - return atts[i + 1]; - - return nullptr; -} - -const char * -ExpatParser::GetAttributeCase(const XML_Char **atts, - const char *name) -{ - for (unsigned i = 0; atts[i] != nullptr; i += 2) - if (StringEqualsCaseASCII(atts[i], name)) - return atts[i + 1]; - - return nullptr; -} diff --git a/src/Expat.hxx b/src/Expat.hxx deleted file mode 100644 index d57a85533..000000000 --- a/src/Expat.hxx +++ /dev/null @@ -1,129 +0,0 @@ -/* - * 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 - * 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_EXPAT_HXX -#define MPD_EXPAT_HXX - -#include "check.h" -#include "Compiler.h" - -#include - -struct InputStream; -class Error; - -class ExpatParser final { - const XML_Parser parser; - -public: - ExpatParser(void *userData) - :parser(XML_ParserCreate(nullptr)) { - XML_SetUserData(parser, userData); - } - - ~ExpatParser() { - XML_ParserFree(parser); - } - - void SetElementHandler(XML_StartElementHandler start, - XML_EndElementHandler end) { - XML_SetElementHandler(parser, start, end); - } - - void SetCharacterDataHandler(XML_CharacterDataHandler charhndl) { - XML_SetCharacterDataHandler(parser, charhndl); - } - - bool Parse(const char *data, size_t length, bool is_final, - Error &error); - - bool Parse(InputStream &is, Error &error); - - gcc_pure - static const char *GetAttribute(const XML_Char **atts, - const char *name); - - gcc_pure - static const char *GetAttributeCase(const XML_Char **atts, - const char *name); - -private: - void SetError(Error &error); -}; - -/** - * A specialization of #ExpatParser that provides the most common - * callbacks as virtual methods. - */ -class CommonExpatParser { - ExpatParser parser; - -public: - CommonExpatParser():parser(this) { - parser.SetElementHandler(StartElement, EndElement); - parser.SetCharacterDataHandler(CharacterData); - } - - bool Parse(const char *data, size_t length, bool is_final, - Error &error) { - return parser.Parse(data, length, is_final, error); - } - - bool Parse(InputStream &is, Error &error) { - return parser.Parse(is, error); - } - - gcc_pure - static const char *GetAttribute(const XML_Char **atts, - const char *name) { - return ExpatParser::GetAttribute(atts, name); - } - - gcc_pure - static const char *GetAttributeCase(const XML_Char **atts, - const char *name) { - return ExpatParser::GetAttributeCase(atts, name); - } - -protected: - virtual void StartElement(const XML_Char *name, - const XML_Char **atts) = 0; - virtual void EndElement(const XML_Char *name) = 0; - virtual void CharacterData(const XML_Char *s, int len) = 0; - -private: - static void XMLCALL StartElement(void *user_data, const XML_Char *name, - const XML_Char **atts) { - CommonExpatParser &p = *(CommonExpatParser *)user_data; - p.StartElement(name, atts); - } - - static void XMLCALL EndElement(void *user_data, const XML_Char *name) { - CommonExpatParser &p = *(CommonExpatParser *)user_data; - p.EndElement(name); - } - - static void XMLCALL CharacterData(void *user_data, - const XML_Char *s, int len) { - CommonExpatParser &p = *(CommonExpatParser *)user_data; - p.CharacterData(s, len); - } -}; - -#endif diff --git a/src/db/plugins/upnp/Device.cxx b/src/db/plugins/upnp/Device.cxx index 7bec1cccd..26bffd0f0 100644 --- a/src/db/plugins/upnp/Device.cxx +++ b/src/db/plugins/upnp/Device.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "Device.hxx" #include "Util.hxx" -#include "Expat.hxx" +#include "lib/expat/ExpatParser.hxx" #include "util/Error.hxx" #include diff --git a/src/db/plugins/upnp/Directory.cxx b/src/db/plugins/upnp/Directory.cxx index adb8b213a..9c089cc5e 100644 --- a/src/db/plugins/upnp/Directory.cxx +++ b/src/db/plugins/upnp/Directory.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "Directory.hxx" #include "Util.hxx" -#include "Expat.hxx" +#include "lib/expat/ExpatParser.hxx" #include "Tags.hxx" #include "tag/TagBuilder.hxx" #include "tag/TagTable.hxx" diff --git a/src/input/plugins/DespotifyInputPlugin.cxx b/src/input/plugins/DespotifyInputPlugin.cxx index a01ba3759..152fda95f 100644 --- a/src/input/plugins/DespotifyInputPlugin.cxx +++ b/src/input/plugins/DespotifyInputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "DespotifyInputPlugin.hxx" -#include "DespotifyUtils.hxx" +#include "lib/despotify/DespotifyUtils.hxx" #include "../InputStream.hxx" #include "../InputPlugin.hxx" #include "tag/Tag.hxx" diff --git a/src/lib/despotify/DespotifyUtils.cxx b/src/lib/despotify/DespotifyUtils.cxx new file mode 100644 index 000000000..47a83e49b --- /dev/null +++ b/src/lib/despotify/DespotifyUtils.cxx @@ -0,0 +1,153 @@ +/* + * 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 + * 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 "DespotifyUtils.hxx" +#include "tag/Tag.hxx" +#include "tag/TagBuilder.hxx" +#include "config/ConfigGlobal.hxx" +#include "config/ConfigOption.hxx" +#include "util/Domain.hxx" +#include "Log.hxx" + +extern "C" { +#include +} + +#include + +const Domain despotify_domain("despotify"); + +static struct despotify_session *g_session; +static void (*registered_callbacks[8])(struct despotify_session *, + int, void *, void *); +static void *registered_callback_data[8]; + +static void +callback(struct despotify_session* ds, int sig, + void *data, gcc_unused void *callback_data) +{ + size_t i; + + for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) { + void (*cb)(struct despotify_session *, int, void *, void *) = registered_callbacks[i]; + void *cb_data = registered_callback_data[i]; + + if (cb) + cb(ds, sig, data, cb_data); + } +} + +bool mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, void *, void *), + void *cb_data) +{ + size_t i; + + for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) { + + if (!registered_callbacks[i]) { + registered_callbacks[i] = cb; + registered_callback_data[i] = cb_data; + + return true; + } + } + + return false; +} + +void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, void *, void *)) +{ + size_t i; + + for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) { + + if (registered_callbacks[i] == cb) { + registered_callbacks[i] = nullptr; + } + } +} + +Tag +mpd_despotify_tag_from_track(const ds_track &track) +{ + char tracknum[20]; + char comment[80]; + char date[20]; + + if (!track.has_meta_data) + return Tag(); + + TagBuilder tag; + snprintf(tracknum, sizeof(tracknum), "%d", track.tracknumber); + snprintf(date, sizeof(date), "%d", track.year); + snprintf(comment, sizeof(comment), "Bitrate %d Kbps, %sgeo restricted", + track.file_bitrate / 1000, + track.geo_restricted ? "" : "not "); + tag.AddItem(TAG_TITLE, track.title); + tag.AddItem(TAG_ARTIST, track.artist->name); + tag.AddItem(TAG_TRACK, tracknum); + tag.AddItem(TAG_ALBUM, track.album); + tag.AddItem(TAG_DATE, date); + tag.AddItem(TAG_COMMENT, comment); + tag.SetTime(track.length / 1000); + + return tag.Commit(); +} + +struct despotify_session *mpd_despotify_get_session(void) +{ + const char *user; + const char *passwd; + bool high_bitrate; + + if (g_session) + return g_session; + + user = config_get_string(CONF_DESPOTIFY_USER, nullptr); + passwd = config_get_string(CONF_DESPOTIFY_PASSWORD, nullptr); + high_bitrate = config_get_bool(CONF_DESPOTIFY_HIGH_BITRATE, true); + + if (user == nullptr || passwd == nullptr) { + LogDebug(despotify_domain, + "disabling despotify because account is not configured"); + return nullptr; + } + + if (!despotify_init()) { + LogWarning(despotify_domain, "Can't initialize despotify"); + return nullptr; + } + + g_session = despotify_init_client(callback, nullptr, + high_bitrate, true); + if (!g_session) { + LogWarning(despotify_domain, + "Can't initialize despotify client"); + return nullptr; + } + + if (!despotify_authenticate(g_session, user, passwd)) { + LogWarning(despotify_domain, + "Can't authenticate despotify session"); + despotify_exit(g_session); + return nullptr; + } + + return g_session; +} diff --git a/src/lib/despotify/DespotifyUtils.hxx b/src/lib/despotify/DespotifyUtils.hxx new file mode 100644 index 000000000..835b901a2 --- /dev/null +++ b/src/lib/despotify/DespotifyUtils.hxx @@ -0,0 +1,71 @@ +/* + * 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 + * 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_DESPOTIFY_H +#define MPD_DESPOTIFY_H + +struct Tag; +struct despotify_session; +struct ds_track; + +extern const class Domain despotify_domain; + +/** + * Return the current despotify session. + * + * If the session isn't initialized, this function will initialize + * it and connect to Spotify. + * + * @return a pointer to the despotify session, or nullptr if it can't + * be initialized (e.g., if the configuration isn't supplied) + */ +struct despotify_session *mpd_despotify_get_session(void); + +/** + * Create a MPD tags structure from a spotify track + * + * @param track the track to convert + * + * @return filled in #Tag structure + */ +Tag +mpd_despotify_tag_from_track(const ds_track &track); + +/** + * Register a despotify callback. + * + * Despotify calls this e.g., when a track ends. + * + * @param cb the callback + * @param cb_data the data to pass to the callback + * + * @return true if the callback could be registered + */ +bool mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, void *, void *), + void *cb_data); + +/** + * Unregister a despotify callback. + * + * @param cb the callback to unregister. + */ +void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, void *, void *)); + +#endif + diff --git a/src/lib/expat/ExpatParser.cxx b/src/lib/expat/ExpatParser.cxx new file mode 100644 index 000000000..b69dc55b4 --- /dev/null +++ b/src/lib/expat/ExpatParser.cxx @@ -0,0 +1,92 @@ +/* + * 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 + * 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 "ExpatParser.hxx" +#include "input/InputStream.hxx" +#include "util/ASCII.hxx" +#include "util/Error.hxx" +#include "util/Domain.hxx" + +#include + +static constexpr Domain expat_domain("expat"); + +void +ExpatParser::SetError(Error &error) +{ + XML_Error code = XML_GetErrorCode(parser); + error.Format(expat_domain, int(code), "XML parser failed: %s", + XML_ErrorString(code)); +} + +bool +ExpatParser::Parse(const char *data, size_t length, bool is_final, + Error &error) +{ + bool success = XML_Parse(parser, data, length, + is_final) == XML_STATUS_OK; + if (!success) + SetError(error); + + return success; +} + +bool +ExpatParser::Parse(InputStream &is, Error &error) +{ + assert(is.ready); + + while (true) { + char buffer[4096]; + size_t nbytes = is.LockRead(buffer, sizeof(buffer), error); + if (nbytes == 0) + break; + + if (!Parse(buffer, nbytes, false, error)) + return false; + } + + if (error.IsDefined()) + return false; + + return Parse("", 0, true, error); +} + +const char * +ExpatParser::GetAttribute(const XML_Char **atts, + const char *name) +{ + for (unsigned i = 0; atts[i] != nullptr; i += 2) + if (strcmp(atts[i], name) == 0) + return atts[i + 1]; + + return nullptr; +} + +const char * +ExpatParser::GetAttributeCase(const XML_Char **atts, + const char *name) +{ + for (unsigned i = 0; atts[i] != nullptr; i += 2) + if (StringEqualsCaseASCII(atts[i], name)) + return atts[i + 1]; + + return nullptr; +} diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx new file mode 100644 index 000000000..d57a85533 --- /dev/null +++ b/src/lib/expat/ExpatParser.hxx @@ -0,0 +1,129 @@ +/* + * 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 + * 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_EXPAT_HXX +#define MPD_EXPAT_HXX + +#include "check.h" +#include "Compiler.h" + +#include + +struct InputStream; +class Error; + +class ExpatParser final { + const XML_Parser parser; + +public: + ExpatParser(void *userData) + :parser(XML_ParserCreate(nullptr)) { + XML_SetUserData(parser, userData); + } + + ~ExpatParser() { + XML_ParserFree(parser); + } + + void SetElementHandler(XML_StartElementHandler start, + XML_EndElementHandler end) { + XML_SetElementHandler(parser, start, end); + } + + void SetCharacterDataHandler(XML_CharacterDataHandler charhndl) { + XML_SetCharacterDataHandler(parser, charhndl); + } + + bool Parse(const char *data, size_t length, bool is_final, + Error &error); + + bool Parse(InputStream &is, Error &error); + + gcc_pure + static const char *GetAttribute(const XML_Char **atts, + const char *name); + + gcc_pure + static const char *GetAttributeCase(const XML_Char **atts, + const char *name); + +private: + void SetError(Error &error); +}; + +/** + * A specialization of #ExpatParser that provides the most common + * callbacks as virtual methods. + */ +class CommonExpatParser { + ExpatParser parser; + +public: + CommonExpatParser():parser(this) { + parser.SetElementHandler(StartElement, EndElement); + parser.SetCharacterDataHandler(CharacterData); + } + + bool Parse(const char *data, size_t length, bool is_final, + Error &error) { + return parser.Parse(data, length, is_final, error); + } + + bool Parse(InputStream &is, Error &error) { + return parser.Parse(is, error); + } + + gcc_pure + static const char *GetAttribute(const XML_Char **atts, + const char *name) { + return ExpatParser::GetAttribute(atts, name); + } + + gcc_pure + static const char *GetAttributeCase(const XML_Char **atts, + const char *name) { + return ExpatParser::GetAttributeCase(atts, name); + } + +protected: + virtual void StartElement(const XML_Char *name, + const XML_Char **atts) = 0; + virtual void EndElement(const XML_Char *name) = 0; + virtual void CharacterData(const XML_Char *s, int len) = 0; + +private: + static void XMLCALL StartElement(void *user_data, const XML_Char *name, + const XML_Char **atts) { + CommonExpatParser &p = *(CommonExpatParser *)user_data; + p.StartElement(name, atts); + } + + static void XMLCALL EndElement(void *user_data, const XML_Char *name) { + CommonExpatParser &p = *(CommonExpatParser *)user_data; + p.EndElement(name); + } + + static void XMLCALL CharacterData(void *user_data, + const XML_Char *s, int len) { + CommonExpatParser &p = *(CommonExpatParser *)user_data; + p.CharacterData(s, len); + } +}; + +#endif diff --git a/src/playlist/plugins/AsxPlaylistPlugin.cxx b/src/playlist/plugins/AsxPlaylistPlugin.cxx index 5434c8e85..3185a8144 100644 --- a/src/playlist/plugins/AsxPlaylistPlugin.cxx +++ b/src/playlist/plugins/AsxPlaylistPlugin.cxx @@ -24,7 +24,7 @@ #include "tag/TagBuilder.hxx" #include "util/ASCII.hxx" #include "util/Error.hxx" -#include "Expat.hxx" +#include "lib/expat/ExpatParser.hxx" #include "Log.hxx" /** diff --git a/src/playlist/plugins/DespotifyPlaylistPlugin.cxx b/src/playlist/plugins/DespotifyPlaylistPlugin.cxx index 1e8de0130..0d18e8b25 100644 --- a/src/playlist/plugins/DespotifyPlaylistPlugin.cxx +++ b/src/playlist/plugins/DespotifyPlaylistPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "DespotifyPlaylistPlugin.hxx" -#include "DespotifyUtils.hxx" +#include "lib/despotify/DespotifyUtils.hxx" #include "../PlaylistPlugin.hxx" #include "../MemorySongEnumerator.hxx" #include "tag/Tag.hxx" diff --git a/src/playlist/plugins/RssPlaylistPlugin.cxx b/src/playlist/plugins/RssPlaylistPlugin.cxx index 076d82f14..6f9aad54b 100644 --- a/src/playlist/plugins/RssPlaylistPlugin.cxx +++ b/src/playlist/plugins/RssPlaylistPlugin.cxx @@ -24,7 +24,7 @@ #include "tag/TagBuilder.hxx" #include "util/ASCII.hxx" #include "util/Error.hxx" -#include "Expat.hxx" +#include "lib/expat/ExpatParser.hxx" #include "Log.hxx" /** diff --git a/src/playlist/plugins/XspfPlaylistPlugin.cxx b/src/playlist/plugins/XspfPlaylistPlugin.cxx index f9c1f21b1..5b6010b53 100644 --- a/src/playlist/plugins/XspfPlaylistPlugin.cxx +++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx @@ -26,7 +26,7 @@ #include "tag/TagBuilder.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" -#include "Expat.hxx" +#include "lib/expat/ExpatParser.hxx" #include "Log.hxx" #include -- cgit v1.2.3