{
bool b_item = false;
bool b_image = false;
- int i_ret;
- xml_t *p_xml;
- xml_reader_t *p_xml_reader = NULL;
+ xml_reader_t *p_xml_reader;
char *psz_elname = NULL;
char *psz_item_mrl = NULL;
char *psz_item_size = NULL;
char *psz_item_subtitle = NULL;
char *psz_item_summary = NULL;
char *psz_art_url = NULL;
+ const char *node;
int i_type;
input_item_t *p_input;
input_item_node_t *p_subitems = NULL;
input_item_t *p_current_input = GetCurrentItem(p_demux);
- p_xml = xml_Create( p_demux );
- if( !p_xml )
- goto error;
-
- p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
+ p_xml_reader = xml_ReaderCreate( p_demux, p_demux->s );
if( !p_xml_reader )
goto error;
/* xml */
/* check root node */
- if( xml_ReaderRead( p_xml_reader ) != 1 )
+ if( xml_ReaderNextNode( p_xml_reader, &node ) != XML_READER_STARTELEM )
{
msg_Err( p_demux, "invalid file (no root node)" );
goto error;
}
- while( xml_ReaderNodeType( p_xml_reader ) == XML_READER_NONE )
- {
- if( xml_ReaderRead( p_xml_reader ) != 1 )
- {
- msg_Err( p_demux, "invalid file (no root node)" );
- goto error;
- }
- }
-
- if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ||
- ( psz_elname = xml_ReaderName( p_xml_reader ) ) == NULL ||
- strcmp( psz_elname, "rss" ) )
+ if( strcmp( node, "rss" ) )
{
- msg_Err( p_demux, "invalid root node %i, %s",
- xml_ReaderNodeType( p_xml_reader ), psz_elname );
+ msg_Err( p_demux, "invalid root node <%s>", node );
goto error;
}
- FREENULL( psz_elname );
p_subitems = input_item_node_Create( p_current_input );
- while( (i_ret = xml_ReaderRead( p_xml_reader )) == 1 )
+ while( (i_type = xml_ReaderNextNode( p_xml_reader, &node )) > 0 )
{
- // Get the node type
- i_type = xml_ReaderNodeType( p_xml_reader );
switch( i_type )
{
- // Error
- case -1:
- goto error;
-
case XML_READER_STARTELEM:
{
- // Read the element name
free( psz_elname );
- psz_elname = xml_ReaderName( p_xml_reader );
- if( !psz_elname )
+ psz_elname = strdup( node );
+ if( unlikely(!node) )
goto error;
- if( !strcmp( psz_elname, "item" ) )
- {
+ if( !strcmp( node, "item" ) )
b_item = true;
- }
- else if( !strcmp( psz_elname, "image" ) )
- {
+ else if( !strcmp( node, "image" ) )
b_image = true;
- }
// Read the attributes
- while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
+ const char *attr, *value;
+ while( (attr = xml_ReaderNextAttr( p_xml_reader, &value )) )
{
- char *psz_name = xml_ReaderName( p_xml_reader );
- char *psz_value = xml_ReaderValue( p_xml_reader );
- if( !psz_name || !psz_value )
+ if( !strcmp( node, "enclosure" ) )
{
- free( psz_name );
- free( psz_value );
- goto error;
- }
-
- if( !strcmp( psz_elname, "enclosure" ) )
- {
- if( !strcmp( psz_name, "url" ) )
- {
- free( psz_item_mrl );
- psz_item_mrl = psz_value;
- }
- else if( !strcmp( psz_name, "length" ) )
+ char **p = NULL;
+ if( !strcmp( attr, "url" ) )
+ p = &psz_item_mrl;
+ else if( !strcmp( attr, "length" ) )
+ p = &psz_item_size;
+ else if( !strcmp( attr, "type" ) )
+ p = &psz_item_type;
+ if( p != NULL )
{
- free( psz_item_size );
- psz_item_size = psz_value;
- }
- else if( !strcmp( psz_name, "type" ) )
- {
- free( psz_item_type );
- psz_item_type = psz_value;
+ free( *p );
+ *p = strdup( value );
}
else
- {
- msg_Dbg( p_demux,"unhandled attribure %s in element %s",
- psz_name, psz_elname );
- free( psz_value );
- }
+ msg_Dbg( p_demux,"unhandled attribute %s in <%s>",
+ attr, node );
}
else
- {
- msg_Dbg( p_demux,"unhandled attribure %s in element %s",
- psz_name, psz_elname );
- free( psz_value );
- }
- free( psz_name );
+ msg_Dbg( p_demux,"unhandled attribute %s in <%s>",
+ attr, node );
}
break;
}
+
case XML_READER_TEXT:
{
if(!psz_elname) break;
- char *psz_text = xml_ReaderValue( p_xml_reader );
-
-#define SET_DATA( field, name ) \
- else if( !strcmp( psz_elname, name ) ) \
- { \
- field = psz_text; \
- }
/* item specific meta data */
- if( b_item == true )
+ if( b_item )
{
+ char **p;
+
if( !strcmp( psz_elname, "title" ) )
- {
- psz_item_name = psz_text;
- }
+ p = &psz_item_name;
else if( !strcmp( psz_elname, "itunes:author" ) ||
!strcmp( psz_elname, "author" ) )
- { /* <author> isn't standard iTunes podcast stuff */
- psz_item_author = psz_text;
- }
+ /* <author> isn't standard iTunes podcast stuff */
+ p = &psz_item_author;
else if( !strcmp( psz_elname, "itunes:summary" ) ||
!strcmp( psz_elname, "description" ) )
- { /* <description> isn't standard iTunes podcast stuff */
- psz_item_summary = psz_text;
- }
- SET_DATA( psz_item_date, "pubDate" )
- SET_DATA( psz_item_category, "itunes:category" )
- SET_DATA( psz_item_duration, "itunes:duration" )
- SET_DATA( psz_item_keywords, "itunes:keywords" )
- SET_DATA( psz_item_subtitle, "itunes:subtitle" )
+ /* <description> isn't standard iTunes podcast stuff */
+ p = &psz_item_summary;
+ else if( !strcmp( psz_elname, "pubDate" ) )
+ p = &psz_item_date;
+ else if( !strcmp( psz_elname, "itunes:category" ) )
+ p = &psz_item_category;
+ else if( !strcmp( psz_elname, "itunes:duration" ) )
+ p = &psz_item_duration;
+ else if( !strcmp( psz_elname, "itunes:keywords" ) )
+ p = &psz_item_keywords;
+ else if( !strcmp( psz_elname, "itunes:subtitle" ) )
+ p = &psz_item_subtitle;
else
- free( psz_text );
- }
-#undef SET_DATA
+ break;
+ free( *p );
+ *p = strdup( node );
+ }
/* toplevel meta data */
- else if( b_image == false )
+ else if( !b_image )
{
if( !strcmp( psz_elname, "title" ) )
- {
- input_item_SetName( p_current_input, psz_text );
- }
+ input_item_SetName( p_current_input, node );
#define ADD_GINFO( info, name ) \
else if( !strcmp( psz_elname, name ) ) \
- { \
input_item_AddInfo( p_current_input, _("Podcast Info"), \
- _( info ), "%s", psz_text ); \
- }
- ADD_GINFO( "Podcast Link", "link" )
- ADD_GINFO( "Podcast Copyright", "copyright" )
- ADD_GINFO( "Podcast Category", "itunes:category" )
- ADD_GINFO( "Podcast Keywords", "itunes:keywords" )
- ADD_GINFO( "Podcast Subtitle", "itunes:subtitle" )
+ info, "%s", node );
+ ADD_GINFO( _("Podcast Link"), "link" )
+ ADD_GINFO( _("Podcast Copyright"), "copyright" )
+ ADD_GINFO( _("Podcast Category"), "itunes:category" )
+ ADD_GINFO( _("Podcast Keywords"), "itunes:keywords" )
+ ADD_GINFO( _("Podcast Subtitle"), "itunes:subtitle" )
#undef ADD_GINFO
else if( !strcmp( psz_elname, "itunes:summary" ) ||
!strcmp( psz_elname, "description" ) )
{ /* <description> isn't standard iTunes podcast stuff */
input_item_AddInfo( p_current_input,
_( "Podcast Info" ), _( "Podcast Summary" ),
- "%s", psz_text );
+ "%s", node );
}
- free( psz_text );
}
else
{
if( !strcmp( psz_elname, "url" ) )
{
free( psz_art_url );
- psz_art_url = psz_text;
+ psz_art_url = strdup( node );
}
else
- {
- msg_Dbg( p_demux, "unhandled text in element '%s'",
+ msg_Dbg( p_demux, "unhandled text in element <%s>",
psz_elname );
- free( psz_text );
- }
}
break;
}
+
// End element
case XML_READER_ENDELEM:
{
- // Read the element name
- free( psz_elname );
- psz_elname = xml_ReaderName( p_xml_reader );
- if( !psz_elname )
- goto error;
- if( !strcmp( psz_elname, "item" ) )
+ FREENULL( psz_elname );
+
+ if( !strcmp( node, "item" ) )
{
if( psz_item_mrl == NULL )
{
msg_Err( p_demux, "invalid XML (no enclosure markup)" );
goto error;
}
- p_input = input_item_New( p_demux, psz_item_mrl, psz_item_name );
- if( p_input == NULL ) break;
-#define ADD_INFO( info, field ) \
- if( field ) { input_item_AddInfo( p_input, \
- _( "Podcast Info" ), _( info ), "%s", field ); }
- ADD_INFO( "Podcast Publication Date", psz_item_date );
- ADD_INFO( "Podcast Author", psz_item_author );
- ADD_INFO( "Podcast Subcategory", psz_item_category );
- ADD_INFO( "Podcast Duration", psz_item_duration );
- ADD_INFO( "Podcast Keywords", psz_item_keywords );
- ADD_INFO( "Podcast Subtitle", psz_item_subtitle );
- ADD_INFO( "Podcast Summary", psz_item_summary );
- ADD_INFO( "Podcast Type", psz_item_type );
-#undef ADD_INFO
+
+ p_input = input_item_New( psz_item_mrl, psz_item_name );
+ FREENULL( psz_item_mrl );
+ FREENULL( psz_item_name );
+
+ if( p_input == NULL )
+ break; /* FIXME: meta data memory leaks? */
/* Set the duration if available */
if( psz_item_duration )
input_item_SetDuration( p_input, strTimeToMTime( psz_item_duration ) );
+
+#define ADD_INFO( info, field ) \
+ if( field ) { \
+ input_item_AddInfo( p_input, _( "Podcast Info" ), (info), "%s", \
+ (field) ); \
+ FREENULL( field ); }
+ ADD_INFO( _("Podcast Publication Date"), psz_item_date );
+ ADD_INFO( _("Podcast Author"), psz_item_author );
+ ADD_INFO( _("Podcast Subcategory"), psz_item_category );
+ ADD_INFO( _("Podcast Duration"), psz_item_duration );
+ ADD_INFO( _("Podcast Keywords"), psz_item_keywords );
+ ADD_INFO( _("Podcast Subtitle"), psz_item_subtitle );
+ ADD_INFO( _("Podcast Summary"), psz_item_summary );
+ ADD_INFO( _("Podcast Type"), psz_item_type );
+#undef ADD_INFO
+
/* Add the global art url to this item, if any */
if( psz_art_url )
input_item_SetArtURL( p_input, psz_art_url );
input_item_AddInfo( p_input,
_( "Podcast Info" ),
_( "Podcast Size" ),
- "%s bytes",
+ _("%s bytes"),
psz_item_size );
+ FREENULL( psz_item_size );
}
input_item_node_AppendItem( p_subitems, p_input );
vlc_gc_decref( p_input );
- FREENULL( psz_item_name );
- FREENULL( psz_item_mrl );
- FREENULL( psz_item_size );
- FREENULL( psz_item_type );
- FREENULL( psz_item_date );
- FREENULL( psz_item_author );
- FREENULL( psz_item_category );
- FREENULL( psz_item_duration );
- FREENULL( psz_item_keywords );
- FREENULL( psz_item_subtitle );
- FREENULL( psz_item_summary );
b_item = false;
}
- else if( !strcmp( psz_elname, "image" ) )
+ else if( !strcmp( node, "image" ) )
{
b_image = false;
}
- free( psz_elname );
- psz_elname = strdup( "" );
-
break;
}
}
}
- if( i_ret != 0 )
+ if( i_type < 0 )
{
msg_Warn( p_demux, "error while parsing data" );
}
free( psz_art_url );
free( psz_elname );
- xml_ReaderDelete( p_xml, p_xml_reader );
- xml_Delete( p_xml );
+ xml_ReaderDelete( p_xml_reader );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
free( psz_elname );
if( p_xml_reader )
- xml_ReaderDelete( p_xml, p_xml_reader );
- if( p_xml )
- xml_Delete( p_xml );
+ xml_ReaderDelete( p_xml_reader );
if( p_subitems )
input_item_node_Delete( p_subitems );
projects / vlc / blobdiff