X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=537a3de06cf7340895d195bb145b28b8f0496e91;hb=57ebbaea41dfb5b3910b463d69a306fa8c32ba0b;hp=8097d09589b7cc2d89caa41c3204f96cc971b4cf;hpb=e560aff75a63b222bea9c92e6150bc7b6f669be3;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 8097d09589..537a3de06c 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -20,12 +20,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include +#include #include "playlist_internal.h" -#include "misc/configuration.h" +#include "config/configuration.h" #include +#include +#include +#include #include int playlist_Export( playlist_t * p_playlist, const char *psz_filename , @@ -36,110 +44,174 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename , if( p_export_root == NULL ) return VLC_EGENERIC; - msg_Info( p_playlist, "saving %s to file %s", + msg_Dbg( p_playlist, "saving %s to file %s", p_export_root->p_input->psz_name, psz_filename ); /* Prepare the playlist_export_t structure */ p_export = (playlist_export_t *)malloc( sizeof(playlist_export_t) ); if( !p_export) - { - msg_Err( p_playlist, "out of memory" ); return VLC_ENOMEM; - } - p_export->psz_filename = NULL; - if ( psz_filename ) - p_export->psz_filename = strdup( psz_filename ); + p_export->psz_filename = psz_filename ? strdup( psz_filename ) : NULL; p_export->p_file = utf8_fopen( psz_filename, "wt" ); if( !p_export->p_file ) { - msg_Err( p_playlist , "could not create playlist file %s" - " (%s)", psz_filename, strerror(errno) ); + msg_Err( p_playlist , "could not create playlist file %s (%m)", + psz_filename ); + free( p_export->psz_filename ); + free( p_export ); return VLC_EGENERIC; } p_export->p_root = p_export_root; /* Lock the playlist */ - vlc_mutex_lock( &p_playlist->object_lock ); + vlc_object_lock( p_playlist ); p_playlist->p_private = (void *)p_export; /* And call the module ! All work is done now */ - p_module = module_Need( p_playlist, "playlist export", psz_type, VLC_TRUE); + int i_ret; + p_module = module_need( p_playlist, "playlist export", psz_type, true); if( !p_module ) { msg_Warn( p_playlist, "exporting playlist failed" ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return VLC_ENOOBJ; + i_ret = VLC_ENOOBJ; + } + else + { + module_unneed( p_playlist , p_module ); + i_ret = VLC_SUCCESS; } - module_Unneed( p_playlist , p_module ); /* Clean up */ fclose( p_export->p_file ); - if ( p_export->psz_filename ) - free( p_export->psz_filename ); - free ( p_export ); + free( p_export->psz_filename ); + free( p_export ); p_playlist->p_private = NULL; - vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_unlock( p_playlist ); - return VLC_SUCCESS; + return i_ret; +} + +/***************************************************************************** + * A subitem has been added to the Media Library (Event Callback) + *****************************************************************************/ +static void input_item_subitem_added( const vlc_event_t * p_event, + void * user_data ) +{ + playlist_t *p_playlist = user_data; + input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child; + + /* playlist_AddInput() can fail, but we have no way to report that .. + * Any way when it has failed, either the playlist is dying, either OOM */ + playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END, + false, pl_Unlocked ); } int playlist_MLLoad( playlist_t *p_playlist ) { -#ifndef THIS_PIECE_OF_CODE_IS_FIXED // see #1047 and possibly others - (void)p_playlist; -#else - char *psz_uri, *psz_homedir =p_playlist->p_libvlc->psz_homedir; + char *psz_datadir = config_GetUserDataDir(); + char *psz_uri = NULL; input_item_t *p_input; if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; - if( !psz_homedir ) + if( !psz_datadir ) /* XXX: This should never happen */ { - msg_Err( p_playlist, "no home directory, cannot load media library") ; + msg_Err( p_playlist, "no data directory, cannot load media library") ; return VLC_EGENERIC; } - asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP CONFIG_DIR DIR_SEP - "ml.xsp", psz_homedir ); - p_input = input_ItemNewExt( p_playlist, psz_uri, - _("Media Library"), 0, NULL, -1 ); + if( asprintf( &psz_uri, "%s" DIR_SEP "ml.xspf", psz_datadir ) == -1 ) + { + psz_uri = NULL; + goto error; + } + struct stat p_stat; + /* checks if media library file is present */ + if( utf8_stat( psz_uri , &p_stat ) ) + goto error; + free( psz_uri ); + + /* FIXME: WTF? stat() should never be used right before open()! */ + if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xspf", + psz_datadir ) == -1 ) + { + psz_uri = NULL; + goto error; + } + free( psz_datadir ); + psz_datadir = NULL; + + const char *const psz_option = "meta-file"; + /* that option has to be cleaned in input_item_subitem_added() */ + /* vlc_gc_decref() in the same function */ + p_input = input_item_NewExt( p_playlist, psz_uri, + _("Media Library"), 1, &psz_option, -1 ); + if( p_input == NULL ) + goto error; + + PL_LOCK; + if( p_playlist->p_ml_onelevel->p_input ) + vlc_gc_decref( p_playlist->p_ml_onelevel->p_input ); + if( p_playlist->p_ml_category->p_input ) + vlc_gc_decref( p_playlist->p_ml_category->p_input ); + + p_playlist->p_ml_onelevel->p_input = p_playlist->p_ml_category->p_input = p_input; - p_playlist->p_ml_onelevel->p_input = p_input; + /* We save the input at two different place, incref */ + vlc_gc_incref( p_input ); + vlc_gc_incref( p_input ); + + vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, + input_item_subitem_added, p_playlist ); + + pl_priv(p_playlist)->b_doing_ml = true; + PL_UNLOCK; - p_playlist->b_doing_ml = VLC_TRUE; stats_TimerStart( p_playlist, "ML Load", STATS_TIMER_ML_LOAD ); - input_Read( p_playlist, p_input, VLC_TRUE ); + input_Read( p_playlist, p_input, true ); stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD ); - p_playlist->b_doing_ml = VLC_FALSE; + PL_LOCK; + pl_priv(p_playlist)->b_doing_ml = false; + PL_UNLOCK; + + vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded, + input_item_subitem_added, p_playlist ); + + vlc_gc_decref( p_input ); free( psz_uri ); -#endif return VLC_SUCCESS; + +error: + free( psz_uri ); + free( psz_datadir ); + return VLC_ENOMEM; } int playlist_MLDump( playlist_t *p_playlist ) { - char *psz_uri, *psz_homedir = p_playlist->p_libvlc->psz_homedir; + char *psz_datadir = config_GetUserDataDir(); if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; - if( !psz_homedir ) + if( !psz_datadir ) /* XXX: This should never happen */ { - msg_Err( p_playlist, "no home directory, cannot save media library") ; + msg_Err( p_playlist, "no data directory, cannot save media library") ; return VLC_EGENERIC; } - char psz_dirname[ strlen( psz_homedir ) + sizeof( DIR_SEP CONFIG_DIR ) ]; - sprintf( psz_dirname, "%s" DIR_SEP CONFIG_DIR, psz_homedir ); + char psz_dirname[ strlen( psz_datadir ) + sizeof( DIR_SEP "ml.xspf")]; + strcpy( psz_dirname, psz_datadir ); + free( psz_datadir ); if( config_CreateDir( (vlc_object_t *)p_playlist, psz_dirname ) ) { return VLC_EGENERIC; } - asprintf( &psz_uri, "%s" DIR_SEP "%s", psz_dirname, "ml.xsp" ); + strcat( psz_dirname, DIR_SEP "ml.xspf" ); + stats_TimerStart( p_playlist, "ML Dump", STATS_TIMER_ML_DUMP ); - playlist_Export( p_playlist, psz_uri, p_playlist->p_ml_category, + playlist_Export( p_playlist, psz_dirname, p_playlist->p_ml_category, "export-xspf" ); stats_TimerStop( p_playlist, STATS_TIMER_ML_DUMP ); - free( psz_uri ); return VLC_SUCCESS; }