]> git.sesse.net Git - vlc/blobdiff - src/input/meta.c
Include assert.h when needed
[vlc] / src / input / meta.c
index 00673013394e11a6d5103cf8e45b39e99bb7e21c..3655b6f8e9df858192c4a454b639fc46f1a3d0dc 100644 (file)
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_input.h>
+#include <vlc_stream.h>
 #include <vlc_meta.h>
-#include "vlc_playlist.h"
-#include "charset.h"
+#include <vlc_playlist.h>
+#include <vlc_charset.h>
+#include <vlc_strings.h>
 #include "../playlist/playlist_internal.h"
+#include <errno.h>
+#include <limits.h>                                             /* PATH_MAX */
+#include <assert.h>
 
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
 
-int input_FindArtInCache( playlist_t *p_playlist, input_item_t *p_item );
+static const char * meta_type_to_string[VLC_META_TYPE_COUNT] =
+{
+    [vlc_meta_Title]            = N_("Title"),
+    [vlc_meta_Artist]           = N_("Artist"),
+    [vlc_meta_Genre]            = N_("Genre"),
+    [vlc_meta_Copyright]        = N_("Copyright"),
+    [vlc_meta_Album]            = N_("Album"),
+    [vlc_meta_TrackNumber]      = N_("Track number"),
+    [vlc_meta_Description]      = N_("Description"),
+    [vlc_meta_Rating]           = N_("Rating"),
+    [vlc_meta_Date]             = N_("Date"),
+    [vlc_meta_Setting]          = N_("Setting"),
+    [vlc_meta_URL]              = N_("URL"),
+    [vlc_meta_Language]         = N_("Language"),
+    [vlc_meta_NowPlaying]       = N_("Now Playing"),
+    [vlc_meta_Publisher]        = N_("Publisher"),
+    [vlc_meta_EncodedBy]        = N_("Encoded by"),
+    [vlc_meta_ArtworkURL]       = N_("Artwork URL"),
+    [vlc_meta_TrackID]          = N_("Track ID"),
+};
+
+const char *
+input_MetaTypeToLocalizedString( vlc_meta_type_t meta_type )
+{
+    return _(meta_type_to_string[meta_type]);
+}
+
+#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 )
 {
+    VLC_UNUSED(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;
@@ -52,8 +89,6 @@ 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 );
@@ -74,11 +109,14 @@ int input_MetaFetch( playlist_t *p_playlist, input_item_t *p_item )
     }
     module_Unneed( p_me, p_me->p_module );
     vlc_object_destroy( p_me );
+
+    input_item_SetMetaFetched( p_item, VLC_TRUE );
+
     return VLC_SUCCESS;
 }
 
 /* Return codes:
- *   0 : Art is in cache
+ *   0 : Art is in cache or is a local file
  *   1 : Art found, need to download
  *  -X : Error/not found
  */
@@ -86,36 +124,87 @@ 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 )
+    char *psz_title, *psz_artist, *psz_album;
+
+    psz_artist = input_item_GetArtist( p_item );
+    psz_album = input_item_GetAlbum( p_item );
+    psz_title = input_item_GetTitle( p_item );
+    if(!psz_title)
+        psz_title = input_item_GetName( p_item );
+
+    if( !psz_title && !psz_artist && !psz_album )
         return VLC_EGENERIC;
 
+    free( psz_title );
+
     /* 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 );
-            if( album.b_found )
+    if( psz_artist && psz_album )
+    {
+        FOREACH_ARRAY( playlist_album_t album, p_playlist->p_fetcher->albums )
+            if( !strcmp( album.psz_artist, psz_artist ) &&
+                !strcmp( album.psz_album, psz_album ) )
             {
-                /* Actually get URL from cache */
-                input_FindArtInCache( p_playlist, p_item );
-                return 0;
+                msg_Dbg( p_playlist, " %s - %s has already been searched",
+                         psz_artist, psz_album );
+        /* TODO-fenrir if we cache art filename too, we can go faster */
+                free( psz_artist );
+                free( psz_album );
+                if( album.b_found )
+                {
+                    if( !strncmp( album.psz_arturl, "file://", 7 ) )
+                        input_item_SetArtURL( p_item, album.psz_arturl );
+                    else /* Actually get URL from cache */
+                        input_FindArtInCache( p_playlist, p_item );
+                    return 0;
+                }
+                else
+                {
+                    return VLC_EGENERIC;
+                }
             }
