podcast: fix gettext parsing (cannot rely on CPP)

[vlc] / modules / demux / playlist / podcast.c

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index 96d024291387e5fb570a1c5555294746c7a86d26..ba7c83a1b051aecd97ef01deac92375f26c6079d 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -73,7 +73,6 @@ static int Demux( demux_t *p_demux )
     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;
@@ -87,16 +86,14 @@ 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;
+    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;
 
@@ -127,6 +124,8 @@ static int Demux( demux_t *p_demux )
     }
     FREENULL( psz_elname );
 
+    p_subitems = input_item_node_Create( p_current_input );
+
     while( (i_ret = xml_ReaderRead( p_xml_reader )) == 1 )
     {
         // Get the node type
@@ -185,14 +184,14 @@ static int Demux( demux_t *p_demux )
                         }
                         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 );
                         }
                     }
                     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 );
                     }
@@ -202,6 +201,8 @@ static int Demux( demux_t *p_demux )
             }
             case XML_READER_TEXT:
             {
+                if(!psz_elname) break;
+
                 char *psz_text = xml_ReaderValue( p_xml_reader );
 
 #define SET_DATA( field, name )                 \
@@ -245,15 +246,13 @@ static int Demux( demux_t *p_demux )
                     }
 #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", 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" ) )
@@ -266,9 +265,17 @@ static int Demux( demux_t *p_demux )
                 }
                 else
                 {
-                    msg_Dbg( p_demux, "unhandled text in element '%s'",
-                              psz_elname );
-                    free( psz_text );
+                    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 );
+                    }
                 }
                 break;
             }
@@ -291,30 +298,33 @@ static int Demux( demux_t *p_demux )
                     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 );
@@ -346,11 +356,12 @@ 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, p_xml_reader );
-    xml_Delete( p_xml );
+    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:
@@ -365,13 +376,15 @@ error:
     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, p_xml_reader );
-    xml_Delete( p_xml );
+        xml_ReaderDelete( p_xml_reader );
+    if( p_subitems )
+        input_item_node_Delete( p_subitems );
 
-    HANDLE_PLAY_AND_RELEASE;
+    vlc_gc_decref(p_current_input);
     return -1;
 }