* \file modules/misc/playlist/xspf.c
* \brief XSPF playlist export functions
*/
-#include <stdio.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_input.h>
#include <vlc_meta.h>
#include <vlc_strings.h>
+#include <vlc_url.h>
#include <vlc_charset.h>
#include "xspf.h"
+#include <assert.h>
+
/**
* \brief Prints the XSPF header to file, writes each item by xspf_export_item()
* and closes the open xml elements
* \param p_this the VLC playlist object
* \return VLC_SUCCESS if some memory is available, otherwise VLC_ENONMEM
*/
-int E_(xspf_export_playlist)( vlc_object_t *p_this )
+int xspf_export_playlist( vlc_object_t *p_this )
{
const playlist_t *p_playlist = (playlist_t *)p_this;
const playlist_export_t *p_export =
if( psz_temp && *psz_temp )
{
fprintf( p_export->p_file, "\t<location>%s</location>\n", psz_temp );
- free( psz_temp );
}
+ free( psz_temp );
/* export all items in a flat format */
fprintf( p_export->p_file, "\t<trackList>\n" );
fprintf( p_export->p_file, "\t</trackList>\n" );
/* export the tree structure in <extension> */
- fprintf( p_export->p_file, "\t<extension>\n" );
+ fprintf( p_export->p_file, "\t<extension application=\"http://www.videolan.org/vlc/playlist/0\">\n" );
i_count = 0;
for( i = 0; i < p_node->i_children; i++ )
{
{
char *psz;
char *psz_temp;
+ int i;
+ mtime_t i_duration;
if( !p_item ) return;
( *p_i_count )++;
/* -> the location */
- if( p_item->p_input->psz_uri && *p_item->p_input->psz_uri )
+
+ char *psz_uri = input_item_GetURI( p_item->p_input );
+
+ if( psz_uri && *psz_uri )
{
- psz = assertUTF8URI( p_item->p_input->psz_uri );
+ psz = assertUTF8URI( psz_uri );
fprintf( p_file, "\t\t\t<location>%s</location>\n", psz );
free( psz );
}
/* -> the name/title (only if different from uri)*/
- if( p_item->p_input->psz_name &&
- p_item->p_input->psz_uri &&
- strcmp( p_item->p_input->psz_uri, p_item->p_input->psz_name ) )
+ char *psz_name = input_item_GetTitle( p_item->p_input );
+ if( psz_name && psz_uri && strcmp( psz_uri, psz_name ) )
{
- psz_temp = convert_xml_special_chars( p_item->p_input->psz_name );
+ psz_temp = convert_xml_special_chars( psz_name );
if( *psz_temp )
fprintf( p_file, "\t\t\t<title>%s</title>\n", psz_temp );
free( psz_temp );
}
+ free( psz_name );
+ free( psz_uri );
if( p_item->p_input->p_meta == NULL )
{
/* -> the track number */
psz = input_item_GetTrackNum( p_item->p_input );
if( psz == NULL ) psz = strdup( "" );
- if( psz )
+ if( psz && *psz )
{
- if( *psz )
- {
- fprintf( p_file, "\t\t\t<trackNum>%i</trackNum>\n", atoi( psz ) );
- }
+ int i_tracknum = atoi( psz );
+ if( i_tracknum > 0 )
+ fprintf( p_file, "\t\t\t<trackNum>%i</trackNum>\n", i_tracknum );
}
free( psz );
}
free( psz_temp );
+ psz = input_item_GetArtURL( p_item->p_input );
+ if( psz == NULL ) psz = strdup( "" );
+ if( !EMPTY_STR( psz ) )
+ {
+ psz_uri = assertUTF8URI( psz );
+ fprintf( p_file, "\t\t\t<image>%s</image>\n", psz_uri );
+ free( psz_uri );
+ }
+ free( psz );
+
+ /* export the input's options (bookmarks, ...) in <extension> */
+ fprintf( p_file, "\t\t\t<extension application=\"http://www.videolan.org/vlc/playlist/0\">\n" );
+ for( i = 0; i < p_item->p_input->i_options; i++ )
+ {
+ fprintf( p_file, "\t\t\t\t<option>%s</option>\n",
+ p_item->p_input->ppsz_options[i][0] == ':' ?
+ p_item->p_input->ppsz_options[i] + 1 :
+ p_item->p_input->ppsz_options[i] );
+ }
+ fprintf( p_file, "\t\t\t</extension>\n" );
+
xspfexportitem_end:
/* -> the duration */
- if( p_item->p_input->i_duration > 0 )
+ i_duration = input_item_GetDuration( p_item->p_input );
+ if( i_duration > 0 )
{
fprintf( p_file, "\t\t\t<duration>%ld</duration>\n",
- (long)(p_item->p_input->i_duration / 1000) );
+ (long)(i_duration / 1000) );
}
fprintf( p_file, "\t\t</track>\n" );
char *psz_temp;
psz_temp = convert_xml_special_chars( p_item->p_input->psz_name );
fprintf( p_file, "\t\t<node title=\"%s\">\n",
- *psz_temp ? p_item->p_input->psz_name : "" );
+ *psz_temp ? psz_temp : "" );
free( psz_temp );
for( i = 0; i < p_item->i_children; i++ )
{
char *psz_ret = NULL; /**< the new result buffer to return */
char *psz_s = NULL, *psz_d = NULL; /**< src & dest pointers for URI conversion */
- vlc_bool_t b_name_is_uri = VLC_FALSE;
+ bool b_uri_is_file = false; /**< we do additional %-encoding if the URI is a file:// one */
if( !psz_name || !*psz_name )
return NULL;
return NULL;
/** \todo check for a valid scheme part preceding the colon */
- if( strchr( psz_s, ':' ) )
+ size_t i_delim = strcspn( psz_s, ":" );
+ if( i_delim != strlen( psz_s ) )
{
- psz_d = psz_ret;
- b_name_is_uri = VLC_TRUE;
+ i_delim++; /* skip the ':' */
+ strncpy( psz_ret, psz_s, i_delim );
+ psz_d = psz_ret + i_delim;
+
+ if( !strncmp( psz_s, "file://", 7 ) )
+ b_uri_is_file = true;
+
+ psz_s += i_delim;
}
/* assume "file" scheme if no scheme-part is included */
else
{
strcpy( psz_ret, "file://" );
psz_d = psz_ret + 7;
+ b_uri_is_file = true;
}
while( *psz_s )
*psz_s == '>' ||
*psz_s == '&' ||
*psz_s == ' ' ||
- ( *psz_s == '%' && !b_name_is_uri ) )
+ *psz_s == '+' ||
+ *psz_s == '%' ||
+ ( b_uri_is_file && (
+ *psz_s == ':' ||
+ *psz_s == '"' ||
+ *psz_s == '?' ||
+ *psz_s == '#' ||
+ *psz_s == '[' ||
+ *psz_s == ']' ||
+ *psz_s == '@' )
+ )
+ )
{
*psz_d++ = '%';
*psz_d++ = hexchars[(*psz_s >> 4) & B00001111];
projects / vlc / blobdiff