-            else
-                return VLC_EGENERIC;
-        }
-    FOREACH_END();
+        FOREACH_END();
+    }
+    free( psz_artist );
+    free( psz_album );
 
     input_FindArtInCache( p_playlist, p_item );
-    if( !EMPTY_STR( p_item->p_meta->psz_arturl ) )
-        return 0;
+
+    char *psz_arturl = input_item_GetArtURL( p_item );
+    if( psz_arturl )
+    {
+        /* We already have an URL */
+        if( !strncmp( psz_arturl, "file://", strlen( "file://" ) ) )
+        {
+            free( psz_arturl );
+            return 0; /* Art is in cache, no need to go further */
+        }
+
+        free( psz_arturl );
+        
+        /* Art need to be put in cache */
+        return 1;
+    }
 
     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 );
+    psz_album = input_item_GetAlbum( p_item );
+    psz_artist = input_item_GetArtist( p_item );
+    psz_title = input_item_GetTitle( p_item );
+    if( !psz_title )
+        psz_title = input_item_GetName( p_item );
+
+    if( psz_album && psz_artist )
+    {
+        msg_Dbg( p_playlist, "searching art for %s - %s",
+             psz_artist, psz_album );
+    }
+    else
+    {
+        msg_Dbg( p_playlist, "searching art for %s",
+             psz_title );
+    }
+    free( psz_title );
+
     p_module = module_Need( p_playlist, "art finder", 0, VLC_FALSE );
 
     if( p_module )
@@ -124,11 +213,20 @@ int input_ArtFind( playlist_t *p_playlist, input_item_t *p_item )
         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( psz_artist && psz_album )
+    {
+        playlist_album_t a;
+        a.psz_artist = psz_artist;
+        a.psz_album = psz_album;
+        a.psz_arturl = input_item_GetArtURL( p_item );
+        a.b_found = (i_ret == VLC_EGENERIC ? VLC_FALSE : VLC_TRUE );
+        ARRAY_APPEND( p_playlist->p_fetcher->albums, a );
+    }
+    else
+    {
+        free( psz_artist );
+        free( psz_album );
+    }
 
     if( p_module )
         module_Unneed( p_playlist, p_module );
@@ -138,38 +236,150 @@ int input_ArtFind( playlist_t *p_playlist, input_item_t *p_item )
     return i_ret;
 }
 
