* \file modules/misc/playlist/xspf.c
* \brief XSPF playlist export functions
*/
-#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 =
/* write XSPF XML header */
fprintf( p_export->p_file, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" );
fprintf( p_export->p_file,
- "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n" );
+ "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\" " \
+ "xmlns:vlc=\"http://www.videolan.org/vlc/playlist/ns/0/\">\n" );
if( !p_node ) return VLC_SUCCESS;
}
free( psz_temp );
- /* save location of the playlist node */
- psz_temp = assertUTF8URI( p_export->psz_filename );
- if( psz_temp && *psz_temp )
- {
- fprintf( p_export->p_file, "\t<location>%s</location>\n", psz_temp );
- free( psz_temp );
- }
-
/* export all items in a flat format */
fprintf( p_export->p_file, "\t<trackList>\n" );
i_count = 0;
fprintf( p_export->p_file, "\t</trackList>\n" );
/* export the tree structure in <extension> */
- fprintf( p_export->p_file, "\t<extension application=\"http://www.videolan.org/vlc/playlist/0\">\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;
/* leaves can be written directly */
fprintf( p_file, "\t\t<track>\n" );
- /* print identifier and increase the counter */
- fprintf( p_file, "\t\t\t<identifier>%i</identifier>\n", *p_i_count );
- ( *p_i_count )++;
-
/* -> the location */
char *psz_uri = input_item_GetURI( p_item->p_input );
(long)(i_duration / 1000) );
}
+ /* export the intenal id and the input's options (bookmarks, ...)
+ * in <extension> */
+ fprintf( p_file, "\t\t\t<extension application=\"" \
+ "http://www.videolan.org/vlc/playlist/0\">\n" );
+
+ /* print the id and increase the counter */
+ fprintf( p_file, "\t\t\t\t<vlc:id>%i</vlc:id>\n", *p_i_count );
+ ( *p_i_count )++;
+
+ for( i = 0; i < p_item->p_input->i_options; i++ )
+ {
+ fprintf( p_file, "\t\t\t\t<vlc:option>%s</vlc: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" );
+
fprintf( p_file, "\t\t</track>\n" );
return;
int i;
char *psz_temp;
psz_temp = convert_xml_special_chars( p_item->p_input->psz_name );
- fprintf( p_file, "\t\t<node title=\"%s\">\n",
+ fprintf( p_file, "\t\t<vlc:node title=\"%s\">\n",
*psz_temp ? psz_temp : "" );
free( psz_temp );
xspf_extension_item( p_item->pp_children[i], p_file, p_i_count );
}
- fprintf( p_file, "\t\t</node>\n" );
+ fprintf( p_file, "\t\t</vlc:node>\n" );
return;
}
/* print leaf and increase the counter */
- fprintf( p_file, "\t\t\t<item href=\"%i\" />\n", *p_i_count );
+ fprintf( p_file, "\t\t\t<vlc:item tid=\"%i\" />\n", *p_i_count );
( *p_i_count )++;
return;
{
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_uri_is_file = VLC_FALSE; /**< we do additional %-encoding if the URI is a file:// one */
+ bool b_uri_is_file = false; /**< we do additional %-encoding if the URI is a file:// one */
if( !psz_name || !*psz_name )
return NULL;
/* max. 3x for URI conversion (percent escaping) and
8 bytes for "file://" and NULL-termination */
- psz_ret = (char *)malloc( sizeof(char)*strlen(psz_name)*6*3+8 );
+ psz_ret = (char *)malloc( strlen(psz_name)*6*3+8 );
if( !psz_ret )
return NULL;
/** \todo check for a valid scheme part preceding the colon */
- size_t i_delim = strcspn( psz_s, ":" );
- if( i_delim != strlen( psz_s ) )
+ if( strstr( psz_s, "://") != NULL )
{
+ size_t i_delim = strcspn( psz_s, ":" );
i_delim++; /* skip the ':' */
strncpy( psz_ret, psz_s, i_delim );
psz_d = psz_ret + i_delim;
- psz_s += i_delim;
if( !strncmp( psz_s, "file://", 7 ) )
- b_uri_is_file = VLC_TRUE;
+ 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 = VLC_TRUE;
+ b_uri_is_file = true;
}
while( *psz_s )
*psz_s == '>' ||
*psz_s == '&' ||
*psz_s == ' ' ||
+ *psz_s == '+' ||
+ *psz_s == '%' ||
+ *psz_s == '\\' ||
( b_uri_is_file && (
*psz_s == ':' ||
*psz_s == '"' ||
*psz_s == '#' ||
*psz_s == '[' ||
*psz_s == ']' ||
- *psz_s == '@' ||
- *psz_s == '%' )
+ *psz_s == '@' )
)
)
{
}
*psz_d = '\0';
- return (char *)realloc( psz_ret, sizeof(char)*strlen( psz_ret ) + 1 );
+ return (char *)realloc( psz_ret, strlen( psz_ret ) + 1 );
}