/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <assert.h>
/* Needed by str_format_time */
void unescape_URI( char *psz )
{
unsigned char *in = (unsigned char *)psz, *out = in, c;
+ if( psz == NULL )
+ return;
while( ( c = *in++ ) != '\0' )
{
void decode_URI( char *psz )
{
unsigned char *in = (unsigned char *)psz, *out = in, c;
+ if( psz == NULL )
+ return;
while( ( c = *in++ ) != '\0' )
{
return strdup( psz_enc );
}
+static const struct xml_entity_s
+{
+ char psz_entity[9];
+ uint8_t i_length;
+ char psz_char[4];
+} p_xml_entities[] = {
+ /* Important: this list has to be in alphabetical order (psz_entity-wise) */
+ { "Æ", 7, "Æ" },
+ { "Á", 8, "Á" },
+ { "Â", 7, "Â" },
+ { "À", 8, "À" },
+ { "Å", 7, "Å" },
+ { "Ã", 8, "Ã" },
+ { "Ä", 6, "Ä" },
+ { "Ç", 8, "Ç" },
+ { "‡", 8, "‡" },
+ { "Ð", 5, "Ð" },
+ { "É", 8, "É" },
+ { "Ê", 7, "Ê" },
+ { "È", 8, "È" },
+ { "Ë", 6, "Ë" },
+ { "Í", 8, "Í" },
+ { "Î", 7, "Î" },
+ { "Ì", 8, "Ì" },
+ { "Ï", 6, "Ï" },
+ { "Ñ", 8, "Ñ" },
+ { "Œ", 7, "Œ" },
+ { "Ó", 8, "Ó" },
+ { "Ô", 7, "Ô" },
+ { "Ò", 8, "Ò" },
+ { "Ø", 8, "Ø" },
+ { "Õ", 8, "Õ" },
+ { "Ö", 6, "Ö" },
+ { "Š", 8, "Š" },
+ { "Þ", 7, "Þ" },
+ { "Ú", 8, "Ú" },
+ { "Û", 7, "Û" },
+ { "Ù", 8, "Ù" },
+ { "Ü", 6, "Ü" },
+ { "Ý", 8, "Ý" },
+ { "Ÿ", 6, "Ÿ" },
+ { "á", 8, "á" },
+ { "â", 7, "â" },
+ { "´", 7, "´" },
+ { "æ", 7, "æ" },
+ { "à", 8, "à" },
+ { "å", 7, "å" },
+ { "ã", 8, "ã" },
+ { "ä", 6, "ä" },
+ { "„", 7, "„" },
+ { "¦", 8, "¦" },
+ { "ç", 8, "ç" },
+ { "¸", 7, "¸" },
+ { "¢", 6, "¢" },
+ { "ˆ", 6, "ˆ" },
+ { "©", 6, "©" },
+ { "¤", 8, "¤" },
+ { "†", 8, "†" },
+ { "°", 5, "°" },
+ { "÷", 8, "÷" },
+ { "é", 8, "é" },
+ { "ê", 7, "ê" },
+ { "è", 8, "è" },
+ { "ð", 5, "ð" },
+ { "ë", 6, "ë" },
+ { "€", 6, "€" },
+ { "½", 8, "½" },
+ { "¼", 8, "¼" },
+ { "¾", 8, "¾" },
+ { "…", 8, "…" },
+ { "í", 8, "í" },
+ { "î", 7, "î" },
+ { "¡", 7, "¡" },
+ { "ì", 8, "ì" },
+ { "¿", 8, "¿" },
+ { "ï", 6, "ï" },
+ { "«", 7, "«" },
+ { "“", 7, "“" },
+ { "‹", 8, "‹" },
+ { "‘", 7, "‘" },
+ { "¯", 6, "¯" },
+ { "—", 7, "—" },
+ { "µ", 7, "µ" },
+ { "·", 8, "·" },
+ { "–", 7, "–" },
+ { "¬", 5, "¬" },
+ { "ñ", 8, "ñ" },
+ { "ó", 8, "ó" },
+ { "ô", 7, "ô" },
+ { "œ", 7, "œ" },
+ { "ò", 8, "ò" },
+ { "ª", 6, "ª" },
+ { "º", 6, "º" },
+ { "ø", 8, "ø" },
+ { "õ", 8, "õ" },
+ { "ö", 6, "ö" },
+ { "¶", 6, "¶" },
+ { "‰", 8, "‰" },
+ { "±", 8, "±" },
+ { "£", 7, "£" },
+ { "»", 7, "»" },
+ { "”", 7, "”" },
+ { "®", 5, "®" },
+ { "›", 8, "›" },
+ { "’", 7, "’" },
+ { "‚", 7, "‚" },
+ { "š", 8, "š" },
+ { "§", 6, "§" },
+ { "­", 5, "" },
+ { "¹", 6, "¹" },
+ { "²", 6, "²" },
+ { "³", 6, "³" },
+ { "ß", 7, "ß" },
+ { "þ", 7, "þ" },
+ { "˜", 7, "˜" },
+ { "×", 7, "×" },
+ { "™", 7, "™" },
+ { "ú", 8, "ú" },
+ { "û", 7, "û" },
+ { "ù", 8, "ù" },
+ { "¨", 5, "¨" },
+ { "ü", 6, "ü" },
+ { "ý", 8, "ý" },
+ { "¥", 5, "¥" },
+ { "ÿ", 6, "ÿ" },
+};
+
/**
* Converts "<", ">" and "&" to "<", ">" and "&"
* \param string to convert
while ( *psz_value )
{
- if( !strncmp( psz_value, "<", 4 ) )
- {
- *p_pos = '<';
- psz_value += 4;
- }
- else if( !strncmp( psz_value, ">", 4 ) )
- {
- *p_pos = '>';
- psz_value += 4;
- }
- else if( !strncmp( psz_value, "&", 5 ) )
- {
- *p_pos = '&';
- psz_value += 5;
- }
- else if( !strncmp( psz_value, """, 6 ) )
- {
- *p_pos = '\"';
- psz_value += 6;
- }
- else if( !strncmp( psz_value, "'", 6 ) )
+ if( *psz_value == '&' )
{
- *p_pos = '\'';
- psz_value += 6;
+#define TRY_CHAR( src, len, dst ) \
+ if( !strncmp( psz_value, src, len ) ) \
+ { \
+ *p_pos = dst; \
+ psz_value += len; \
+ }
+ TRY_CHAR( "<", 4, '<' )
+ else TRY_CHAR( "&", 5, '&' )
+ else TRY_CHAR( "'", 6, '\'' )
+ else TRY_CHAR( ">", 4, '>' )
+ else TRY_CHAR( """, 6, '"' )
+#undef TRY_CHAR
+ else if( psz_value[1] == '#' )
+ {
+ char *psz_end;
+ int i = strtol( psz_value+2, &psz_end, 10 );
+ if( *psz_end == ';' )
+ {
+ if( i >= 32 && i <= 126 )
+ {
+ *p_pos = (char)i;
+ psz_value = psz_end+1;
+ }
+ else
+ {
+ /* Unhandled code, FIXME */
+ *p_pos = *psz_value;
+ psz_value++;
+ }
+ }
+ else
+ {
+ /* Invalid entity number */
+ *p_pos = *psz_value;
+ psz_value++;
+ }
+ }
+ else
+ {
+ const size_t i_entities = sizeof( p_xml_entities ) /
+ sizeof( p_xml_entities[0] );
+ assert( i_entities < 128 );
+ size_t step = 128>>1;
+ size_t i = step-1;
+ int cmp = -1;
+ while( step )
+ {
+ step >>= 1;
+ if( i >= i_entities )
+ cmp = -1;
+ else
+ cmp = strncmp( psz_value, p_xml_entities[i].psz_entity,
+ p_xml_entities[i].i_length );
+ if( cmp == 0 )
+ {
+ strncpy( p_pos, p_xml_entities[i].psz_char,
+ p_xml_entities[i].i_length );
+ p_pos += strlen( p_xml_entities[i].psz_char ) - 1;
+ psz_value += p_xml_entities[i].i_length;
+ break;
+ }
+ else if( cmp < 0 )
+ i -= step;
+ else
+ i += step;
+ }
+ if( cmp != 0 )
+ {
+ *p_pos = *psz_value;
+ psz_value++;
+ }
+ }
}
else
{
return psz_temp;
}
+/* Base64 encoding */
+char *vlc_b64_encode_binary( const uint8_t *src, size_t i_src )
+{
+ static const char b64[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+ char *ret = malloc( ( i_src + 4 ) * 4 / 3 );
+ char *dst = ret;
+
+ if( dst == NULL )
+ return NULL;
+
+ while( i_src > 0 )
+ {
+ /* pops (up to) 3 bytes of input, push 4 bytes */
+ uint32_t v;
+
+ /* 1/3 -> 1/4 */
+ v = *src++ << 24;
+ *dst++ = b64[v >> 26];
+ v = v << 6;
+
+ /* 2/3 -> 2/4 */
+ if( i_src >= 2 )
+ v |= *src++ << 22;
+ *dst++ = b64[v >> 26];
+ v = v << 6;
+
+ /* 3/3 -> 3/4 */
+ if( i_src >= 3 )
+ v |= *src++ << 20; // 3/3
+ *dst++ = ( i_src >= 2 ) ? b64[v >> 26] : '='; // 3/4
+ v = v << 6;
+
+ /* -> 4/4 */
+ *dst++ = ( i_src >= 3 ) ? b64[v >> 26] : '='; // 4/4
+
+ if( i_src <= 3 )
+ break;
+ i_src -= 3;
+ }
+
+ *dst = '\0';
+
+ return ret;
+}
+
+char *vlc_b64_encode( const char *src )
+{
+ if( src )
+ return vlc_b64_encode_binary( (const uint8_t*)src, strlen(src) );
+ else
+ return vlc_b64_encode_binary( (const uint8_t*)"", 0 );
+}
+
+/* Base64 decoding */
+size_t vlc_b64_decode_binary_to_buffer( uint8_t *p_dst, size_t i_dst, const char *p_src )
+{
+ static const int b64[256] = {
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 00-0F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 10-1F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, /* 20-2F */
+ 52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1, /* 30-3F */
+ -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, /* 40-4F */
+ 15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1, /* 50-5F */
+ -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, /* 60-6F */
+ 41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1, /* 70-7F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 80-8F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 90-9F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* A0-AF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* B0-BF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* C0-CF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* D0-DF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* E0-EF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 /* F0-FF */
+ };
+ uint8_t *p_start = p_dst;
+ uint8_t *p = (uint8_t *)p_src;
+
+ int i_level;
+ int i_last;
+
+ for( i_level = 0, i_last = 0; (size_t)( p_dst - p_start ) < i_dst && *p != '\0'; p++ )
+ {
+ const int c = b64[(unsigned int)*p];
+ if( c == -1 )
+ continue;
+
+ switch( i_level )
+ {
+ case 0:
+ i_level++;
+ break;
+ case 1:
+ *p_dst++ = ( i_last << 2 ) | ( ( c >> 4)&0x03 );
+ i_level++;
+ break;
+ case 2:
+ *p_dst++ = ( ( i_last << 4 )&0xf0 ) | ( ( c >> 2 )&0x0f );
+ i_level++;
+ break;
+ case 3:
+ *p_dst++ = ( ( i_last &0x03 ) << 6 ) | c;
+ i_level = 0;
+ }
+ i_last = c;
+ }
+
+ return p_dst - p_start;
+}
+size_t vlc_b64_decode_binary( uint8_t **pp_dst, const char *psz_src )
+{
+ const int i_src = strlen( psz_src );
+ uint8_t *p_dst;
+
+ *pp_dst = p_dst = malloc( i_src );
+ if( !p_dst )
+ return 0;
+ return vlc_b64_decode_binary_to_buffer( p_dst, i_src, psz_src );
+}
+char *vlc_b64_decode( const char *psz_src )
+{
+ const int i_src = strlen( psz_src );
+ char *p_dst = malloc( i_src + 1 );
+ size_t i_dst;
+ if( !p_dst )
+ return NULL;
+
+ i_dst = vlc_b64_decode_binary_to_buffer( (uint8_t*)p_dst, i_src, psz_src );
+ p_dst[i_dst] = '\0';
+
+ return p_dst;
+}
+
/****************************************************************************
* String formating functions
****************************************************************************/
{
char buffer[255];
time_t curtime;
-#if defined(HAVE_LOCALTIME_R)
struct tm loctime;
-#else
- struct tm *loctime;
-#endif
/* Get the current time. */
curtime = time( NULL );
/* Convert it to local time representation. */
-#if defined(HAVE_LOCALTIME_R)
localtime_r( &curtime, &loctime );
strftime( buffer, 255, tformat, &loctime );
-#else
- loctime = localtime( &curtime );
- strftime( buffer, 255, tformat, loctime );
-#endif
return strdup( buffer );
}
-#define INSERT_STRING( check, string ) \
- if( check && string ) \
+#define INSERT_STRING( string ) \
+ if( string != NULL ) \
{ \
int len = strlen( string ); \
- dst = realloc( dst, \
- i_size = i_size + len + 1 ); \
- strncpy( d, string, len+1 ); \
+ dst = realloc( dst, i_size = i_size + len );\
+ memcpy( (dst+d), string, len ); \
d += len; \
+ free( string ); \
} \
- else \
+ else if( !b_empty_if_na ) \
{ \
- *d = '-'; \
+ *(dst+d) = '-'; \
d++; \
+ } \
+
+/* same than INSERT_STRING, except that string won't be freed */
+#define INSERT_STRING_NO_FREE( string ) \
+ { \
+ int len = strlen( string ); \
+ dst = realloc( dst, i_size = i_size + len );\
+ memcpy( dst+d, string, len ); \
+ d += len; \
}
char *__str_format_meta( vlc_object_t *p_object, const char *string )
{
const char *s = string;
- char *dst = malloc( 1000 );
- char *d = dst;
- int b_is_format = 0;
+ bool b_is_format = false;
+ bool b_empty_if_na = false;
char buf[10];
- int i_size = strlen( string );
+ int i_size = strlen( string ) + 1; /* +1 to store '\0' */
+ char *dst = strdup( string );
+ if( !dst ) return NULL;
+ int d = 0;
- playlist_t *p_playlist = pl_Yield( p_object );
- input_thread_t *p_input = p_playlist->p_input;
+ playlist_t *p_playlist = pl_Hold( p_object );
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
input_item_t *p_item = NULL;
pl_Release( p_object );
if( p_input )
{
- vlc_object_yield( p_input );
p_item = input_GetItem(p_input);
- if( p_item )
- vlc_mutex_lock( &p_item->lock );
}
- sprintf( dst, string );
-
while( *s )
{
if( b_is_format )
switch( *s )
{
case 'a':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_artist );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetArtist( p_item ) );
+ }
break;
case 'b':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_album );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetAlbum( p_item ) );
+ }
break;
case 'c':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_copyright );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetCopyright( p_item ) );
+ }
break;
case 'd':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_description );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetDescription( p_item ) );
+ }
break;
case 'e':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_encodedby );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetEncodedBy( p_item ) );
+ }
+ break;
+ case 'f':
+ if( p_item && p_item->p_stats )
+ {
+ snprintf( buf, 10, "%d",
+ p_item->p_stats->i_displayed_pictures );
+ }
+ else
+ {
+ sprintf( buf, b_empty_if_na ? "" : "-" );
+ }
+ INSERT_STRING_NO_FREE( buf );
break;
case 'g':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_genre );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetGenre( p_item ) );
+ }
break;
case 'l':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_language );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetLanguage( p_item ) );
+ }
break;
case 'n':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_tracknum );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetTrackNum( p_item ) );
+ }
break;
case 'p':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_nowplaying );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetNowPlaying( p_item ) );
+ }
break;
case 'r':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_rating );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetRating( p_item ) );
+ }
break;
case 's':
{
- char *lang;
+ char *lang = NULL;
if( p_input )
- {
- lang = var_GetString( p_input, "sub-language" );
- }
- else
- {
- lang = strdup( "-" );
- }
- INSERT_STRING( 1, lang );
- free( lang );
+ lang = var_GetNonEmptyString( p_input, "sub-language" );
+ if( lang == NULL )
+ lang = strdup( b_empty_if_na ? "" : "-" );
+ INSERT_STRING( lang );
break;
}
case 't':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_title );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetTitle( p_item ) );
+ }
break;
case 'u':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_url );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetURL( p_item ) );
+ }
break;
case 'A':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_date );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetDate( p_item ) );
+ }
break;
case 'B':
if( p_input )
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'C':
if( p_input )
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'D':
if( p_item )
{
+ mtime_t i_duration = input_item_GetDuration( p_item );
sprintf( buf, "%02d:%02d:%02d",
- (int)(p_item->i_duration/(3600000000)),
- (int)((p_item->i_duration/(60000000))%60),
- (int)((p_item->i_duration/1000000)%60) );
+ (int)(i_duration/(3600000000)),
+ (int)((i_duration/(60000000))%60),
+ (int)((i_duration/1000000)%60) );
}
else
{
- sprintf( buf, "--:--:--" );
+ sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'F':
- INSERT_STRING( p_item, p_item->psz_uri );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetURI( p_item ) );
+ }
break;
case 'I':
if( p_input )
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'L':
if( p_item && p_input )
{
+ mtime_t i_duration = input_item_GetDuration( p_item );
+ int64_t i_time = p_input->i_time;
sprintf( buf, "%02d:%02d:%02d",
- (int)((p_item->i_duration-p_input->i_time)/(3600000000)),
- (int)(((p_item->i_duration-p_input->i_time)/(60000000))%60),
- (int)(((p_item->i_duration-p_input->i_time)/1000000)%60) );
+ (int)( ( i_duration - i_time ) / 3600000000 ),
+ (int)( ( ( i_duration - i_time ) / 60000000 ) % 60 ),
+ (int)( ( ( i_duration - i_time ) / 1000000 ) % 60 ) );
}
else
{
- sprintf( buf, "--:--:--" );
+ sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'N':
- INSERT_STRING( p_item, p_item->psz_name );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetName( p_item ) );
+ }
break;
case 'O':
{
- char *lang;
+ char *lang = NULL;
if( p_input )
- {
- lang = var_GetString( p_input, "audio-language" );
- }
- else
- {
- lang = strdup( "-" );
- }
- INSERT_STRING( 1, lang );
- free( lang );
+ lang = var_GetNonEmptyString( p_input,
+ "audio-language" );
+ if( lang == NULL )
+ lang = strdup( b_empty_if_na ? "" : "-" );
+ INSERT_STRING( lang );
break;
}
case 'P':
}
else
{
- sprintf( buf, "--.-%%" );
+ sprintf( buf, b_empty_if_na ? "" : "--.-%%" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'R':
if( p_input )
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'S':
if( p_input )
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'T':
if( p_input )
{
sprintf( buf, "%02d:%02d:%02d",
- (int)(p_input->i_time/(3600000000)),
- (int)((p_input->i_time/(60000000))%60),
- (int)((p_input->i_time/1000000)%60) );
+ (int)( p_input->i_time / ( 3600000000 ) ),
+ (int)( ( p_input->i_time / ( 60000000 ) ) % 60 ),
+ (int)( ( p_input->i_time / 1000000 ) % 60 ) );
}
else
{
- sprintf( buf, "--:--:--" );
+ sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
}
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
case 'U':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_publisher );
+ if( p_item )
+ {
+ INSERT_STRING( input_item_GetPublisher( p_item ) );
+ }
break;
case 'V':
{
audio_volume_t volume;
aout_VolumeGet( p_object, &volume );
snprintf( buf, 10, "%d", volume );
- INSERT_STRING( 1, buf );
+ INSERT_STRING_NO_FREE( buf );
break;
}
case '_':
- *d = '\n';
+ *(dst+d) = '\n';
d++;
break;
+ case ' ':
+ b_empty_if_na = true;
+ break;
+
default:
- *d = *s;
+ *(dst+d) = *s;
d++;
break;
}
- b_is_format = 0;
+ if( *s != ' ' )
+ b_is_format = false;
}
else if( *s == '$' )
{
- b_is_format = 1;
+ b_is_format = true;
+ b_empty_if_na = false;
}
else
{
- *d = *s;
+ *(dst+d) = *s;
d++;
}
s++;
}
- *d = '\0';
+ *(dst+d) = '\0';
if( p_input )
- {
vlc_object_release( p_input );
- if( p_item )
- vlc_mutex_unlock( &p_item->lock );
- }
return dst;
}
+#undef INSERT_STRING
+#undef INSERT_STRING_NO_FREE
/**
* Apply str format time and str format meta
*/
void filename_sanitize( char *str )
{
+ if( *str == '.' && (str[1] == '\0' || (str[1] == '.' && str[2] == '\0' ) ) )
+ {
+ while( *str )
+ {
+ *str = '_';
+ str++;
+ }
+ return;
+ }
+
while( *str )
{
switch( *str )
{
case '/':
-#ifdef WIN32
+#if defined( __APPLE__ )
+ case ':':
+#elif defined( WIN32 )
+ case '\\':
case '*':
- case '.':
case '"':
- case '\\':
- case '[':
- case ']':
+ case '?':
case ':':
- case ';':
case '|':
- case '=':
+ case '<':
+ case '>':
#endif
*str = '_';
}
+ str++;
}
}
*/
void path_sanitize( char *str )
{
+#if 0
+ /*
+ * Uncomment the two blocks to prevent /../ or /./, i'm not sure that we
+ * want to.
+ */
+ char *prev = str - 1;
+#endif
+#ifdef WIN32
+ /* check drive prefix if path is absolute */
+ if( isalpha(*str) && (':' == *(str+1)) )
+ str += 2;
+#endif
while( *str )
{
+#if defined( __APPLE__ )
+ if( *str == ':' )
+ *str = '_';
+#elif defined( WIN32 )
switch( *str )
{
-#ifdef WIN32
case '*':
- case '.':
case '"':
- case '[':
- case ']':
+ case '?':
case ':':
- case ';':
case '|':
- case '=':
-#endif
+ case '<':
+ case '>':
*str = '_';
}
+#endif
+#if 0
+ if( *str == '/'
+#ifdef WIN32
+ || *str == '\\'
+#endif
+ )
+ {
+ if( str - prev == 2 && prev[1] == '.' )
+ {
+ prev[1] = '.';
+ }
+ else if( str - prev == 3 && prev[1] == '.' && prev[2] == '.' )
+ {
+ prev[1] = '_';
+ prev[2] = '_';
+ }
+ prev = str;
+ }
+#endif
+ str++;
}
}
projects / vlc / blobdiff