-#ifndef MAX_PATH
-#   define MAX_PATH 250
-#endif
-int input_FindArtInCache( playlist_t *p_playlist, input_item_t *p_item )
+static void ArtCacheCreateDir( const char *psz_dir )
+{
+    char newdir[strlen( psz_dir ) + 1];
+    strcpy( newdir, psz_dir );
+    char * psz_newdir = newdir;
+    char * psz = psz_newdir;
+
+    while( *psz )
+    {
+        while( *psz && *psz != DIR_SEP_CHAR) psz++;
+        if( !*psz ) break;
+        *psz = 0;
+        if( !EMPTY_STR( psz_newdir ) )
+            utf8_mkdir( psz_newdir, 0700 );
+        *psz = DIR_SEP_CHAR;
+        psz++;
+    }
+    utf8_mkdir( psz_dir, 0700 );
+}
+
+static char * ArtCacheGetSanitizedFileName( const char *psz )
+{
+    char *dup = strdup(psz);
+    int i;
+
+    filename_sanitize( dup );
+
+    /* 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] == DIR_SEP_CHAR )
+            dup[i] = ' ';
+    }
+    return dup;
+}
+
+#define ArtCacheGetDirPath(a,b,c,d,e) __ArtCacheGetDirPath(VLC_OBJECT(a),b,c,d,e)
+static void __ArtCacheGetDirPath( vlc_object_t *p_obj,
+                                  char *psz_dir,
+                                  const char *psz_title,
+                                  const char *psz_artist, const char *psz_album )
+{
+    if( !EMPTY_STR(psz_artist) && !EMPTY_STR(psz_album) )
+    {
+        char * psz_album_sanitized = ArtCacheGetSanitizedFileName( psz_album );
+        char * psz_artist_sanitized = ArtCacheGetSanitizedFileName( psz_artist );
+
+        snprintf( psz_dir, PATH_MAX, "%s" DIR_SEP
+                  "art" DIR_SEP "artistalbum" DIR_SEP "%s" DIR_SEP "%s",
+                      p_obj->p_libvlc->psz_cachedir,
+                      psz_artist_sanitized, psz_album_sanitized );
+        free( psz_album_sanitized );
+        free( psz_artist_sanitized );
+    }
+    else
+    {
+        char * psz_title_sanitized = ArtCacheGetSanitizedFileName( psz_title );
+        snprintf( psz_dir, PATH_MAX, "%s" DIR_SEP
+                  "art" DIR_SEP "title" DIR_SEP "%s",
+                  p_obj->p_libvlc->psz_cachedir,
+                  psz_title_sanitized );
+        free( psz_title_sanitized );
+    }
+}
+
+
+
+#define ArtCacheGetFilePath(a,b,c,d,e,f) __ArtCacheGetFilePath(VLC_OBJECT(a),b,c,d,e,f)
+static void __ArtCacheGetFilePath( vlc_object_t *p_obj,
+                                   char * psz_filename,
+                                   const char *psz_title,
+                                   const char *psz_artist, const char *psz_album,
+                                   const char *psz_extension )
+{
+    char psz_dir[PATH_MAX+1];
+    char * psz_ext;
+    ArtCacheGetDirPath( p_obj, psz_dir, psz_title, psz_artist, psz_album );
+
+    if( psz_extension )
+    {
+        psz_ext = strndup( psz_extension, 6 );
+        filename_sanitize( psz_ext );
+    }
+    else psz_ext = strdup( "" );
+
+    snprintf( psz_filename, PATH_MAX, "file://%s" DIR_SEP "art%s",
+              psz_dir, psz_ext );
+
+    free( psz_ext );
+}
+
+static int __input_FindArtInCache( vlc_object_t *p_obj, input_item_t *p_item )
 {
     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", "" };
+    char *psz_title;
+    char psz_dirpath[PATH_MAX+1];
+    char psz_filepath[PATH_MAX+1];
+    char * psz_filename;
+    DIR * p_dir;
+
+    psz_artist = input_item_GetArtist( p_item );
+    psz_album = input_item_GetAlbum( p_item );
+    psz_title = input_item_GetTitle( p_item );
+    if( !psz_title ) psz_title = input_item_GetName( p_item );
+
+    if( !psz_title && ( !psz_album || !psz_artist ) )
+    {
+        free( psz_artist );
+        free( psz_album );
+        free( psz_title );
+        return VLC_EGENERIC;
+    }
 
-    if( !p_item->p_meta ) return VLC_EGENERIC;
+    ArtCacheGetDirPath( p_obj, psz_dirpath, psz_title,
+                           psz_artist, psz_album );
 
-    psz_artist = p_item->p_meta->psz_artist;
-    psz_album = p_item->p_meta->psz_album;
+    free( psz_artist );
+    free( psz_album );
+    free( psz_title );
+
+    /* Check if file exists */
+    p_dir = utf8_opendir( psz_dirpath );
+    if( !p_dir )
+        return VLC_EGENERIC;
 
-    for( i = 0; i < 5; i++ )
+    while( (psz_filename = utf8_readdir( p_dir )) )
     {
-        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_playlist->p_libvlc->psz_homedir,
-                  psz_artist, psz_album, ppsz_type[i] );
-
-        /* Check if file exists */
-        if( utf8_stat( psz_filename+7, &a ) == 0 )
+        if( !strncmp( psz_filename, "art", 3 ) )
         {
-            vlc_meta_SetArtURL( p_item->p_meta, psz_filename );
+            snprintf( psz_filepath, PATH_MAX, "file://%s" DIR_SEP "%s",
+                      psz_dirpath, psz_filename );
+            input_item_SetArtURL( p_item, psz_filepath );
+            free( psz_filename );
+            closedir( p_dir );
             return VLC_SUCCESS;
         }
+        free( psz_filename );
     }
