X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fmeta.c;h=ad97c296753d4eba7885cad125eba49b0c1cb568;hb=6d9c2bc2d6f40012f068725a117a54888b28e606;hp=6631fe05f697c9133e73d2aadd06644031fdc020;hpb=9d8ceda6aed25ef52d5d2ff5391199fcf84c2572;p=vlc diff --git a/src/input/meta.c b/src/input/meta.c index 6631fe05f6..ad97c29675 100644 --- a/src/input/meta.c +++ b/src/input/meta.c @@ -22,398 +22,110 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include "../playlist/playlist_internal.h" -#include - -#ifdef HAVE_SYS_STAT_H -# include -#endif - -// FIXME be sure to not touch p_meta without lock on p_item - -#define input_FindArtInCache(a,b) __input_FindArtInCache(VLC_OBJECT(a),b) -static int __input_FindArtInCache( vlc_object_t *, input_item_t *p_item ); - -vlc_bool_t input_MetaSatisfied( playlist_t *p_playlist, input_item_t *p_item, - uint32_t *pi_mandatory, uint32_t *pi_optional ) -{ - (void)p_playlist; - *pi_mandatory = VLC_META_ENGINE_TITLE | VLC_META_ENGINE_ARTIST; - assert( p_item->p_meta ); - - uint32_t i_meta = input_CurrentMetaFlags( p_item->p_meta ); - *pi_mandatory &= ~i_meta; - *pi_optional = 0; /// Todo - return *pi_mandatory ? VLC_FALSE:VLC_TRUE; -} - -int input_MetaFetch( playlist_t *p_playlist, input_item_t *p_item ) -{ - struct meta_engine_t *p_me; - uint32_t i_mandatory, i_optional; - - assert( p_item->p_meta ); - - input_MetaSatisfied( p_playlist, p_item, &i_mandatory, &i_optional ); - // Meta shouldn't magically appear - assert( i_mandatory ); - - /* FIXME: object creation is overkill, use p_private */ - p_me = vlc_object_create( p_playlist, VLC_OBJECT_META_ENGINE ); - p_me->i_flags |= OBJECT_FLAGS_NOINTERACT; - p_me->i_flags |= OBJECT_FLAGS_QUIET; - p_me->i_mandatory = i_mandatory; - p_me->i_optional = i_optional; - - p_me->p_item = p_item; - p_me->p_module = module_Need( p_me, "meta fetcher", 0, VLC_FALSE ); - if( !p_me->p_module ) - { - vlc_object_destroy( p_me ); - return VLC_EGENERIC; - } - module_Unneed( p_me, p_me->p_module ); - vlc_object_destroy( p_me ); - return VLC_SUCCESS; -} - -/* Return codes: - * 0 : Art is in cache - * 1 : Art found, need to download - * -X : Error/not found - */ -int input_ArtFind( playlist_t *p_playlist, input_item_t *p_item ) -{ - int i_ret = VLC_EGENERIC; - module_t *p_module; - if( !p_item->p_meta || !p_item->p_meta->psz_album || - !p_item->p_meta->psz_artist ) - return VLC_EGENERIC; - - /* If we already checked this album in this session, skip */ - FOREACH_ARRAY( playlist_album_t album, p_playlist->p_fetcher->albums ) - if( !strcmp( album.psz_artist, p_item->p_meta->psz_artist ) && - !strcmp( album.psz_album, p_item->p_meta->psz_album ) ) - { - msg_Dbg( p_playlist, " %s - %s has already been searched", - p_item->p_meta->psz_artist, p_item->p_meta->psz_album ); - /* TODO-fenrir if we cache art filename too, we can go faster */ - if( album.b_found ) - { - /* Actually get URL from cache */ - input_FindArtInCache( p_playlist, p_item ); - return 0; - } - else - { - return VLC_EGENERIC; - } - } - FOREACH_END(); - - input_FindArtInCache( p_playlist, p_item ); - if( !EMPTY_STR( p_item->p_meta->psz_arturl ) ) - return 0; - - PL_LOCK; - p_playlist->p_private = p_item; - msg_Dbg( p_playlist, "searching art for %s - %s", - p_item->p_meta->psz_artist, p_item->p_meta->psz_album ); - p_module = module_Need( p_playlist, "art finder", 0, VLC_FALSE ); - - if( p_module ) - i_ret = 1; - else - msg_Dbg( p_playlist, "unable to find art" ); - - /* Record this album */ - playlist_album_t a; - a.psz_artist = strdup( p_item->p_meta->psz_artist ); - a.psz_album = strdup( p_item->p_meta->psz_album ); - a.b_found = (i_ret == VLC_EGENERIC ? VLC_FALSE : VLC_TRUE ); - ARRAY_APPEND( p_playlist->p_fetcher->albums, a ); - - if( p_module ) - module_Unneed( p_playlist, p_module ); - p_playlist->p_private = NULL; - PL_UNLOCK; - - return i_ret; -} - -#ifndef MAX_PATH -# define MAX_PATH 250 +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#define ArtCacheCreateName( a,b,c,d,e) __ArtCacheCreateName(VLC_OBJECT(a),b,c,d,e) -static void __ArtCacheCreateName( vlc_object_t *p_obj, - char psz_filename[MAX_PATH+1], - const char *psz_artist, const char *psz_album, - const char *psz_extension ) -{ - snprintf( psz_filename, MAX_PATH, - "file://%s" DIR_SEP CONFIG_DIR DIR_SEP "art" - DIR_SEP "%s" DIR_SEP "%s" DIR_SEP "art%s", - p_obj->p_libvlc->psz_homedir, - psz_artist, psz_album, psz_extension ? psz_extension : "" ); -} -#define ArtCacheCreatePath(a,b,c) __ArtCacheCreatePath(VLC_OBJECT(a),b,c) -static void __ArtCacheCreatePath( vlc_object_t *p_obj, - const char *psz_artist, const char *psz_album ) -{ - char psz_dir[MAX_PATH+1]; - snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR, - p_obj->p_libvlc->psz_homedir ); - utf8_mkdir( psz_dir ); - snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP "art", - p_obj->p_libvlc->psz_homedir ); - utf8_mkdir( psz_dir ); - snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP - "art" DIR_SEP "%s", - p_obj->p_libvlc->psz_homedir, psz_artist ); - utf8_mkdir( psz_dir ); - snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP - "art" DIR_SEP "%s" DIR_SEP "%s", - p_obj->p_libvlc->psz_homedir, - psz_artist, psz_album ); - utf8_mkdir( psz_dir ); -} -static char *ArtCacheCreateString( const char *psz ) -{ - char *dup = strdup(psz); - int i; - /* Doesn't create a filename with invalid characters - * TODO: several filesystems forbid several characters: list them all - */ - for( i = 0; dup[i] != '\0'; i++ ) - { - if( dup[i] == '/' ) - dup[i] = ' '; - } - return dup; -} +#include +#include +#include "input_internal.h" +#include "../playlist/art.h" -static int __input_FindArtInCache( vlc_object_t *p_obj, input_item_t *p_item ) +/* FIXME bad name convention */ +const char * input_MetaTypeToLocalizedString( vlc_meta_type_t meta_type ) { - char *psz_artist; - char *psz_album; - char psz_filename[MAX_PATH+1]; - int i; - struct stat a; - const char *ppsz_type[] = { ".jpg", ".png", ".gif", ".bmp", "" }; - - if( !p_item->p_meta ) return VLC_EGENERIC; - - psz_artist = p_item->p_meta->psz_artist; - psz_album = p_item->p_meta->psz_album; - - for( i = 0; i < 5; i++ ) + switch( meta_type ) { - ArtCacheCreateName( p_obj, psz_filename, psz_artist, psz_album, ppsz_type[i] ); - - /* Check if file exists */ - if( utf8_stat( psz_filename+7, &a ) == 0 ) - { - vlc_meta_SetArtURL( p_item->p_meta, psz_filename ); - return VLC_SUCCESS; - } + case vlc_meta_Title: return _("Title"); + case vlc_meta_Artist: return _("Artist"); + case vlc_meta_Genre: return _("Genre"); + case vlc_meta_Copyright: return _("Copyright"); + case vlc_meta_Album: return _("Album"); + case vlc_meta_TrackNumber: return _("Track number"); + case vlc_meta_Description: return _("Description"); + case vlc_meta_Rating: return _("Rating"); + case vlc_meta_Date: return _("Date"); + case vlc_meta_Setting: return _("Setting"); + case vlc_meta_URL: return _("URL"); + case vlc_meta_Language: return _("Language"); + case vlc_meta_NowPlaying: return _("Now Playing"); + case vlc_meta_Publisher: return _("Publisher"); + case vlc_meta_EncodedBy: return _("Encoded by"); + case vlc_meta_ArtworkURL: return _("Artwork URL"); + case vlc_meta_TrackID: return _("Track ID"); + + default: abort(); } - return VLC_EGENERIC; -} +}; -/** - * Download the art using the URL or an art downloaded - * This function should be called only if data is not already in cache - */ -int input_DownloadAndCacheArt( playlist_t *p_playlist, input_item_t *p_item ) +void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input ) { - int i_status = VLC_EGENERIC; - stream_t *p_stream; - char psz_filename[MAX_PATH+1]; - char *psz_artist = NULL; - char *psz_album = NULL; - char *psz_type; - if( p_item->p_meta->psz_artist ) - psz_artist = ArtCacheCreateString( p_item->p_meta->psz_artist ); - if( p_item->p_meta->psz_album ) - psz_album = ArtCacheCreateString( p_item->p_meta->psz_album ); - - assert( p_item->p_meta && !EMPTY_STR(p_item->p_meta->psz_arturl) ); - - /* FIXME: use an alternate saving filename scheme if we don't have - * the artist or album name */ - if( !psz_artist || !psz_album ) - { - if( psz_artist ) free( psz_artist ); - if( psz_album ) free( psz_album ); - return VLC_EGENERIC; - } - - psz_type = strrchr( p_item->p_meta->psz_arturl, '.' ); - - /* */ - ArtCacheCreateName( p_playlist, psz_filename, psz_artist, psz_album, psz_type ); - - /* */ - ArtCacheCreatePath( p_playlist, psz_artist, psz_album ); + input_item_t *p_item = p_input->p->p_item; /* */ - free( psz_artist ); - free( psz_album ); - - if( !strncmp( p_item->p_meta->psz_arturl , "APIC", 4 ) ) + char *psz_arturl = input_item_GetArtURL( p_item ); + if( !psz_arturl || strncmp( psz_arturl, "attachment://", strlen("attachment://") ) ) { - msg_Warn( p_playlist, "APIC fetch not supported yet" ); - return VLC_EGENERIC; + msg_Err( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" ); + free( psz_arturl ); + return; } - p_stream = stream_UrlNew( p_playlist, p_item->p_meta->psz_arturl ); - if( p_stream ) + playlist_t *p_playlist = pl_Hold( p_input ); + if( !p_playlist ) { - uint8_t p_buffer[65536]; - long int l_read; - FILE *p_file = utf8_fopen( psz_filename+7, "w" ); - int err = 0; - while( ( l_read = stream_Read( p_stream, p_buffer, sizeof (p_buffer) ) ) ) - { - if( fwrite( p_buffer, l_read, 1, p_file ) != 1 ) - { - err = errno; - break; - } - } - if( fclose( p_file ) && !err ) - err = errno; - stream_Delete( p_stream ); - free( p_item->p_meta->psz_arturl ); - - if( err ) - msg_Err( p_playlist, "%s: %s", psz_filename, strerror( err ) ); - else - msg_Dbg( p_playlist, "album art saved to %s\n", psz_filename ); - - p_item->p_meta->psz_arturl = strdup( psz_filename ); - i_status = VLC_SUCCESS; - } - return i_status; -} - -void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input ) -{ - input_item_t *p_item = p_input->p->input.p_item; - char *psz_arturl; - char *psz_artist = NULL; - char *psz_album = NULL; - char *psz_type = NULL; - char psz_filename[MAX_PATH+1]; - FILE *f; - input_attachment_t *p_attachment; - struct stat s; - int i_idx; - - /* TODO-fenrir merge input_ArtFind with download and make it set the flags FETCH - * and then set it here to to be faster */ - - assert( p_item->p_meta ); - psz_arturl = p_item->p_meta->psz_arturl; - if( !psz_arturl || strncmp( psz_arturl, "attachment://", strlen("attachment://") ) ) - { - msg_Err( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" ); + free( psz_arturl ); return; } - p_item->p_meta->psz_arturl = NULL; - if( p_item->p_meta->i_status & ITEM_ART_FETCHED ) + + if( input_item_IsArtFetched( p_item ) ) { /* XXX Weird, we should not have end up with attachment:// art url unless there is a race * condition */ msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" ); - input_FindArtInCache( p_input, p_item ); - free( psz_arturl ); - return; + playlist_FindArtInCache( p_item ); + goto exit; } /* */ - for( i_idx = 0, p_attachment = NULL; i_idx < p_input->p->i_attachment; i_idx++ ) + 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" ); - goto end; + goto exit; } - if( p_item->p_meta->psz_artist ) - psz_artist = ArtCacheCreateString( p_item->p_meta->psz_artist ); - if( p_item->p_meta->psz_album ) - psz_album = ArtCacheCreateString( p_item->p_meta->psz_album ); - - if( !psz_artist || !psz_album ) - goto end; - /* */ - psz_type = strrchr( psz_arturl, '.' ); - ArtCacheCreateName( p_input, psz_filename, psz_artist, psz_album, psz_type ); + const char *psz_type = NULL; + if( !strcmp( p_attachment->psz_mime, "image/jpeg" ) ) + psz_type = ".jpg"; + else if( !strcmp( p_attachment->psz_mime, "image/png" ) ) + psz_type = ".png"; - /* Check if we already dumped it */ - if( !utf8_stat( psz_filename+7, &s ) ) - goto end; - - ArtCacheCreatePath( p_input, psz_artist, psz_album ); + /* */ + playlist_SaveArt( p_playlist, p_item, + p_attachment->p_data, p_attachment->i_data, psz_type ); - f = utf8_fopen( psz_filename+7, "w" ); - if( f ) - { - if( fwrite( p_attachment->p_data, p_attachment->i_data, 1, f ) != 1 ) - msg_Err( p_input, "%s: %s", psz_filename, strerror( errno ) ); - else - msg_Dbg( p_input, "album art saved to %s\n", psz_filename ); - fclose( f ); - } + vlc_input_attachment_Delete( p_attachment ); -end: - if( psz_artist ) free( psz_artist ); - if( psz_album ) free( psz_album ); - if( psz_arturl ) free( psz_arturl ); +exit: + pl_Release( p_input ); + free( psz_arturl ); } - -uint32_t input_CurrentMetaFlags( vlc_meta_t *p_meta ) -{ - uint32_t i_meta = 0; - -#define CHECK( a, b ) \ - if( p_meta->psz_ ## a && *p_meta->psz_ ## a ) \ - i_meta |= VLC_META_ENGINE_ ## b; - - CHECK( title, TITLE ) - CHECK( artist, ARTIST ) - CHECK( album, COLLECTION ) -#if 0 - /* As this is not used at the moment, don't uselessly check for it. - * Re-enable this when it is used */ - CHECK( genre, GENRE ) - CHECK( copyright, COPYRIGHT ) - CHECK( tracknum, SEQ_NUM ) - CHECK( description, DESCRIPTION ) - CHECK( rating, RATING ) - CHECK( date, DATE ) - CHECK( url, URL ) - CHECK( language, LANGUAGE ) -#endif - CHECK( arturl, ART_URL ) - - return i_meta; -}