#include <vlc_common.h>
#include <vlc_playlist.h>
+#include <vlc_url.h>
+#include <vlc_arrays.h>
+#include <vlc_modules.h>
+
#include "input_internal.h"
#include "../playlist/art.h"
+struct vlc_meta_t
+{
+ char * ppsz_meta[VLC_META_TYPE_COUNT];
+
+ vlc_dictionary_t extra_tags;
+
+ int i_status;
+};
+
/* FIXME bad name convention */
-const char * input_MetaTypeToLocalizedString( vlc_meta_type_t meta_type )
+const char * vlc_meta_TypeToLocalizedString( vlc_meta_type_t meta_type )
{
switch( meta_type )
{
}
};
+
+/**
+ * vlc_meta contructor.
+ * vlc_meta_Delete() will free the returned pointer.
+ */
+vlc_meta_t *vlc_meta_New( void )
+{
+ vlc_meta_t *m = (vlc_meta_t*)malloc( sizeof(*m) );
+ if( !m )
+ return NULL;
+ memset( m->ppsz_meta, 0, sizeof(m->ppsz_meta) );
+ m->i_status = 0;
+ vlc_dictionary_init( &m->extra_tags, 0 );
+ return m;
+}
+
+/* Free a dictonary key allocated by strdup() in vlc_meta_AddExtra() */
+static void vlc_meta_FreeExtraKey( void *p_data, void *p_obj )
+{
+ VLC_UNUSED( p_obj );
+ free( p_data );
+}
+
+void vlc_meta_Delete( vlc_meta_t *m )
+{
+ int i;
+ for( i = 0; i < VLC_META_TYPE_COUNT ; i++ )
+ free( m->ppsz_meta[i] );
+ vlc_dictionary_clear( &m->extra_tags, vlc_meta_FreeExtraKey, NULL );
+ free( m );
+}
+
+/**
+ * vlc_meta has two kinds of meta, the one in a table, and the one in a
+ * dictionary.
+ * FIXME - Why don't we merge those two?
+ */
+
+void vlc_meta_Set( vlc_meta_t *p_meta, vlc_meta_type_t meta_type, const char *psz_val )
+{
+ free( p_meta->ppsz_meta[meta_type] );
+ p_meta->ppsz_meta[meta_type] = psz_val ? strdup( psz_val ) : NULL;
+}
+
+const char *vlc_meta_Get( const vlc_meta_t *p_meta, vlc_meta_type_t meta_type )
+{
+ return p_meta->ppsz_meta[meta_type];
+}
+
+void vlc_meta_AddExtra( vlc_meta_t *m, const char *psz_name, const char *psz_value )
+{
+ char *psz_oldvalue = (char *)vlc_dictionary_value_for_key( &m->extra_tags, psz_name );
+ if( psz_oldvalue != kVLCDictionaryNotFound )
+ vlc_dictionary_remove_value_for_key( &m->extra_tags, psz_name,
+ vlc_meta_FreeExtraKey, NULL );
+ vlc_dictionary_insert( &m->extra_tags, psz_name, strdup(psz_value) );
+}
+
+const char * vlc_meta_GetExtra( const vlc_meta_t *m, const char *psz_name )
+{
+ return (char *)vlc_dictionary_value_for_key(&m->extra_tags, psz_name);
+}
+
+unsigned vlc_meta_GetExtraCount( const vlc_meta_t *m )
+{
+ return vlc_dictionary_keys_count(&m->extra_tags);
+}
+
+char** vlc_meta_CopyExtraNames( const vlc_meta_t *m )
+{
+ return vlc_dictionary_all_keys(&m->extra_tags);
+}
+
+/**
+ * vlc_meta status (see vlc_meta_status_e)
+ */
+int vlc_meta_GetStatus( vlc_meta_t *m )
+{
+ return m->i_status;
+}
+
+void vlc_meta_SetStatus( vlc_meta_t *m, int status )
+{
+ m->i_status = status;
+}
+
+
+/**
+ * Merging meta
+ */
+void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
+{
+ char **ppsz_all_keys;
+ int i;
+
+ if( !dst || !src )
+ return;
+
+ for( i = 0; i < VLC_META_TYPE_COUNT; i++ )
+ {
+ if( src->ppsz_meta[i] )
+ {
+ free( dst->ppsz_meta[i] );
+ dst->ppsz_meta[i] = strdup( src->ppsz_meta[i] );
+ }
+ }
+
+ /* XXX: If speed up are needed, it is possible */
+ ppsz_all_keys = vlc_dictionary_all_keys( &src->extra_tags );
+ for( i = 0; ppsz_all_keys && ppsz_all_keys[i]; i++ )
+ {
+ /* Always try to remove the previous value */
+ vlc_dictionary_remove_value_for_key( &dst->extra_tags, ppsz_all_keys[i], vlc_meta_FreeExtraKey, NULL );
+
+ void *p_value = vlc_dictionary_value_for_key( &src->extra_tags, ppsz_all_keys[i] );
+ vlc_dictionary_insert( &dst->extra_tags, ppsz_all_keys[i], strdup( (const char*)p_value ) );
+ free( ppsz_all_keys[i] );
+ }
+ free( ppsz_all_keys );
+}
+
+
void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input )
{
input_item_t *p_item = p_input->p->p_item;
/* */
- const char *psz_arturl = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL );
+ char *psz_arturl = input_item_GetArtURL( p_item );
if( !psz_arturl || strncmp( psz_arturl, "attachment://", strlen("attachment://") ) )
{
msg_Err( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
+ free( psz_arturl );
return;
}
- playlist_t *p_playlist = pl_Hold( p_input );
- if( !p_playlist )
- return;
-
+ playlist_t *p_playlist = pl_Get( p_input );
if( input_item_IsArtFetched( p_item ) )
{
* condition */
msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
playlist_FindArtInCache( p_item );
- pl_Release( p_playlist );
- return;
+ goto exit;
}
/* */
input_attachment_t *p_attachment = NULL;
+
+ vlc_mutex_lock( &p_item->lock );
for( int i_idx = 0; i_idx < p_input->p->i_attachment; i_idx++ )
{
if( !strcmp( p_input->p->attachment[i_idx]->psz_name,
&psz_arturl[strlen("attachment://")] ) )
{
- p_attachment = p_input->p->attachment[i_idx];
+ p_attachment = vlc_input_attachment_Duplicate( p_input->p->attachment[i_idx] );
break;
}
}
+ vlc_mutex_unlock( &p_item->lock );
+
if( !p_attachment || p_attachment->i_data <= 0 )
{
+ if( p_attachment )
+ vlc_input_attachment_Delete( p_attachment );
msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
- pl_Release( p_playlist );
- return;
+ goto exit;
}
/* */
playlist_SaveArt( p_playlist, p_item,
p_attachment->p_data, p_attachment->i_data, psz_type );
- pl_Release( p_playlist );
+ vlc_input_attachment_Delete( p_attachment );
+
+exit:
+ free( psz_arturl );
}
+int input_item_WriteMeta( vlc_object_t *obj, input_item_t *p_item )
+{
+ meta_export_t *p_export =
+ vlc_custom_create( obj, sizeof( *p_export ), VLC_OBJECT_GENERIC,
+ "meta writer" );
+ if( p_export == NULL )
+ return VLC_ENOMEM;
+ vlc_object_attach( p_export, obj );
+ p_export->p_item = p_item;
+
+ int type;
+ vlc_mutex_lock( &p_item->lock );
+ type = p_item->i_type;
+ vlc_mutex_unlock( &p_item->lock );
+ if( type != ITEM_TYPE_FILE )
+ goto error;
+
+ char *psz_uri = input_item_GetURI( p_item );
+ p_export->psz_file = make_path( psz_uri );
+ if( p_export->psz_file == NULL )
+ msg_Err( p_export, "cannot write meta to remote media %s", psz_uri );
+ free( psz_uri );
+ if( p_export->psz_file == NULL )
+ goto error;
+
+ module_t *p_mod = module_need( p_export, "meta writer", NULL, false );
+ if( p_mod )
+ module_unneed( p_export, p_mod );
+ vlc_object_release( p_export );
+ return VLC_SUCCESS;
+
+error:
+ vlc_object_release( p_export );
+ return VLC_EGENERIC;
+}