X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=10660f80cabbc0897d8bf9de114495e9b467c87b;hb=32b31e87d90967549e5cc8bef18d5aae7e3b98c6;hp=b32c0ce0a22786b770f452b8583ea87a7b871846;hpb=9ab29013a72a3f9ede29df2331b32c3aba5bfb49;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index b32c0ce0a2..10660f80ca 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -20,55 +20,22 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include "vlc_playlist.h" -#include "playlist_internal.h" -#include "charset.h" -#include - -#if defined( WIN32 ) || defined( UNDER_CE ) -# define DIR_SEP "\\" -#else -# define DIR_SEP "/" +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -/** - * Import a playlist file at a given point of a given view - * \param p_playlist the playlist to which the new items will be added - * \param psz_filename the name of the playlistfile to import - * \return VLC_SUCCESS on success - */ -int playlist_Import( playlist_t * p_playlist, const char *psz_filename, - playlist_item_t *p_root, vlc_bool_t b_only_there ) -{ - char *psz_uri, *psz_opt; - input_item_t *p_input; +#include +#include +#include +#include "playlist_internal.h" +#include "config/configuration.h" +#include - asprintf( &psz_uri, "file/playlist://%s", psz_filename ); - p_input = input_ItemNewExt( p_playlist, psz_uri, "playlist", 0, NULL, -1 ); - if( b_only_there ) - { - asprintf( &psz_opt, "parent-item=%i", p_root->i_id ); - vlc_input_item_AddOption( p_input, psz_opt ); - free( psz_opt ); - } - playlist_PlaylistAddInput( p_playlist, p_input, PLAYLIST_APPEND, - PLAYLIST_END ); - input_Read( p_playlist, p_input, VLC_TRUE ); - free( psz_uri ); - return VLC_SUCCESS; -} +#include +#include +#include +#include -/** - * Export a node of the playlist to a certain type of playlistfile - * - * \param p_playlist the playlist to export - * \param psz_filename the location where the exported file will be saved - * \param p_export_root the root node to export - * \param psz_type the type of playlist file to create. - * \return VLC_SUCCESS on success - */ int playlist_Export( playlist_t * p_playlist, const char *psz_filename , playlist_item_t *p_export_root,const char *psz_type ) { @@ -83,93 +50,164 @@ int playlist_Export( playlist_t * p_playlist, const char *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->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 ); 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); + 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 ); + vlc_object_unlock( p_playlist ); return VLC_ENOOBJ; } 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->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; } +/***************************************************************************** + * 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 ) { - char *psz_uri, *psz_homedir =p_playlist->p_vlc->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 ); + 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_ItemNewExt( p_playlist, psz_uri, - _("Media Library"), 0, NULL, -1 ); + _("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 ); + + 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; + 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 ); 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_vlc->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 data directory, cannot save media library") ; + return VLC_EGENERIC; + } + + 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 ) ) { - msg_Err( p_playlist, "no home directory, cannot load media library") ; return VLC_EGENERIC; } - asprintf( &psz_uri, "%s" DIR_SEP CONFIG_DIR DIR_SEP - "ml.xsp", psz_homedir ); + + 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; }