+
+    /* Not found */
+    closedir( p_dir );
     return VLC_EGENERIC;
 }
 
@@ -181,96 +391,217 @@ int input_DownloadAndCacheArt( playlist_t *p_playlist, input_item_t *p_item )
 {
     int i_status = VLC_EGENERIC;
     stream_t *p_stream;
-    char psz_filename[MAX_PATH+1], psz_dir[MAX_PATH+1];
-    char *psz_artist;
-    char *psz_album;
+    char psz_filename[PATH_MAX+1];
+    char *psz_artist = NULL;
+    char *psz_album = NULL;
+    char *psz_title = NULL;
+    char *psz_arturl;
     char *psz_type;
-    psz_artist = p_item->p_meta->psz_artist;
-    psz_album = p_item->p_meta->psz_album;
 
-    assert( p_item->p_meta && !EMPTY_STR(p_item->p_meta->psz_arturl) );
+    psz_artist = input_item_GetArtist( p_item );
+    psz_album = input_item_GetAlbum( p_item );
+    psz_title = input_item_GetTitle( p_item );
+    if( !psz_title )
+        psz_title = input_item_GetName( p_item );
 
-    /* FIXME: use an alternate saving filename scheme if we don't have
-     * the artist or album name */
-    if( !p_item->p_meta->psz_artist || !p_item->p_meta->psz_album )
+    if( !psz_title && (!psz_artist || !psz_album) )
+    {
+        free( psz_title );
+        free( psz_album );
+        free( psz_artist );
         return VLC_EGENERIC;
+    }
+
+    psz_arturl = input_item_GetArtURL( p_item );
+    assert( !EMPTY_STR( psz_arturl ) );
 
-    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_playlist->p_libvlc->psz_homedir,
-              psz_artist, psz_album, psz_type );
-
-    snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR,
-              p_playlist->p_libvlc->psz_homedir );
-    utf8_mkdir( psz_dir );
-    snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP "art",
-              p_playlist->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_playlist->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_playlist->p_libvlc->psz_homedir,
-                      psz_artist, psz_album );
-    utf8_mkdir( psz_dir );
-
-    if( !strncmp( p_item->p_meta->psz_arturl , "APIC", 4 ) )
+    if( !strncmp( psz_arturl , "file://", 7 ) )
+    {
+        msg_Dbg( p_playlist, "Album art is local file, no need to cache" );
+        free( psz_arturl );
+        return VLC_SUCCESS;
+    }
+    else if( !strncmp( psz_arturl , "APIC", 4 ) )
     {
         msg_Warn( p_playlist, "APIC fetch not supported yet" );
+        free( psz_arturl );
         return VLC_EGENERIC;
     }
 
-    p_stream = stream_UrlNew( p_playlist, p_item->p_meta->psz_arturl );
+    psz_type = strrchr( psz_arturl, '.' );
+    if( strlen( psz_type ) > 5 )
+        psz_type = NULL; /* remove extension if it's > to 4 characters */
+
+    /* Warning: psz_title, psz_artist, psz_album may change in ArtCache*() */
+
+    ArtCacheGetDirPath( p_playlist, psz_filename, psz_title, psz_artist,
+                        psz_album );
+    ArtCacheCreateDir( psz_filename );
+    ArtCacheGetFilePath( p_playlist, psz_filename, psz_title, psz_artist,
+                         psz_album, psz_type );
+
+    free( psz_artist );
+    free( psz_album );
+    free( psz_title );
+
+    p_stream = stream_UrlNew( p_playlist, psz_arturl );
     if( p_stream )
     {
-        void *p_buffer = malloc( 1<<16 );
+        uint8_t p_buffer[65536];
         long int l_read;
         FILE *p_file = utf8_fopen( psz_filename+7, "w" );
-        while( ( l_read = stream_Read( p_stream, p_buffer, 1<<16 ) ) )
+        if( p_file == NULL ) {
+            msg_Err( p_playlist, "Unable write album art in %s",
+                     psz_filename + 7 );
+            free( psz_arturl );
+            return VLC_EGENERIC;
+        }
+        int err = 0;
+        while( ( l_read = stream_Read( p_stream, p_buffer, sizeof (p_buffer) ) ) )
         {
-            fwrite( p_buffer, l_read, 1, p_file );
+            if( fwrite( p_buffer, l_read, 1, p_file ) != 1 )
+            {
+                err = errno;
+                break;
+            }
         }
-        free( p_buffer );
-        fclose( p_file );
+        if( fclose( p_file ) && !err )
+            err = errno;
         stream_Delete( p_stream );
-        msg_Dbg( p_playlist, "album art saved to %s\n", psz_filename );
-        free( p_item->p_meta->psz_arturl );
-        p_item->p_meta->psz_arturl = strdup( psz_filename );
+
+        if( err )
+        {
+            errno = err;
+            msg_Err( p_playlist, "%s: %m", psz_filename );
+        }
+        else
+            msg_Dbg( p_playlist, "album art saved to %s\n", psz_filename );
+
+        input_item_SetArtURL( p_item, psz_filename );
         i_status = VLC_SUCCESS;
     }
