X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fpodcast.c;h=ba7c83a1b051aecd97ef01deac92375f26c6079d;hb=f3afae4fa71971a7a7d5359ec6f97a2925521f6a;hp=f8ed6f74e01ed305bce824ffabd68a6e7be90b65;hpb=bf85a9205c4fb2c70d5ae88034c301f1bc9bccd5;p=vlc diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c index f8ed6f74e0..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 @@ -24,65 +24,36 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include /* isspace() */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include -#include +#include +#include -#include /* ENOMEM */ #include "playlist.h" -#include "vlc_xml.h" - -struct demux_sys_t -{ - char *psz_prefix; - playlist_t *p_playlist; - xml_t *p_xml; - xml_reader_t *p_xml_reader; -}; +#include /***************************************************************************** * 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 *****************************************************************************/ -int E_(Import_podcast)( vlc_object_t *p_this ) +int Import_podcast( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; - demux_sys_t *p_sys; - - char *psz_ext; - psz_ext = strrchr ( p_demux->psz_path, '.' ); - - if( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "podcast") ) - { - ; - } - else - { + if( !demux_IsForced( p_demux, "podcast" ) ) return VLC_EGENERIC; - } - msg_Dbg( p_demux, "using podcast playlist import"); - p_demux->pf_control = Control; p_demux->pf_demux = Demux; - p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) ); - if( p_sys == NULL ) - { - msg_Err( p_demux, "out of memory" ); - return VLC_ENOMEM; - } - p_sys->psz_prefix = E_(FindPrefix)( p_demux ); - p_sys->p_playlist = NULL; - p_sys->p_xml = NULL; - p_sys->p_xml_reader = NULL; + p_demux->pf_control = Control; + msg_Dbg( p_demux, "using podcast reader" ); return VLC_SUCCESS; } @@ -90,28 +61,18 @@ int E_(Import_podcast)( vlc_object_t *p_this ) /***************************************************************************** * Deactivate: frees unused data *****************************************************************************/ -void E_(Close_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; - - if( p_sys->psz_prefix ) free( p_sys->psz_prefix ); - if( p_sys->p_playlist ) vlc_object_release( p_sys->p_playlist ); - 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; - - vlc_bool_t b_item = VLC_FALSE; - vlc_bool_t b_image = VLC_FALSE; + 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; @@ -125,38 +86,45 @@ 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; - -/* psz_elname = stream_ReadLine( p_demux->s ); - if( psz_elname ) free( psz_elname ); - psz_elname = 0;*/ + input_item_t *p_current_input = GetCurrentItem(p_demux); - 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)" ); + goto error; + } } + if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM || ( psz_elname = xml_ReaderName( p_xml_reader ) ) == NULL || strcmp( psz_elname, "rss" ) ) { msg_Err( p_demux, "invalid root node %i, %s", xml_ReaderNodeType( p_xml_reader ), psz_elname ); - if( 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 ) { @@ -166,23 +134,23 @@ static int Demux( demux_t *p_demux ) { // Error case -1: - return -1; - break; + goto error; case XML_READER_STARTELEM: { // Read the element name - if( psz_elname ) free( psz_elname ); + 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" ) ) { - b_item = VLC_TRUE; + b_item = true; } else if( !strcmp( psz_elname, "image" ) ) { - b_item = VLC_TRUE; + b_image = true; } // Read the attributes @@ -190,144 +158,125 @@ static int Demux( demux_t *p_demux ) { char *psz_name = xml_ReaderName( p_xml_reader ); char *psz_value = xml_ReaderValue( p_xml_reader ); - if( !psz_name || !psz_value ) return -1; - if( !strcmp( psz_elname, "enclosure" ) && - !strcmp( psz_name, "url" ) ) - { - psz_item_mrl = strdup( psz_value ); - } - else if( !strcmp( psz_elname, "enclosure" ) && - !strcmp( psz_name, "length" ) ) + if( !psz_name || !psz_value ) { - psz_item_size = strdup( psz_value ); + free( psz_name ); + free( psz_value ); + goto error; } - else if( !strcmp( psz_elname, "enclosure" ) && - !strcmp( psz_name, "type" ) ) + + if( !strcmp( psz_elname, "enclosure" ) ) { - 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: { + 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 == VLC_TRUE && !strcmp( psz_elname, "title" ) ) - { - psz_item_name = strdup( psz_text ); - } - else if( b_item == VLC_TRUE - && !strcmp( psz_elname, "pubDate" ) ) - { - psz_item_date = strdup( psz_text ); - } - else if( b_item == VLC_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 == VLC_TRUE - && !strcmp( psz_elname, "itunes:category" ) ) - { - psz_item_category = strdup( psz_text ); - } - else if( b_item == VLC_TRUE - && !strcmp( psz_elname, "itunes:duration" ) ) + if( b_item == true ) { - psz_item_duration = strdup( psz_text ); - } - else if( b_item == VLC_TRUE - && !strcmp( psz_elname, "itunes:keywords" ) ) - { - psz_item_keywords = strdup( psz_text ); - } - else if( b_item == VLC_TRUE - && !strcmp( psz_elname, "itunes:subtitle" ) ) - { - psz_item_subtitle = strdup( psz_text ); - } - else if( b_item == VLC_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 ); } +#undef SET_DATA + /* toplevel meta data */ - else if( b_item == VLC_FALSE && b_image == VLC_FALSE - && !strcmp( psz_elname, "title" ) ) - { - playlist_ItemSetName( p_current, psz_text ); - } - else if( b_item == VLC_FALSE && b_image == VLC_FALSE - && !strcmp( psz_elname, "link" ) ) + else if( b_image == false ) { - vlc_input_item_AddInfo( p_current->p_input, - _( "Podcast Info" ), - _( "Podcast Link" ), - "%s", - psz_text ); - } - else if( b_item == VLC_FALSE && b_image == VLC_FALSE - && !strcmp( psz_elname, "copyright" ) ) - { - vlc_input_item_AddInfo( p_current->p_input, - _( "Podcast Info" ), - _( "Podcast Copyright" ), - "%s", - psz_text ); - } - else if( b_item == VLC_FALSE && b_image == VLC_FALSE - && !strcmp( psz_elname, "itunes:category" ) ) - { - vlc_input_item_AddInfo( p_current->p_input, - _( "Podcast Info" ), - _( "Podcast Category" ), - "%s", - psz_text ); - } - else if( b_item == VLC_FALSE && b_image == VLC_FALSE - && !strcmp( psz_elname, "itunes:keywords" ) ) - { - vlc_input_item_AddInfo( p_current->p_input, - _( "Podcast Info" ), - _( "Podcast Keywords" ), - "%s", - psz_text ); - } - else if( b_item == VLC_FALSE && b_image == VLC_FALSE - && !strcmp( psz_elname, "itunes:subtitle" ) ) - { - vlc_input_item_AddInfo( p_current->p_input, - _( "Podcast Info" ), - _( "Podcast Subtitle" ), - "%s", - psz_text ); - } - else if( b_item == VLC_FALSE && b_image == VLC_FALSE - && ( !strcmp( psz_elname, "itunes:summary" ) - ||!strcmp( psz_elname, "description" ) ) ) - { /* isn't standard iTunes podcast stuff */ - vlc_input_item_AddInfo( p_current->p_input, - _( "Podcast Info" ), - _( "Podcast Summary" ), - "%s", - psz_text ); + if( !strcmp( psz_elname, "title" ) ) + { + input_item_SetName( p_current_input, psz_text ); + } +#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" ) +#undef ADD_GINFO + 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 @@ -336,111 +285,66 @@ 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" ) ) { - p_input = input_ItemNewExt( p_playlist, psz_item_mrl, - psz_item_name, 0, NULL, -1 ); - if( p_input == NULL ) break; - if( psz_item_date ) - { - vlc_input_item_AddInfo( p_input, - _( "Podcast Info" ), - _( "Podcast Publication Date" ), - "%s", - psz_item_date ); - } - if( psz_item_author ) + if( psz_item_mrl == NULL ) { - vlc_input_item_AddInfo( p_input, - _( "Podcast Info" ), - _( "Podcast Author" ), - "%s", - psz_item_author ); - } - if( psz_item_category ) - { - vlc_input_item_AddInfo( p_input, - _( "Podcast Info" ), - _( "Podcast Subcategory" ), - "%s", - psz_item_category ); + 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 + + /* Set the duration if available */ if( psz_item_duration ) - { - vlc_input_item_AddInfo( p_input, - _( "Podcast Info" ), - _( "Podcast Duration" ), - "%s", - psz_item_duration ); - } - if( psz_item_keywords ) - { - vlc_input_item_AddInfo( p_input, - _( "Podcast Info" ), - _( "Podcast Keywords" ), - "%s", - psz_item_keywords ); - } - if( psz_item_subtitle ) - { - vlc_input_item_AddInfo( p_input, - _( "Podcast Info" ), - _( "Podcast Subtitle" ), - "%s", - psz_item_subtitle ); - } - if( psz_item_summary ) - { - vlc_input_item_AddInfo( p_input, - _( "Podcast Info" ), - _( "Podcast Summary" ), - "%s", - psz_item_summary ); - } + 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 ) { - vlc_input_item_AddInfo( p_input, + input_item_AddInfo( p_input, _( "Podcast Info" ), _( "Podcast Size" ), - "%s bytes", + _("%s bytes"), psz_item_size ); } - if( psz_item_type ) - { - vlc_input_item_AddInfo( p_input, - _( "Podcast Info" ), - _( "Podcast Type" ), - "%s", - psz_item_type ); - } - - fprintf( stderr, "Adding WHEREVER\n"); - playlist_AddWhereverNeeded( p_playlist, p_input, p_current, - p_item_in_category, (i_parent_id > 0 ) ? VLC_TRUE: - VLC_FALSE, PLAYLIST_APPEND ); -#define FREE(a) if( a ) free( a ); a = NULL; - 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 ); -#undef FREE - - b_item = VLC_FALSE; + 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" ) ) { - b_image = VLC_FALSE; + b_image = false; } free( psz_elname ); - psz_elname = strdup(""); + psz_elname = strdup( "" ); break; } @@ -452,11 +356,55 @@ static int Demux( demux_t *p_demux ) msg_Warn( p_demux, "error while parsing data" ); } - HANDLE_PLAY_AND_RELEASE; - return VLC_SUCCESS; + free( psz_art_url ); + free( psz_elname ); + xml_ReaderDelete( p_xml_reader ); + + 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 ) { + 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; + } +}