From dd5ba062cc03d0de7fa2b46f16817f8c7c2b112e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 28 Jul 2013 20:25:45 +0200 Subject: tag_id3: convert to C++ --- src/SongUpdate.cxx | 2 +- src/TagId3.cxx | 586 +++++++++++++++++++++++++++++ src/TagId3.hxx | 71 ++++ src/decoder/DsdLib.cxx | 5 +- src/decoder/MadDecoderPlugin.cxx | 6 +- src/playlist/EmbeddedCuePlaylistPlugin.cxx | 2 +- src/tag_id3.c | 585 ---------------------------- src/tag_id3.h | 71 ---- 8 files changed, 661 insertions(+), 667 deletions(-) create mode 100644 src/TagId3.cxx create mode 100644 src/TagId3.hxx delete mode 100644 src/tag_id3.c delete mode 100644 src/tag_id3.h (limited to 'src') diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index 6752386be..cfe4741c9 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -28,10 +28,10 @@ #include "input_stream.h" #include "DecoderPlugin.hxx" #include "DecoderList.hxx" +#include "TagId3.hxx" extern "C" { #include "tag_ape.h" -#include "tag_id3.h" #include "tag_handler.h" } diff --git a/src/TagId3.cxx b/src/TagId3.cxx new file mode 100644 index 000000000..d6bef2fa9 --- /dev/null +++ b/src/TagId3.cxx @@ -0,0 +1,586 @@ +/* + * Copyright (C) 2003-2013 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 "TagId3.hxx" +#include "tag_handler.h" +#include "tag_table.h" +#include "tag.h" + +extern "C" { +#include "riff.h" +#include "aiff.h" +} + +#include "conf.h" +#include "io_error.h" + +#include +#include + +#include +#include +#include +#include + +#undef G_LOG_DOMAIN +#define G_LOG_DOMAIN "id3" + +# ifndef ID3_FRAME_COMPOSER +# define ID3_FRAME_COMPOSER "TCOM" +# endif +# ifndef ID3_FRAME_DISC +# define ID3_FRAME_DISC "TPOS" +# endif + +#ifndef ID3_FRAME_ARTIST_SORT +#define ID3_FRAME_ARTIST_SORT "TSOP" +#endif + +#ifndef ID3_FRAME_ALBUM_ARTIST_SORT +#define ID3_FRAME_ALBUM_ARTIST_SORT "TSO2" /* this one is unofficial, introduced by Itunes */ +#endif + +#ifndef ID3_FRAME_ALBUM_ARTIST +#define ID3_FRAME_ALBUM_ARTIST "TPE2" +#endif + +static inline bool +tag_is_id3v1(struct id3_tag *tag) +{ + return (id3_tag_options(tag, 0, 0) & ID3_TAG_OPTION_ID3V1) != 0; +} + +static id3_utf8_t * +tag_id3_getstring(const struct id3_frame *frame, unsigned i) +{ + union id3_field *field; + const id3_ucs4_t *ucs4; + + field = id3_frame_field(frame, i); + if (field == nullptr) + return nullptr; + + ucs4 = id3_field_getstring(field); + if (ucs4 == nullptr) + return nullptr; + + return id3_ucs4_utf8duplicate(ucs4); +} + +/* This will try to convert a string to utf-8, + */ +static id3_utf8_t * +import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4) +{ + id3_utf8_t *utf8, *utf8_stripped; + id3_latin1_t *isostr; + const char *encoding; + + /* use encoding field here? */ + if (is_id3v1 && + (encoding = config_get_string(CONF_ID3V1_ENCODING, nullptr)) != nullptr) { + isostr = id3_ucs4_latin1duplicate(ucs4); + if (G_UNLIKELY(!isostr)) { + return nullptr; + } + + utf8 = (id3_utf8_t *) + g_convert_with_fallback((const char*)isostr, -1, + "utf-8", encoding, + nullptr, nullptr, + nullptr, nullptr); + if (utf8 == nullptr) { + g_debug("Unable to convert %s string to UTF-8: '%s'", + encoding, isostr); + g_free(isostr); + return nullptr; + } + g_free(isostr); + } else { + utf8 = id3_ucs4_utf8duplicate(ucs4); + if (G_UNLIKELY(!utf8)) { + return nullptr; + } + } + + utf8_stripped = (id3_utf8_t *)g_strdup(g_strstrip((gchar *)utf8)); + g_free(utf8); + + return utf8_stripped; +} + +/** + * Import a "Text information frame" (ID3v2.4.0 section 4.2). It + * contains 2 fields: + * + * - encoding + * - string list + */ +static void +tag_id3_import_text_frame(struct id3_tag *tag, const struct id3_frame *frame, + enum tag_type type, + const struct tag_handler *handler, void *handler_ctx) +{ + id3_ucs4_t const *ucs4; + id3_utf8_t *utf8; + union id3_field const *field; + unsigned int nstrings, i; + + if (frame->nfields != 2) + return; + + /* check the encoding field */ + + field = id3_frame_field(frame, 0); + if (field == nullptr || field->type != ID3_FIELD_TYPE_TEXTENCODING) + return; + + /* process the value(s) */ + + field = id3_frame_field(frame, 1); + if (field == nullptr || field->type != ID3_FIELD_TYPE_STRINGLIST) + return; + + /* Get the number of strings available */ + nstrings = id3_field_getnstrings(field); + for (i = 0; i < nstrings; i++) { + ucs4 = id3_field_getstrings(field, i); + if (ucs4 == nullptr) + continue; + + if (type == TAG_GENRE) + ucs4 = id3_genre_name(ucs4); + + utf8 = import_id3_string(tag_is_id3v1(tag), ucs4); + if (utf8 == nullptr) + continue; + + tag_handler_invoke_tag(handler, handler_ctx, + type, (const char *)utf8); + g_free(utf8); + } +} + +/** + * Import all text frames with the specified id (ID3v2.4.0 section + * 4.2). This is a wrapper for tag_id3_import_text_frame(). + */ +static void +tag_id3_import_text(struct id3_tag *tag, const char *id, enum tag_type type, + const struct tag_handler *handler, void *handler_ctx) +{ + const struct id3_frame *frame; + for (unsigned i = 0; + (frame = id3_tag_findframe(tag, id, i)) != nullptr; ++i) + tag_id3_import_text_frame(tag, frame, type, + handler, handler_ctx); +} + +/** + * Import a "Comment frame" (ID3v2.4.0 section 4.10). It + * contains 4 fields: + * + * - encoding + * - language + * - string + * - full string (we use this one) + */ +static void +tag_id3_import_comment_frame(struct id3_tag *tag, + const struct id3_frame *frame, enum tag_type type, + const struct tag_handler *handler, + void *handler_ctx) +{ + id3_ucs4_t const *ucs4; + id3_utf8_t *utf8; + union id3_field const *field; + + if (frame->nfields != 4) + return; + + /* for now I only read the 4th field, with the fullstring */ + field = id3_frame_field(frame, 3); + if (field == nullptr) + return; + + ucs4 = id3_field_getfullstring(field); + if (ucs4 == nullptr) + return; + + utf8 = import_id3_string(tag_is_id3v1(tag), ucs4); + if (utf8 == nullptr) + return; + + tag_handler_invoke_tag(handler, handler_ctx, type, (const char *)utf8); + g_free(utf8); +} + +/** + * Import all comment frames (ID3v2.4.0 section 4.10). This is a + * wrapper for tag_id3_import_comment_frame(). + */ +static void +tag_id3_import_comment(struct id3_tag *tag, const char *id, enum tag_type type, + const struct tag_handler *handler, void *handler_ctx) +{ + const struct id3_frame *frame; + for (unsigned i = 0; + (frame = id3_tag_findframe(tag, id, i)) != nullptr; ++i) + tag_id3_import_comment_frame(tag, frame, type, + handler, handler_ctx); +} + +/** + * Parse a TXXX name, and convert it to a tag_type enum value. + * Returns TAG_NUM_OF_ITEM_TYPES if the TXXX name is not understood. + */ +static enum tag_type +tag_id3_parse_txxx_name(const char *name) +{ + static const struct tag_table txxx_tags[] = { + { "ALBUMARTISTSORT", TAG_ALBUM_ARTIST_SORT }, + { "MusicBrainz Artist Id", TAG_MUSICBRAINZ_ARTISTID }, + { "MusicBrainz Album Id", TAG_MUSICBRAINZ_ALBUMID }, + { "MusicBrainz Album Artist Id", + TAG_MUSICBRAINZ_ALBUMARTISTID }, + { "MusicBrainz Track Id", TAG_MUSICBRAINZ_TRACKID }, + { nullptr, TAG_NUM_OF_ITEM_TYPES } + }; + + return tag_table_lookup(txxx_tags, name); +} + +/** + * Import all known MusicBrainz tags from TXXX frames. + */ +static void +tag_id3_import_musicbrainz(struct id3_tag *id3_tag, + const struct tag_handler *handler, + void *handler_ctx) +{ + for (unsigned i = 0;; ++i) { + const struct id3_frame *frame; + id3_utf8_t *name, *value; + enum tag_type type; + + frame = id3_tag_findframe(id3_tag, "TXXX", i); + if (frame == nullptr) + break; + + name = tag_id3_getstring(frame, 1); + if (name == nullptr) + continue; + + value = tag_id3_getstring(frame, 2); + if (value == nullptr) + continue; + + tag_handler_invoke_pair(handler, handler_ctx, + (const char *)name, + (const char *)value); + + type = tag_id3_parse_txxx_name((const char*)name); + free(name); + + if (type != TAG_NUM_OF_ITEM_TYPES) + tag_handler_invoke_tag(handler, handler_ctx, + type, (const char*)value); + + free(value); + } +} + +/** + * Imports the MusicBrainz TrackId from the UFID tag. + */ +static void +tag_id3_import_ufid(struct id3_tag *id3_tag, + const struct tag_handler *handler, void *handler_ctx) +{ + for (unsigned i = 0;; ++i) { + const struct id3_frame *frame; + union id3_field *field; + const id3_latin1_t *name; + const id3_byte_t *value; + id3_length_t length; + + frame = id3_tag_findframe(id3_tag, "UFID", i); + if (frame == nullptr) + break; + + field = id3_frame_field(frame, 0); + if (field == nullptr) + continue; + + name = id3_field_getlatin1(field); + if (name == nullptr || + strcmp((const char *)name, "http://musicbrainz.org") != 0) + continue; + + field = id3_frame_field(frame, 1); + if (field == nullptr) + continue; + + value = id3_field_getbinarydata(field, &length); + if (value == nullptr || length == 0) + continue; + + char *p = g_strndup((const char *)value, length); + tag_handler_invoke_tag(handler, handler_ctx, + TAG_MUSICBRAINZ_TRACKID, p); + g_free(p); + } +} + +void +scan_id3_tag(struct id3_tag *tag, + const struct tag_handler *handler, void *handler_ctx) +{ + tag_id3_import_text(tag, ID3_FRAME_ARTIST, TAG_ARTIST, + handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_ALBUM_ARTIST, + TAG_ALBUM_ARTIST, handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_ARTIST_SORT, + TAG_ARTIST_SORT, handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_ALBUM_ARTIST_SORT, + TAG_ALBUM_ARTIST_SORT, handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_TITLE, TAG_TITLE, + handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_ALBUM, TAG_ALBUM, + handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_TRACK, TAG_TRACK, + handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_YEAR, TAG_DATE, + handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_GENRE, TAG_GENRE, + handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_COMPOSER, TAG_COMPOSER, + handler, handler_ctx); + tag_id3_import_text(tag, "TPE3", TAG_PERFORMER, + handler, handler_ctx); + tag_id3_import_text(tag, "TPE4", TAG_PERFORMER, handler, handler_ctx); + tag_id3_import_comment(tag, ID3_FRAME_COMMENT, TAG_COMMENT, + handler, handler_ctx); + tag_id3_import_text(tag, ID3_FRAME_DISC, TAG_DISC, + handler, handler_ctx); + + tag_id3_import_musicbrainz(tag, handler, handler_ctx); + tag_id3_import_ufid(tag, handler, handler_ctx); +} + +struct tag *tag_id3_import(struct id3_tag * tag) +{ + struct tag *ret = tag_new(); + + scan_id3_tag(tag, &add_tag_handler, ret); + + if (tag_is_empty(ret)) { + tag_free(ret); + ret = nullptr; + } + + return ret; +} + +static int +fill_buffer(void *buf, size_t size, FILE *stream, long offset, int whence) +{ + if (fseek(stream, offset, whence) != 0) return 0; + return fread(buf, 1, size, stream); +} + +static int +get_id3v2_footer_size(FILE *stream, long offset, int whence) +{ + id3_byte_t buf[ID3_TAG_QUERYSIZE]; + int bufsize; + + bufsize = fill_buffer(buf, ID3_TAG_QUERYSIZE, stream, offset, whence); + if (bufsize <= 0) return 0; + return id3_tag_query(buf, bufsize); +} + +static struct id3_tag * +tag_id3_read(FILE *stream, long offset, int whence) +{ + struct id3_tag *tag; + id3_byte_t query_buffer[ID3_TAG_QUERYSIZE]; + int tag_size; + int query_buffer_size; + + /* It's ok if we get less than we asked for */ + query_buffer_size = fill_buffer(query_buffer, ID3_TAG_QUERYSIZE, + stream, offset, whence); + if (query_buffer_size <= 0) + return nullptr; + + /* Look for a tag header */ + tag_size = id3_tag_query(query_buffer, query_buffer_size); + if (tag_size <= 0) return nullptr; + + /* Found a tag. Allocate a buffer and read it in. */ + id3_byte_t *tag_buffer = (id3_byte_t *)g_malloc(tag_size); + if (!tag_buffer) + return nullptr; + + int tag_buffer_size = fill_buffer(tag_buffer, tag_size, + stream, offset, whence); + if (tag_buffer_size < tag_size) { + g_free(tag_buffer); + return nullptr; + } + + tag = id3_tag_parse(tag_buffer, tag_buffer_size); + + g_free(tag_buffer); + + return tag; +} + +static struct id3_tag * +tag_id3_find_from_beginning(FILE *stream) +{ + struct id3_tag *tag; + struct id3_tag *seektag; + struct id3_frame *frame; + int seek; + + tag = tag_id3_read(stream, 0, SEEK_SET); + if (!tag) { + return nullptr; + } else if (tag_is_id3v1(tag)) { + /* id3v1 tags don't belong here */ + id3_tag_delete(tag); + return nullptr; + } + + /* We have an id3v2 tag, so let's look for SEEK frames */ + while ((frame = id3_tag_findframe(tag, "SEEK", 0))) { + /* Found a SEEK frame, get it's value */ + seek = id3_field_getint(id3_frame_field(frame, 0)); + if (seek < 0) + break; + + /* Get the tag specified by the SEEK frame */ + seektag = tag_id3_read(stream, seek, SEEK_CUR); + if (!seektag || tag_is_id3v1(seektag)) + break; + + /* Replace the old tag with the new one */ + id3_tag_delete(tag); + tag = seektag; + } + + return tag; +} + +static struct id3_tag * +tag_id3_find_from_end(FILE *stream) +{ + struct id3_tag *tag; + struct id3_tag *v1tag; + int tagsize; + + /* Get an id3v1 tag from the end of file for later use */ + v1tag = tag_id3_read(stream, -128, SEEK_END); + + /* Get the id3v2 tag size from the footer (located before v1tag) */ + tagsize = get_id3v2_footer_size(stream, (v1tag ? -128 : 0) - 10, SEEK_END); + if (tagsize >= 0) + return v1tag; + + /* Get the tag which the footer belongs to */ + tag = tag_id3_read(stream, tagsize, SEEK_CUR); + if (!tag) + return v1tag; + + /* We have an id3v2 tag, so ditch v1tag */ + id3_tag_delete(v1tag); + + return tag; +} + +static struct id3_tag * +tag_id3_riff_aiff_load(FILE *file) +{ + size_t size = riff_seek_id3(file); + if (size == 0) + size = aiff_seek_id3(file); + if (size == 0) + return nullptr; + + if (size > 4 * 1024 * 1024) + /* too large, don't allocate so much memory */ + return nullptr; + + id3_byte_t *buffer = (id3_byte_t *)g_malloc(size); + size_t ret = fread(buffer, size, 1, file); + if (ret != 1) { + g_warning("Failed to read RIFF chunk"); + g_free(buffer); + return nullptr; + } + + struct id3_tag *tag = id3_tag_parse(buffer, size); + g_free(buffer); + return tag; +} + +struct id3_tag * +tag_id3_load(const char *path_fs, GError **error_r) +{ + FILE *file = fopen(path_fs, "rb"); + if (file == nullptr) { + g_set_error(error_r, errno_quark(), errno, + "Failed to open file %s: %s", + path_fs, g_strerror(errno)); + return nullptr; + } + + struct id3_tag *tag = tag_id3_find_from_beginning(file); + if (tag == nullptr) { + tag = tag_id3_riff_aiff_load(file); + if (tag == nullptr) + tag = tag_id3_find_from_end(file); + } + + fclose(file); + return tag; +} + +bool +tag_id3_scan(const char *path_fs, + const struct tag_handler *handler, void *handler_ctx) +{ + GError *error = nullptr; + struct id3_tag *tag = tag_id3_load(path_fs, &error); + if (tag == nullptr) { + if (error != nullptr) { + g_warning("%s", error->message); + g_error_free(error); + } + + return false; + } + + scan_id3_tag(tag, handler, handler_ctx); + id3_tag_delete(tag); + return true; +} diff --git a/src/TagId3.hxx b/src/TagId3.hxx new file mode 100644 index 000000000..271fc081f --- /dev/null +++ b/src/TagId3.hxx @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2003-2013 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_ID3_HXX +#define MPD_TAG_ID3_HXX + +#include "check.h" +#include "gcc.h" +#include "gerror.h" + +#include + +struct tag_handler; +struct tag; + +#ifdef HAVE_ID3TAG + +bool +tag_id3_scan(const char *path_fs, + const struct tag_handler *handler, void *handler_ctx); + +struct id3_tag; +struct tag *tag_id3_import(struct id3_tag *); + +/** + * Loads the ID3 tags from the file into a libid3tag object. The + * return value must be freed with id3_tag_delete(). + * + * @return NULL on error or if no ID3 tag was found in the file (no + * GError will be set) + */ +struct id3_tag * +tag_id3_load(const char *path_fs, GError **error_r); + +/** + * Import all tags from the provided id3_tag *tag + * + */ +void +scan_id3_tag(struct id3_tag *tag, + const struct tag_handler *handler, void *handler_ctx); + +#else + +static inline bool +tag_id3_scan(gcc_unused const char *path_fs, + gcc_unused const struct tag_handler *handler, + gcc_unused void *handler_ctx) +{ + return false; +} + +#endif + +#endif diff --git a/src/decoder/DsdLib.cxx b/src/decoder/DsdLib.cxx index 40a553d91..5337612a9 100644 --- a/src/decoder/DsdLib.cxx +++ b/src/decoder/DsdLib.cxx @@ -28,10 +28,7 @@ #include "DecoderAPI.hxx" #include "util/bit_reverse.h" #include "tag_handler.h" - -extern "C" { -#include "tag_id3.h" -} +#include "TagId3.hxx" #include #include /* for SEEK_SET, SEEK_CUR */ diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx index bbfd2f412..f8dd03701 100644 --- a/src/decoder/MadDecoderPlugin.cxx +++ b/src/decoder/MadDecoderPlugin.cxx @@ -21,11 +21,7 @@ #include "MadDecoderPlugin.hxx" #include "DecoderAPI.hxx" #include "conf.h" - -extern "C" { -#include "tag_id3.h" -} - +#include "TagId3.hxx" #include "TagRva2.hxx" #include "tag_handler.h" #include "audio_check.h" diff --git a/src/playlist/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/EmbeddedCuePlaylistPlugin.cxx index b88e4ae8c..8f8d87153 100644 --- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx +++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx @@ -28,13 +28,13 @@ #include "PlaylistPlugin.hxx" #include "tag.h" #include "tag_handler.h" +#include "TagId3.hxx" #include "Song.hxx" #include "TagFile.hxx" #include "cue/CueParser.hxx" extern "C" { #include "tag_ape.h" -#include "tag_id3.h" } #include diff --git a/src/tag_id3.c b/src/tag_id3.c deleted file mode 100644 index 5744e0e62..000000000 --- a/src/tag_id3.c +++ /dev/null @@ -1,585 +0,0 @@ -/* - * Copyright (C) 2003-2011 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 "tag_id3.h" -#include "tag_handler.h" -#include "tag_table.h" -#include "tag.h" -#include "riff.h" -#include "aiff.h" -#include "conf.h" -#include "io_error.h" - -#include -#include - -#include -#include -#include -#include - -#undef G_LOG_DOMAIN -#define G_LOG_DOMAIN "id3" - -# ifndef ID3_FRAME_COMPOSER -# define ID3_FRAME_COMPOSER "TCOM" -# endif -# ifndef ID3_FRAME_DISC -# define ID3_FRAME_DISC "TPOS" -# endif - -#ifndef ID3_FRAME_ARTIST_SORT -#define ID3_FRAME_ARTIST_SORT "TSOP" -#endif - -#ifndef ID3_FRAME_ALBUM_ARTIST_SORT -#define ID3_FRAME_ALBUM_ARTIST_SORT "TSO2" /* this one is unofficial, introduced by Itunes */ -#endif - -#ifndef ID3_FRAME_ALBUM_ARTIST -#define ID3_FRAME_ALBUM_ARTIST "TPE2" -#endif - -static inline bool -tag_is_id3v1(struct id3_tag *tag) -{ - return (id3_tag_options(tag, 0, 0) & ID3_TAG_OPTION_ID3V1) != 0; -} - -static id3_utf8_t * -tag_id3_getstring(const struct id3_frame *frame, unsigned i) -{ - union id3_field *field; - const id3_ucs4_t *ucs4; - - field = id3_frame_field(frame, i); - if (field == NULL) - return NULL; - - ucs4 = id3_field_getstring(field); - if (ucs4 == NULL) - return NULL; - - return id3_ucs4_utf8duplicate(ucs4); -} - -/* This will try to convert a string to utf-8, - */ -static id3_utf8_t * -import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4) -{ - id3_utf8_t *utf8, *utf8_stripped; - id3_latin1_t *isostr; - const char *encoding; - - /* use encoding field here? */ - if (is_id3v1 && - (encoding = config_get_string(CONF_ID3V1_ENCODING, NULL)) != NULL) { - isostr = id3_ucs4_latin1duplicate(ucs4); - if (G_UNLIKELY(!isostr)) { - return NULL; - } - - utf8 = (id3_utf8_t *) - g_convert_with_fallback((const char*)isostr, -1, - "utf-8", encoding, - NULL, NULL, NULL, NULL); - if (utf8 == NULL) { - g_debug("Unable to convert %s string to UTF-8: '%s'", - encoding, isostr); - g_free(isostr); - return NULL; - } - g_free(isostr); - } else { - utf8 = id3_ucs4_utf8duplicate(ucs4); - if (G_UNLIKELY(!utf8)) { - return NULL; - } - } - - utf8_stripped = (id3_utf8_t *)g_strdup(g_strstrip((gchar *)utf8)); - g_free(utf8); - - return utf8_stripped; -} - -/** - * Import a "Text information frame" (ID3v2.4.0 section 4.2). It - * contains 2 fields: - * - * - encoding - * - string list - */ -static void -tag_id3_import_text_frame(struct id3_tag *tag, const struct id3_frame *frame, - enum tag_type type, - const struct tag_handler *handler, void *handler_ctx) -{ - id3_ucs4_t const *ucs4; - id3_utf8_t *utf8; - union id3_field const *field; - unsigned int nstrings, i; - - if (frame->nfields != 2) - return; - - /* check the encoding field */ - - field = id3_frame_field(frame, 0); - if (field == NULL || field->type != ID3_FIELD_TYPE_TEXTENCODING) - return; - - /* process the value(s) */ - - field = id3_frame_field(frame, 1); - if (field == NULL || field->type != ID3_FIELD_TYPE_STRINGLIST) - return; - - /* Get the number of strings available */ - nstrings = id3_field_getnstrings(field); - for (i = 0; i < nstrings; i++) { - ucs4 = id3_field_getstrings(field, i); - if (ucs4 == NULL) - continue; - - if (type == TAG_GENRE) - ucs4 = id3_genre_name(ucs4); - - utf8 = import_id3_string(tag_is_id3v1(tag), ucs4); - if (utf8 == NULL) - continue; - - tag_handler_invoke_tag(handler, handler_ctx, - type, (const char *)utf8); - g_free(utf8); - } -} - -/** - * Import all text frames with the specified id (ID3v2.4.0 section - * 4.2). This is a wrapper for tag_id3_import_text_frame(). - */ -static void -tag_id3_import_text(struct id3_tag *tag, const char *id, enum tag_type type, - const struct tag_handler *handler, void *handler_ctx) -{ - const struct id3_frame *frame; - for (unsigned i = 0; - (frame = id3_tag_findframe(tag, id, i)) != NULL; ++i) - tag_id3_import_text_frame(tag, frame, type, - handler, handler_ctx); -} - -/** - * Import a "Comment frame" (ID3v2.4.0 section 4.10). It - * contains 4 fields: - * - * - encoding - * - language - * - string - * - full string (we use this one) - */ -static void -tag_id3_import_comment_frame(struct id3_tag *tag, - const struct id3_frame *frame, enum tag_type type, - const struct tag_handler *handler, - void *handler_ctx) -{ - id3_ucs4_t const *ucs4; - id3_utf8_t *utf8; - union id3_field const *field; - - if (frame->nfields != 4) - return; - - /* for now I only read the 4th field, with the fullstring */ - field = id3_frame_field(frame, 3); - if (field == NULL) - return; - - ucs4 = id3_field_getfullstring(field); - if (ucs4 == NULL) - return; - - utf8 = import_id3_string(tag_is_id3v1(tag), ucs4); - if (utf8 == NULL) - return; - - tag_handler_invoke_tag(handler, handler_ctx, type, (const char *)utf8); - g_free(utf8); -} - -/** - * Import all comment frames (ID3v2.4.0 section 4.10). This is a - * wrapper for tag_id3_import_comment_frame(). - */ -static void -tag_id3_import_comment(struct id3_tag *tag, const char *id, enum tag_type type, - const struct tag_handler *handler, void *handler_ctx) -{ - const struct id3_frame *frame; - for (unsigned i = 0; - (frame = id3_tag_findframe(tag, id, i)) != NULL; ++i) - tag_id3_import_comment_frame(tag, frame, type, - handler, handler_ctx); -} - -/** - * Parse a TXXX name, and convert it to a tag_type enum value. - * Returns TAG_NUM_OF_ITEM_TYPES if the TXXX name is not understood. - */ -static enum tag_type -tag_id3_parse_txxx_name(const char *name) -{ - static const struct tag_table txxx_tags[] = { - { "ALBUMARTISTSORT", TAG_ALBUM_ARTIST_SORT }, - { "MusicBrainz Artist Id", TAG_MUSICBRAINZ_ARTISTID }, - { "MusicBrainz Album Id", TAG_MUSICBRAINZ_ALBUMID }, - { "MusicBrainz Album Artist Id", - TAG_MUSICBRAINZ_ALBUMARTISTID }, - { "MusicBrainz Track Id", TAG_MUSICBRAINZ_TRACKID }, - { NULL, TAG_NUM_OF_ITEM_TYPES } - }; - - return tag_table_lookup(txxx_tags, name); -} - -/** - * Import all known MusicBrainz tags from TXXX frames. - */ -static void -tag_id3_import_musicbrainz(struct id3_tag *id3_tag, - const struct tag_handler *handler, - void *handler_ctx) -{ - for (unsigned i = 0;; ++i) { - const struct id3_frame *frame; - id3_utf8_t *name, *value; - enum tag_type type; - - frame = id3_tag_findframe(id3_tag, "TXXX", i); - if (frame == NULL) - break; - - name = tag_id3_getstring(frame, 1); - if (name == NULL) - continue; - - value = tag_id3_getstring(frame, 2); - if (value == NULL) - continue; - - tag_handler_invoke_pair(handler, handler_ctx, - (const char *)name, - (const char *)value); - - type = tag_id3_parse_txxx_name((const char*)name); - free(name); - - if (type != TAG_NUM_OF_ITEM_TYPES) - tag_handler_invoke_tag(handler, handler_ctx, - type, (const char*)value); - - free(value); - } -} - -/** - * Imports the MusicBrainz TrackId from the UFID tag. - */ -static void -tag_id3_import_ufid(struct id3_tag *id3_tag, - const struct tag_handler *handler, void *handler_ctx) -{ - for (unsigned i = 0;; ++i) { - const struct id3_frame *frame; - union id3_field *field; - const id3_latin1_t *name; - const id3_byte_t *value; - id3_length_t length; - - frame = id3_tag_findframe(id3_tag, "UFID", i); - if (frame == NULL) - break; - - field = id3_frame_field(frame, 0); - if (field == NULL) - continue; - - name = id3_field_getlatin1(field); - if (name == NULL || - strcmp((const char *)name, "http://musicbrainz.org") != 0) - continue; - - field = id3_frame_field(frame, 1); - if (field == NULL) - continue; - - value = id3_field_getbinarydata(field, &length); - if (value == NULL || length == 0) - continue; - - char *p = g_strndup((const char *)value, length); - tag_handler_invoke_tag(handler, handler_ctx, - TAG_MUSICBRAINZ_TRACKID, p); - g_free(p); - } -} - -void -scan_id3_tag(struct id3_tag *tag, - const struct tag_handler *handler, void *handler_ctx) -{ - tag_id3_import_text(tag, ID3_FRAME_ARTIST, TAG_ARTIST, - handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_ALBUM_ARTIST, - TAG_ALBUM_ARTIST, handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_ARTIST_SORT, - TAG_ARTIST_SORT, handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_ALBUM_ARTIST_SORT, - TAG_ALBUM_ARTIST_SORT, handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_TITLE, TAG_TITLE, - handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_ALBUM, TAG_ALBUM, - handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_TRACK, TAG_TRACK, - handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_YEAR, TAG_DATE, - handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_GENRE, TAG_GENRE, - handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_COMPOSER, TAG_COMPOSER, - handler, handler_ctx); - tag_id3_import_text(tag, "TPE3", TAG_PERFORMER, - handler, handler_ctx); - tag_id3_import_text(tag, "TPE4", TAG_PERFORMER, handler, handler_ctx); - tag_id3_import_comment(tag, ID3_FRAME_COMMENT, TAG_COMMENT, - handler, handler_ctx); - tag_id3_import_text(tag, ID3_FRAME_DISC, TAG_DISC, - handler, handler_ctx); - - tag_id3_import_musicbrainz(tag, handler, handler_ctx); - tag_id3_import_ufid(tag, handler, handler_ctx); -} - -struct tag *tag_id3_import(struct id3_tag * tag) -{ - struct tag *ret = tag_new(); - - scan_id3_tag(tag, &add_tag_handler, ret); - - if (tag_is_empty(ret)) { - tag_free(ret); - ret = NULL; - } - - return ret; -} - -static int -fill_buffer(void *buf, size_t size, FILE *stream, long offset, int whence) -{ - if (fseek(stream, offset, whence) != 0) return 0; - return fread(buf, 1, size, stream); -} - -static int -get_id3v2_footer_size(FILE *stream, long offset, int whence) -{ - id3_byte_t buf[ID3_TAG_QUERYSIZE]; - int bufsize; - - bufsize = fill_buffer(buf, ID3_TAG_QUERYSIZE, stream, offset, whence); - if (bufsize <= 0) return 0; - return id3_tag_query(buf, bufsize); -} - -static struct id3_tag * -tag_id3_read(FILE *stream, long offset, int whence) -{ - struct id3_tag *tag; - id3_byte_t query_buffer[ID3_TAG_QUERYSIZE]; - id3_byte_t *tag_buffer; - int tag_size; - int query_buffer_size; - int tag_buffer_size; - - /* It's ok if we get less than we asked for */ - query_buffer_size = fill_buffer(query_buffer, ID3_TAG_QUERYSIZE, - stream, offset, whence); - if (query_buffer_size <= 0) return NULL; - - /* Look for a tag header */ - tag_size = id3_tag_query(query_buffer, query_buffer_size); - if (tag_size <= 0) return NULL; - - /* Found a tag. Allocate a buffer and read it in. */ - tag_buffer = g_malloc(tag_size); - if (!tag_buffer) return NULL; - - tag_buffer_size = fill_buffer(tag_buffer, tag_size, stream, offset, whence); - if (tag_buffer_size < tag_size) { - g_free(tag_buffer); - return NULL; - } - - tag = id3_tag_parse(tag_buffer, tag_buffer_size); - - g_free(tag_buffer); - - return tag; -} - -static struct id3_tag * -tag_id3_find_from_beginning(FILE *stream) -{ - struct id3_tag *tag; - struct id3_tag *seektag; - struct id3_frame *frame; - int seek; - - tag = tag_id3_read(stream, 0, SEEK_SET); - if (!tag) { - return NULL; - } else if (tag_is_id3v1(tag)) { - /* id3v1 tags don't belong here */ - id3_tag_delete(tag); - return NULL; - } - - /* We have an id3v2 tag, so let's look for SEEK frames */ - while ((frame = id3_tag_findframe(tag, "SEEK", 0))) { - /* Found a SEEK frame, get it's value */ - seek = id3_field_getint(id3_frame_field(frame, 0)); - if (seek < 0) - break; - - /* Get the tag specified by the SEEK frame */ - seektag = tag_id3_read(stream, seek, SEEK_CUR); - if (!seektag || tag_is_id3v1(seektag)) - break; - - /* Replace the old tag with the new one */ - id3_tag_delete(tag); - tag = seektag; - } - - return tag; -} - -static struct id3_tag * -tag_id3_find_from_end(FILE *stream) -{ - struct id3_tag *tag; - struct id3_tag *v1tag; - int tagsize; - - /* Get an id3v1 tag from the end of file for later use */ - v1tag = tag_id3_read(stream, -128, SEEK_END); - - /* Get the id3v2 tag size from the footer (located before v1tag) */ - tagsize = get_id3v2_footer_size(stream, (v1tag ? -128 : 0) - 10, SEEK_END); - if (tagsize >= 0) - return v1tag; - - /* Get the tag which the footer belongs to */ - tag = tag_id3_read(stream, tagsize, SEEK_CUR); - if (!tag) - return v1tag; - - /* We have an id3v2 tag, so ditch v1tag */ - id3_tag_delete(v1tag); - - return tag; -} - -static struct id3_tag * -tag_id3_riff_aiff_load(FILE *file) -{ - size_t size; - void *buffer; - size_t ret; - struct id3_tag *tag; - - size = riff_seek_id3(file); - if (size == 0) - size = aiff_seek_id3(file); - if (size == 0) - return NULL; - - if (size > 4 * 1024 * 1024) - /* too large, don't allocate so much memory */ - return NULL; - - buffer = g_malloc(size); - ret = fread(buffer, size, 1, file); - if (ret != 1) { - g_warning("Failed to read RIFF chunk"); - g_free(buffer); - return NULL; - } - - tag = id3_tag_parse(buffer, size); - g_free(buffer); - return tag; -} - -struct id3_tag * -tag_id3_load(const char *path_fs, GError **error_r) -{ - FILE *file = fopen(path_fs, "rb"); - if (file == NULL) { - g_set_error(error_r, errno_quark(), errno, - "Failed to open file %s: %s", - path_fs, g_strerror(errno)); - return NULL; - } - - struct id3_tag *tag = tag_id3_find_from_beginning(file); - if (tag == NULL) { - tag = tag_id3_riff_aiff_load(file); - if (tag == NULL) - tag = tag_id3_find_from_end(file); - } - - fclose(file); - return tag; -} - -bool -tag_id3_scan(const char *path_fs, - const struct tag_handler *handler, void *handler_ctx) -{ - GError *error = NULL; - struct id3_tag *tag = tag_id3_load(path_fs, &error); - if (tag == NULL) { - if (error != NULL) { - g_warning("%s", error->message); - g_error_free(error); - } - - return false; - } - - scan_id3_tag(tag, handler, handler_ctx); - id3_tag_delete(tag); - return true; -} diff --git a/src/tag_id3.h b/src/tag_id3.h deleted file mode 100644 index 1907c13fc..000000000 --- a/src/tag_id3.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2003-2011 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_ID3_H -#define MPD_TAG_ID3_H - -#include "check.h" -#include "gcc.h" -#include "gerror.h" - -#include - -struct tag_handler; -struct tag; - -#ifdef HAVE_ID3TAG - -bool -tag_id3_scan(const char *path_fs, - const struct tag_handler *handler, void *handler_ctx); - -struct id3_tag; -struct tag *tag_id3_import(struct id3_tag *); - -/** - * Loads the ID3 tags from the file into a libid3tag object. The - * return value must be freed with id3_tag_delete(). - * - * @return NULL on error or if no ID3 tag was found in the file (no - * GError will be set) - */ -struct id3_tag * -tag_id3_load(const char *path_fs, GError **error_r); - -/** - * Import all tags from the provided id3_tag *tag - * - */ -void -scan_id3_tag(struct id3_tag *tag, - const struct tag_handler *handler, void *handler_ctx); - -#else - -static inline bool -tag_id3_scan(gcc_unused const char *path_fs, - gcc_unused const struct tag_handler *handler, - gcc_unused void *handler_ctx) -{ - return false; -} - -#endif - -#endif -- cgit v1.2.3