+    free( psz_arturl );
     return i_status;
 }
 
+void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input )
+{
+    input_item_t *p_item = p_input->p->input.p_item;
+    const char *psz_arturl;
+    const char *psz_artist = NULL;
+    const char *psz_album = NULL;
+    const char *psz_title = NULL;
+    char *psz_type = NULL;
+    char psz_filename[PATH_MAX+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 */
+
+    psz_arturl = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL );
+
+    if( !psz_arturl || strncmp( psz_arturl, "attachment://", strlen("attachment://") ) )
+    {
+        msg_Err( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
+        return;
+    }
+
+    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 );
+        return;
+    }
+
+    /* */
+    for( i_idx = 0, p_attachment = NULL; 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];
+            break;
+        }
+    }
+    if( !p_attachment || p_attachment->i_data <= 0 )
+    {
+        msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
+        return;
+    }
+
+    psz_artist = vlc_meta_Get( p_item->p_meta, vlc_meta_Artist );
+    psz_album = vlc_meta_Get( p_item->p_meta, vlc_meta_Album );
+    psz_title = vlc_meta_Get( p_item->p_meta, vlc_meta_Title );
+    if( !strcmp( p_attachment->psz_mime, "image/jpeg" ) )
+        psz_type = strdup( ".jpg" );
+    else if( !strcmp( p_attachment->psz_mime, "image/png" ) )
+        psz_type = strdup( ".png" );
+
+    if( !psz_title )
+        psz_title = p_item->psz_name;
+
+    if( (!psz_artist || !psz_album ) && !psz_title )
+        return;
+
+    ArtCacheGetDirPath( p_input, psz_filename, psz_title, psz_artist, psz_album );
+    ArtCacheCreateDir( psz_filename );
+    ArtCacheGetFilePath( p_input, psz_filename, psz_title, psz_artist, psz_album, psz_type );
+    free( psz_type );
+
+    /* Check if we already dumped it */
+    if( !utf8_stat( psz_filename+7, &s ) )
+    {
+        vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_filename );
+        return;
+    }
+
+    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: %m", psz_filename );
+        else
+        {
+            msg_Dbg( p_input, "album art saved to %s\n", psz_filename );
+            vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_filename );
+        }
+        fclose( f );
+    }
+}
+
+
 uint32_t input_CurrentMetaFlags( vlc_meta_t *p_meta )
 {
     uint32_t i_meta = 0;
 
+    if( !p_meta )
+        return 0;
+
 #define CHECK( a, b ) \
-    if( p_meta->psz_ ## a && *p_meta->psz_ ## a ) \
+    if( !EMPTY_STR( vlc_meta_Get( p_meta, vlc_meta_ ## a ) ) ) \
         i_meta |= VLC_META_ENGINE_ ## b;
 
-    CHECK( title, TITLE )
-    CHECK( artist, ARTIST )
-    CHECK( album, COLLECTION )
+    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 )
+    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 )
+    CHECK( ArtworkURL, ART_URL )
 
     return i_meta;
 }