* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_stream.h>
#include <vlc_meta.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
-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"),
-};
+#include "../libvlc.h"
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 )
-{
- (void)p_playlist;
- *pi_mandatory = VLC_META_ENGINE_TITLE | VLC_META_ENGINE_ARTIST;
-
- 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;
-
- 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 )
+ switch( meta_type )
{
- vlc_object_destroy( p_me );
- return VLC_EGENERIC;
+ 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();
}
- module_Unneed( p_me, p_me->p_module );
- vlc_object_destroy( p_me );
-
- input_item_SetMetaFetched( p_item, VLC_TRUE );
+};
- return VLC_SUCCESS;
-}
+#define input_FindArtInCache(a,b) __input_FindArtInCache(VLC_OBJECT(a),b)
+static int __input_FindArtInCache( vlc_object_t *, input_item_t *p_item );
/* 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
*/
module_t *p_module;
char *psz_title, *psz_artist, *psz_album;
- if( !p_item->p_meta )
- return VLC_EGENERIC;
-
psz_artist = input_item_GetArtist( p_item );
psz_album = input_item_GetAlbum( p_item );
psz_title = input_item_GetTitle( p_item );
free( psz_album );
if( album.b_found )
{
- /* Actually get URL from cache */
- input_FindArtInCache( p_playlist, p_item );
+ 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
free( psz_artist );
free( psz_album );
- char *psz_arturl = input_item_GetArtURL( p_item );
input_FindArtInCache( p_playlist, p_item );
- if( !EMPTY_STR( psz_arturl ) )
+
+ 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 );
- return 0;
+
+ /* Art need to be put in cache */
+ return 1;
}
- free( psz_arturl );
PL_LOCK;
p_playlist->p_private = p_item;
}
free( psz_title );
- p_module = module_Need( p_playlist, "art finder", 0, VLC_FALSE );
+ p_module = module_Need( p_playlist, "art finder", 0, false );
if( p_module )
i_ret = 1;
playlist_album_t a;
a.psz_artist = psz_artist;
a.psz_album = psz_album;
- a.b_found = (i_ret == VLC_EGENERIC ? VLC_FALSE : VLC_TRUE );
+ a.psz_arturl = input_item_GetArtURL( p_item );
+ a.b_found = (i_ret == VLC_EGENERIC ? false : true );
ARRAY_APPEND( p_playlist->p_fetcher->albums, a );
}
else
return i_ret;
}
-#ifndef MAX_PATH
-# define MAX_PATH 250
-#endif
static void ArtCacheCreateDir( const char *psz_dir )
{
- char newdir[MAX_PATH+1];
+ char newdir[strlen( psz_dir ) + 1];
strcpy( newdir, psz_dir );
char * psz_newdir = newdir;
char * psz = psz_newdir;
- while( *psz_newdir )
+ while( *psz )
{
- while( *psz && *psz != '/') psz++;
+ while( *psz && *psz != DIR_SEP_CHAR) psz++;
if( !*psz ) break;
- *psz = 0;
- if( !EMPTY_STR( psz_newdir ) ) utf8_mkdir( psz_newdir );
- psz_newdir = psz+1;
+ *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 )
*/
for( i = 0; dup[i] != '\0'; i++ )
{
- if( dup[i] == '/' )
+ if( dup[i] == DIR_SEP_CHAR )
dup[i] = ' ';
}
return dup;
const char *psz_title,
const char *psz_artist, const char *psz_album )
{
+ char *psz_cachedir = config_GetCacheDir();
+
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, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP
+ snprintf( psz_dir, PATH_MAX, "%s" DIR_SEP
"art" DIR_SEP "artistalbum" DIR_SEP "%s" DIR_SEP "%s",
- p_obj->p_libvlc->psz_homedir,
- psz_artist_sanitized, psz_album_sanitized );
+ 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, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP
+ snprintf( psz_dir, PATH_MAX, "%s" DIR_SEP
"art" DIR_SEP "title" DIR_SEP "%s",
- p_obj->p_libvlc->psz_homedir,
- psz_title_sanitized );
+ psz_cachedir, psz_title_sanitized );
free( psz_title_sanitized );
}
+ free( psz_cachedir );
}
const char *psz_artist, const char *psz_album,
const char *psz_extension )
{
- char psz_dir[MAX_PATH+1];
+ char psz_dir[PATH_MAX+1];
char * psz_ext;
ArtCacheGetDirPath( p_obj, psz_dir, psz_title, psz_artist, psz_album );
}
else psz_ext = strdup( "" );
- snprintf( psz_filename, MAX_PATH, "file://%s" DIR_SEP "art%s",
+ snprintf( psz_filename, PATH_MAX, "file://%s" DIR_SEP "art%s",
psz_dir, psz_ext );
free( psz_ext );
char *psz_artist;
char *psz_album;
char *psz_title;
- char psz_dirpath[MAX_PATH+1];
- char psz_filepath[MAX_PATH+1];
+ char psz_dirpath[PATH_MAX+1];
+ char psz_filepath[PATH_MAX+1];
char * psz_filename;
DIR * p_dir;
{
if( !strncmp( psz_filename, "art", 3 ) )
{
- snprintf( psz_filepath, MAX_PATH, "%s" DIR_SEP "%s",
+ snprintf( psz_filepath, PATH_MAX, "file://%s" DIR_SEP "%s",
psz_dirpath, psz_filename );
input_item_SetArtURL( p_item, psz_filepath );
free( psz_filename );
{
int i_status = VLC_EGENERIC;
stream_t *p_stream;
- char psz_filename[MAX_PATH+1];
+ char psz_filename[PATH_MAX+1];
char *psz_artist = NULL;
char *psz_album = NULL;
char *psz_title = NULL;
psz_arturl = input_item_GetArtURL( p_item );
assert( !EMPTY_STR( psz_arturl ) );
- if( !strncmp( 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 );
}
psz_type = strrchr( psz_arturl, '.' );
- if( strlen( psz_type ) > 5 )
+ if( psz_type && 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*() */
long int l_read;
FILE *p_file = utf8_fopen( psz_filename+7, "w" );
if( p_file == NULL ) {
- msg_Err( p_playlist, "Unable write album art in %s" );
+ msg_Err( p_playlist, "Unable write album art in %s",
+ psz_filename + 7 );
free( psz_arturl );
return VLC_EGENERIC;
}
stream_Delete( p_stream );
if( err )
- msg_Err( p_playlist, "%s: %s", psz_filename, strerror( err ) );
+ {
+ errno = err;
+ msg_Err( p_playlist, "%s: %m", psz_filename );
+ }
else
msg_Dbg( p_playlist, "album art saved to %s\n", psz_filename );
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_title = NULL;
+ 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[MAX_PATH+1];
+ char psz_filename[PATH_MAX+1];
FILE *f;
input_attachment_t *p_attachment;
struct stat s;
/* 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 = input_item_GetArtURL( p_item );
+ psz_arturl = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL );
+
if( !psz_arturl || strncmp( psz_arturl, "attachment://", strlen("attachment://") ) )
{
- free( psz_arturl );
msg_Err( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
return;
}
- input_item_SetArtURL( p_item, NULL );
if( input_item_IsArtFetched( p_item ) )
{
* condition */
msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
input_FindArtInCache( p_input, p_item );
- free( psz_arturl );
return;
}
if( !p_attachment || p_attachment->i_data <= 0 )
{
msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
- goto end;
+ return;
}
- psz_artist = input_item_GetArtist( p_item );
- psz_album = input_item_GetAlbum( p_item );
- psz_title = input_item_GetTitle( p_item );
+ 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 = input_item_GetName( p_item );
+ psz_title = p_item->psz_name;
if( (!psz_artist || !psz_album ) && !psz_title )
- goto end;
-
- /* */
- psz_type = strrchr( psz_arturl, '.' );
+ 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 ) )
- goto end;
+ {
+ 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: %s", psz_filename, strerror( errno ) );
+ 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 );
}
-
-end:
- if( psz_artist ) free( psz_artist );
- if( psz_album ) free( psz_album );
- if( psz_title ) free( psz_title );
- if( psz_arturl ) free( psz_arturl );
-}
-
-
-uint32_t input_CurrentMetaFlags( vlc_meta_t *p_meta )
-{
- uint32_t i_meta = 0;
-
- if( !p_meta )
- return 0;
-
-#define CHECK( a, b ) \
- 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 )
-#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( ArtworkURL, ART_URL )
-
- return i_meta;
}
projects / vlc / blobdiff