X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fpodcast.c;h=ba7c83a1b051aecd97ef01deac92375f26c6079d;hb=f3afae4fa71971a7a7d5359ec6f97a2925521f6a;hp=2733d046f3e07b29addc5410760cb97d41c31221;hpb=d2e9083f35d47441c225991ed42530d335117593;p=vlc diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c index 2733d046f3..ba7c83a1b0 100644 --- a/modules/demux/playlist/podcast.c +++ b/modules/demux/playlist/podcast.c @@ -1,7 +1,7 @@ /***************************************************************************** * podcast.c : podcast playlist imports ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2009 the VideoLAN team * $Id$ * * Authors: Antoine Cellerier @@ -34,18 +34,12 @@ #include "playlist.h" #include -struct demux_sys_t -{ - char *psz_prefix; - xml_t *p_xml; - xml_reader_t *p_xml_reader; -}; - /***************************************************************************** * Local prototypes *****************************************************************************/ static int Demux( demux_t *p_demux); static int Control( demux_t *p_demux, int i_query, va_list args ); +static mtime_t strTimeToMTime( const char *psz ); /***************************************************************************** * Import_podcast: main import function @@ -57,10 +51,9 @@ int Import_podcast( vlc_object_t *p_this ) if( !demux_IsForced( p_demux, "podcast" ) ) return VLC_EGENERIC; - STANDARD_DEMUX_INIT_MSG( "using podcast reader" ); - p_demux->p_sys->psz_prefix = FindPrefix( p_demux ); - p_demux->p_sys->p_xml = NULL; - p_demux->p_sys->p_xml_reader = NULL; + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; + msg_Dbg( p_demux, "using podcast reader" ); return VLC_SUCCESS; } @@ -70,25 +63,16 @@ int Import_podcast( vlc_object_t *p_this ) *****************************************************************************/ void Close_podcast( vlc_object_t *p_this ) { - demux_t *p_demux = (demux_t *)p_this; - demux_sys_t *p_sys = p_demux->p_sys; - - free( p_sys->psz_prefix ); - if( p_sys->p_xml_reader ) xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader ); - if( p_sys->p_xml ) xml_Delete( p_sys->p_xml ); - free( p_sys ); + (void)p_this; } /* "specs" : http://phobos.apple.com/static/iTunesRSS.html */ static int Demux( demux_t *p_demux ) { - demux_sys_t *p_sys = p_demux->p_sys; - bool b_item = false; bool b_image = false; int i_ret; - xml_t *p_xml; xml_reader_t *p_xml_reader; char *psz_elname = NULL; char *psz_item_mrl = NULL; @@ -102,36 +86,33 @@ static int Demux( demux_t *p_demux ) char *psz_item_keywords = NULL; char *psz_item_subtitle = NULL; char *psz_item_summary = NULL; + char *psz_art_url = NULL; int i_type; input_item_t *p_input; + input_item_node_t *p_subitems = NULL; - INIT_PLAYLIST_STUFF; - - p_xml = p_sys->p_xml = xml_Create( p_demux ); - if( !p_xml ) return -1; + input_item_t *p_current_input = GetCurrentItem(p_demux); -/* psz_elname = stream_ReadLine( p_demux->s ); - if( psz_elname ) free( psz_elname ); - psz_elname = 0;*/ - - p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s ); - if( !p_xml_reader ) return -1; - p_sys->p_xml_reader = p_xml_reader; + 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 ) { msg_Err( p_demux, "invalid file (no root node)" ); - return -1; + 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)" ); - return -1; + goto error; } + } if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM || ( psz_elname = xml_ReaderName( p_xml_reader ) ) == NULL || @@ -139,10 +120,11 @@ static int Demux( demux_t *p_demux ) { msg_Err( p_demux, "invalid root node %i, %s", xml_ReaderNodeType( p_xml_reader ), psz_elname ); - free( psz_elname ); - return -1; + goto error; } - free( psz_elname ); psz_elname = NULL; + FREENULL( psz_elname ); + + p_subitems = input_item_node_Create( p_current_input ); while( (i_ret = xml_ReaderRead( p_xml_reader )) == 1 ) { @@ -152,15 +134,15 @@ static int Demux( demux_t *p_demux ) { // Error case -1: - return -1; - break; + goto error; case XML_READER_STARTELEM: { // Read the element name free( psz_elname ); psz_elname = xml_ReaderName( p_xml_reader ); - if( !psz_elname ) return -1; + if( !psz_elname ) + goto error; if( !strcmp( psz_elname, "item" ) ) { @@ -168,7 +150,7 @@ static int Demux( demux_t *p_demux ) } else if( !strcmp( psz_elname, "image" ) ) { - b_item = true; + b_image = true; } // Read the attributes @@ -180,100 +162,121 @@ static int Demux( demux_t *p_demux ) { free( psz_name ); free( psz_value ); - free( psz_elname ); - return -1; - } - if( !strcmp( psz_elname, "enclosure" ) && - !strcmp( psz_name, "url" ) ) - { - free( psz_item_mrl ); - psz_item_mrl = strdup( psz_value ); + goto error; } - else if( !strcmp( psz_elname, "enclosure" ) && - !strcmp( psz_name, "length" ) ) - { - free( psz_item_size ); - psz_item_size = strdup( psz_value ); - } - else if( !strcmp( psz_elname, "enclosure" ) && - !strcmp( psz_name, "type" ) ) + + if( !strcmp( psz_elname, "enclosure" ) ) { - free( psz_item_type ); - psz_item_type = strdup( psz_value ); + if( !strcmp( psz_name, "url" ) ) + { + free( psz_item_mrl ); + psz_item_mrl = psz_value; + } + else if( !strcmp( psz_name, "length" ) ) + { + free( psz_item_size ); + psz_item_size = psz_value; + } + else if( !strcmp( psz_name, "type" ) ) + { + free( psz_item_type ); + psz_item_type = psz_value; + } + else + { + msg_Dbg( p_demux,"unhandled attribute %s in element %s", + psz_name, psz_elname ); + free( psz_value ); + } } else { - msg_Dbg( p_demux,"unhandled attribure %s in element %s", + msg_Dbg( p_demux,"unhandled attribute %s in element %s", psz_name, psz_elname ); + free( psz_value ); } free( psz_name ); - free( psz_value ); } break; } case XML_READER_TEXT: { -#define SET_DATA( field, name ) else if( b_item == true \ - && !strcmp( psz_elname, name ) ) \ - { \ - field = strdup( psz_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 && !strcmp( psz_elname, "title" ) ) + if( b_item == true ) { - psz_item_name = strdup( psz_text ); - } - else if( b_item == true - && ( !strcmp( psz_elname, "itunes:author" ) - ||!strcmp( psz_elname, "author" ) ) ) - { /* isn't standard iTunes podcast stuff */ - psz_item_author = strdup( psz_text ); - } - else if( b_item == true - && ( !strcmp( psz_elname, "itunes:summary" ) - ||!strcmp( psz_elname, "description" ) ) ) - { /* isn't standard iTunes podcast stuff */ - psz_item_summary = strdup( psz_text ); + if( !strcmp( psz_elname, "title" ) ) + { + psz_item_name = psz_text; + } + else if( !strcmp( psz_elname, "itunes:author" ) || + !strcmp( psz_elname, "author" ) ) + { /* isn't standard iTunes podcast stuff */ + psz_item_author = psz_text; + } + else if( !strcmp( psz_elname, "itunes:summary" ) || + !strcmp( psz_elname, "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" ) + else + free( 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" ) #undef SET_DATA + /* toplevel meta data */ - else if( b_item == false && b_image == false - && !strcmp( psz_elname, "title" ) ) + else if( b_image == false ) { - input_item_SetName( p_current_input, psz_text ); - } + if( !strcmp( psz_elname, "title" ) ) + { + input_item_SetName( p_current_input, psz_text ); + } #define ADD_GINFO( info, name ) \ - else if( !b_item && !b_image && !strcmp( psz_elname, 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", 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" ) #undef ADD_GINFO - else if( b_item == false && b_image == false - && ( !strcmp( psz_elname, "itunes:summary" ) - ||!strcmp( psz_elname, "description" ) ) ) - { /* isn't standard iTunes podcast stuff */ - input_item_AddInfo( p_current_input, - _( "Podcast Info" ), _( "Podcast Summary" ), - "%s", psz_text ); + else if( !strcmp( psz_elname, "itunes:summary" ) || + !strcmp( psz_elname, "description" ) ) + { /* isn't standard iTunes podcast stuff */ + input_item_AddInfo( p_current_input, + _( "Podcast Info" ), _( "Podcast Summary" ), + "%s", psz_text ); + } + free( psz_text ); } else { - msg_Dbg( p_demux, "unhandled text in element '%s'", - psz_elname ); + if( !strcmp( psz_elname, "url" ) ) + { + free( psz_art_url ); + psz_art_url = psz_text; + } + else + { + msg_Dbg( p_demux, "unhandled text in element '%s'", + psz_elname ); + free( psz_text ); + } } - free( psz_text ); break; } // End element @@ -282,38 +285,46 @@ static int Demux( demux_t *p_demux ) // Read the element name free( psz_elname ); psz_elname = xml_ReaderName( p_xml_reader ); - if( !psz_elname ) return -1; + if( !psz_elname ) + goto error; if( !strcmp( psz_elname, "item" ) ) { if( psz_item_mrl == NULL ) { msg_Err( p_demux, "invalid XML (no enclosure markup)" ); - free( psz_elname ); - return -1; + 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 ); + _( "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 + + /* Set the duration if available */ + if( psz_item_duration ) + input_item_SetDuration( p_input, strTimeToMTime( psz_item_duration ) ); + /* Add the global art url to this item, if any */ + if( psz_art_url ) + input_item_SetArtURL( p_input, psz_art_url ); + if( psz_item_size ) { input_item_AddInfo( p_input, _( "Podcast Info" ), _( "Podcast Size" ), - "%s bytes", + _("%s bytes"), psz_item_size ); } - input_item_AddSubItem( p_current_input, p_input ); + input_item_node_AppendItem( p_subitems, p_input ); vlc_gc_decref( p_input ); FREENULL( psz_item_name ); FREENULL( psz_item_mrl ); @@ -345,10 +356,36 @@ static int Demux( demux_t *p_demux ) msg_Warn( p_demux, "error while parsing data" ); } + free( psz_art_url ); free( psz_elname ); + xml_ReaderDelete( p_xml_reader ); - HANDLE_PLAY_AND_RELEASE; + input_item_node_PostAndDelete( p_subitems ); + vlc_gc_decref(p_current_input); return 0; /* Needed for correct operation of go back */ + +error: + free( psz_item_name ); + free( psz_item_mrl ); + free( psz_item_size ); + free( psz_item_type ); + free( psz_item_date ); + free( psz_item_author ); + free( psz_item_category ); + free( psz_item_duration ); + free( psz_item_keywords ); + free( psz_item_subtitle ); + free( psz_item_summary ); + free( psz_art_url ); + free( psz_elname ); + + if( p_xml_reader ) + xml_ReaderDelete( p_xml_reader ); + if( p_subitems ) + input_item_node_Delete( p_subitems ); + + vlc_gc_decref(p_current_input); + return -1; } static int Control( demux_t *p_demux, int i_query, va_list args ) @@ -356,3 +393,18 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args); return VLC_EGENERIC; } + +static mtime_t strTimeToMTime( const char *psz ) +{ + int h, m, s; + switch( sscanf( psz, "%u:%u:%u", &h, &m, &s ) ) + { + case 3: + return (mtime_t)( ( h*60 + m )*60 + s ) * 1000000; + case 2: + return (mtime_t)( h*60 + m ) * 1000000; + break; + default: + return -1; + } +}