* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc_meta.h>
-#include "vlc_playlist.h"
-#include "charset.h"
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-int input_FindArtInCache( vlc_object_t *p_parent, input_item_t *p_item );
+#include <vlc_common.h>
+#include <vlc_playlist.h>
+#include "input_internal.h"
+#include "../playlist/art.h"
-int __input_MetaFetch( vlc_object_t *p_parent, input_item_t *p_item )
+/* FIXME bad name convention */
+const char * input_MetaTypeToLocalizedString( vlc_meta_type_t meta_type )
{
- struct meta_engine_t *p_me;
- uint32_t i_mandatory = 0, i_optional = 0, i_meta;
- int i_policy;
-
- if( !p_item->p_meta ) return VLC_EGENERIC;
-
- i_policy = var_CreateGetInteger( p_parent, "album-art" );
-
- i_mandatory = VLC_META_ENGINE_TITLE
- | VLC_META_ENGINE_ARTIST;
- if( i_policy == ALBUM_ART_ALL )
- {
- i_mandatory |= VLC_META_ENGINE_ART_URL;
- }
- else
+ switch( meta_type )
{
- i_optional |= VLC_META_ENGINE_ART_URL;
+ 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();
}
+};
- input_FindArtInCache( p_parent, p_item );
-
- i_meta = input_GetMetaEngineFlags( p_item->p_meta );
- i_mandatory &= ~i_meta;
- i_optional &= ~i_meta;
-
- if( !i_mandatory ) return VLC_SUCCESS;
-
- p_me = vlc_object_create( p_parent, VLC_OBJECT_META_ENGINE );
- p_me->i_flags |= OBJECT_FLAGS_NOINTERACT;
- p_me->i_mandatory = i_mandatory;
- p_me->i_optional = i_optional;
+void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input )
+{
+ input_item_t *p_item = p_input->p->p_item;
- p_me->p_item = p_item;
- p_me->p_module = module_Need( p_me, "meta fetcher", 0, VLC_FALSE );
- vlc_object_attach( p_me, p_parent );
- if( !p_me->p_module )
+ /* */
+ char *psz_arturl = input_item_GetArtURL( p_item );
+ if( !psz_arturl || strncmp( psz_arturl, "attachment://", strlen("attachment://") ) )
{
- msg_Err( p_parent, "no suitable meta fetcher module" );
- vlc_object_detach( p_me );
- vlc_object_destroy( p_me );
- return VLC_EGENERIC;
+ msg_Err( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
+ free( psz_arturl );
+ return;
}
- module_Unneed( p_me, p_me->p_module );
-
- vlc_object_detach( p_me );
- vlc_object_destroy( p_me );
-
- return VLC_SUCCESS;
-}
-
-int __input_ArtFetch( vlc_object_t *p_parent, input_item_t *p_item )
-{
- if( !p_item->p_meta )
- return VLC_EGENERIC;
-
- /* TODO: call art fetcher modules */
-
- if( !p_item->p_meta->psz_arturl || !*p_item->p_meta->psz_arturl )
- return VLC_EGENERIC;
-
- if( strncmp( "file://", p_item->p_meta->psz_arturl, 7 ) )
+ playlist_t *p_playlist = pl_Hold( p_input );
+ if( !p_playlist )
{
- return input_DownloadAndCacheArt( p_parent, p_item );
+ free( psz_arturl );
+ return;
}
- return VLC_SUCCESS;
-}
-#ifndef MAX_PATH
-# define MAX_PATH 250
-#endif
-int input_FindArtInCache( vlc_object_t *p_parent, input_item_t *p_item )
-{
- char *psz_artist;
- char *psz_album;
- char psz_filename[MAX_PATH];
- int i;
- struct stat a;
- const char *ppsz_type[] = { ".jpg", ".png", ".gif", ".bmp", "" };
- if( !p_item->p_meta ) return VLC_EGENERIC;
+ 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" );
+ playlist_FindArtInCache( p_item );
+ goto exit;
+ }
- psz_artist = p_item->p_meta->psz_artist;
- psz_album = p_item->p_meta->psz_album;
+ /* */
+ input_attachment_t *p_attachment = NULL;
- for( i = 0; i < 5; i++ )
+ vlc_mutex_lock( &p_item->lock );
+ for( int i_idx = 0; i_idx < p_input->p->i_attachment; i_idx++ )
{
- 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_parent->p_libvlc->psz_homedir,
- psz_artist, psz_album, ppsz_type[i] );
-
- /* Check if file exists */
- if( utf8_stat( psz_filename+7, &a ) == 0 )
+ if( !strcmp( p_input->p->attachment[i_idx]->psz_name,
+ &psz_arturl[strlen("attachment://")] ) )
{
- msg_Dbg( p_parent, "album art %s already exists in cache"
- , psz_filename );
- vlc_meta_SetArtURL( p_item->p_meta, psz_filename );
- return VLC_SUCCESS;
+ p_attachment = vlc_input_attachment_Duplicate( p_input->p->attachment[i_idx] );
+ break;
}
}
+ vlc_mutex_unlock( &p_item->lock );
- /* Use a art finder module to find the URL */
- 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( vlc_object_t *p_parent, input_item_t *p_item )
-{
- int i_status = VLC_EGENERIC;
- stream_t *p_stream;
- char psz_filename[MAX_PATH], psz_dir[MAX_PATH];
- char *psz_artist;
- char *psz_album;
- char *psz_type;
- psz_artist = p_item->p_meta->psz_artist;
- psz_album = p_item->p_meta->psz_album;
-
- /* You dummy ! How am I supposed to download NULL ? */
- if( !p_item->p_meta || !p_item->p_meta->psz_arturl
- || !*p_item->p_meta->psz_arturl )
- return VLC_EGENERIC;
-
- psz_type = strrchr( p_item->p_meta->psz_arturl, '.' );
-
- /* Todo: get a helper to do this */
- 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_parent->p_libvlc->psz_homedir,
- psz_artist, psz_album, psz_type );
-
- snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR,
- p_parent->p_libvlc->psz_homedir );
- utf8_mkdir( psz_dir );
- snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP "art",
- p_parent->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_parent->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_parent->p_libvlc->psz_homedir,
- psz_artist, psz_album );
- utf8_mkdir( psz_dir );
-
- /* Todo: check for stuff that needs a downloader module */
- p_stream = stream_UrlNew( p_parent, p_item->p_meta->psz_arturl );
-
- if( p_stream )
+ if( !p_attachment || p_attachment->i_data <= 0 )
{
- void *p_buffer = malloc( 1<<16 );
- long int l_read;
- FILE *p_file = utf8_fopen( psz_filename+7, "w" );
- while( ( l_read = stream_Read( p_stream, p_buffer, 1<<16 ) ) )
- {
- fwrite( p_buffer, l_read, 1, p_file );
- }
- free( p_buffer );
- fclose( p_file );
- stream_Delete( p_stream );
- msg_Dbg( p_parent, "Album art saved to %s\n", psz_filename );
- free( p_item->p_meta->psz_arturl );
- p_item->p_meta->psz_arturl = strdup( psz_filename );
- i_status = VLC_SUCCESS;
+ if( p_attachment )
+ vlc_input_attachment_Delete( p_attachment );
+ msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
+ goto exit;
}
- return i_status;
-}
-uint32_t input_GetMetaEngineFlags( 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( author, AUTHOR )
- CHECK( artist, ARTIST )
- CHECK( genre, GENRE )
- CHECK( copyright, COPYRIGHT )
- CHECK( album, COLLECTION )
- CHECK( tracknum, SEQ_NUM )
- CHECK( description, DESCRIPTION )
- CHECK( rating, RATING )
- CHECK( date, DATE )
- CHECK( url, URL )
- CHECK( language, LANGUAGE )
- CHECK( arturl, ART_URL )
-
- return i_meta;
+ /* */
+ 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";
+
+ /* */
+ playlist_SaveArt( p_playlist, p_item,
+ p_attachment->p_data, p_attachment->i_data, psz_type );
+
+ vlc_input_attachment_Delete( p_attachment );
+
+exit:
+ pl_Release( p_input );
+ free( psz_arturl );
}
+
projects / vlc / blobdiff