X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=ce9f9d13a68911f97db67f6051bb6a57da29f6a7;hb=1644d683e9df1620685ed666865b4752bfcca3a0;hp=14bb545610ae4940fd180706f62f91064218b60c;hpb=7b9e1799ee5a6330222f62801abb29f15750611c;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 14bb545610..ce9f9d13a6 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -20,182 +20,182 @@ * 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 "config/config.h" -#include +#include "config/configuration.h" +#include +#include #include #include #include -#include -int playlist_Export( playlist_t * p_playlist, const char *psz_filename , - playlist_item_t *p_export_root,const char *psz_type ) +int playlist_Export( playlist_t * p_playlist, const char *psz_filename, + playlist_item_t *p_export_root, const char *psz_type ) { - module_t *p_module; - playlist_export_t *p_export; - if( p_export_root == NULL ) return VLC_EGENERIC; - msg_Info( 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" ); + playlist_export_t *p_export = + vlc_custom_create( p_playlist, sizeof( *p_export ), VLC_OBJECT_GENERIC, + "playlist export" ); + if( !p_export ) 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 (%m)", - psz_filename ); - return VLC_EGENERIC; - } - p_export->p_root = p_export_root; + vlc_object_attach( p_export, p_playlist ); + msg_Dbg( p_export, "saving %s to file %s", + p_export_root->p_input->psz_name, psz_filename ); - /* Lock the playlist */ - vlc_mutex_lock( &p_playlist->object_lock ); - p_playlist->p_private = (void *)p_export; + int ret = VLC_EGENERIC; - /* And call the module ! All work is done now */ - p_module = module_Need( p_playlist, "playlist export", psz_type, VLC_TRUE); - if( !p_module ) + /* Prepare the playlist_export_t structure */ + p_export->p_root = p_export_root; + p_export->psz_filename = psz_filename; + p_export->p_file = vlc_fopen( psz_filename, "wt" ); + if( p_export->p_file == NULL ) + msg_Err( p_export, "could not create playlist file %s (%m)", + psz_filename ); + else { - msg_Warn( p_playlist, "exporting playlist failed" ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return VLC_ENOOBJ; - } - module_Unneed( p_playlist , p_module ); + module_t *p_module; + + /* And call the module ! All work is done now */ + playlist_Lock( p_playlist ); + p_module = module_need( p_export, "playlist export", psz_type, true ); + playlist_Unlock( p_playlist ); + + if( p_module == NULL ) + msg_Err( p_playlist, "could not export playlist" ); + else + { + module_unneed( p_export, p_module ); + ret = VLC_SUCCESS; + } + fclose( p_export->p_file ); + } + vlc_object_release( p_export ); + return ret; +} - /* Clean up */ - fclose( p_export->p_file ); - if ( p_export->psz_filename ) - free( p_export->psz_filename ); - free ( p_export ); - p_playlist->p_private = NULL; - vlc_mutex_unlock( &p_playlist->object_lock ); +int playlist_Import( playlist_t *p_playlist, const char *psz_file ) +{ + input_item_t *p_input; + const char *const psz_option = "meta-file"; + char *psz_uri = make_URI( psz_file, NULL ); - return VLC_SUCCESS; + if( psz_uri == NULL ) + return VLC_EGENERIC; + + p_input = input_item_NewExt( p_playlist, psz_uri, psz_file, + 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, -1 ); + free( psz_uri ); + + playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END, + true, false ); + return input_Read( p_playlist, p_input ); } /***************************************************************************** * A subitem has been added to the Media Library (Event Callback) *****************************************************************************/ -static void input_item_subitem_added( const vlc_event_t * p_event, +static void input_item_subitem_tree_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; - vlc_bool_t b_node = p_event->u.input_item_subitem_added.b_node; + input_item_node_t *p_root = + p_event->u.input_item_subitem_tree_added.p_root; - /* The media library input has one and only one option: "meta-file" - * So we remove that unneeded option. */ - if( p_item->i_options == 1 ) - { - free( p_item->ppsz_options[0] ); - p_item->i_options = 0; - } - - playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END, - VLC_FALSE, VLC_FALSE ); - - if( b_node ) - { - playlist_item_t *p_pl_item, *p_new_pl_item; - p_pl_item = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->i_id, - p_playlist->p_root_category, VLC_FALSE ); - p_new_pl_item = playlist_ItemToNode( p_playlist, p_pl_item, VLC_FALSE ); - p_new_pl_item->p_input->i_type = ITEM_TYPE_NODE; - } + PL_LOCK; + playlist_InsertInputItemTree ( p_playlist, p_playlist->p_media_library, + p_root, 0, false ); + PL_UNLOCK; } int playlist_MLLoad( playlist_t *p_playlist ) { - const char *psz_datadir = p_playlist->p_libvlc->psz_datadir; - char *psz_uri = NULL; input_item_t *p_input; - if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; + char *psz_datadir = config_GetUserDir( VLC_DATA_DIR ); if( !psz_datadir ) /* XXX: This should never happen */ { msg_Err( p_playlist, "no data directory, cannot load media library") ; return VLC_EGENERIC; } - 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 ) ) - { - free( psz_uri ); + char *psz_file; + if( asprintf( &psz_file, "%s" DIR_SEP "ml.xspf", psz_datadir ) != -1 ) + psz_file = NULL; + free( psz_datadir ); + if( psz_file == NULL ) + return VLC_ENOMEM; + + /* loosy check for media library file */ + struct stat st; + int ret = vlc_stat( psz_file, &st ); + free( psz_file ); + if( ret ) return VLC_EGENERIC; - } - free( psz_uri ); - if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xspf", - psz_datadir ) == -1 ) - { - psz_uri = NULL; - goto error; - } + char *psz_uri = make_URI( psz_file, "file/xspf-open" ); + free( psz_file ); + if( psz_uri == NULL ) + return VLC_ENOMEM; - const char *const psz_option = "meta-file"; - /* that option has to be cleaned in input_item_subitem_added() */ - p_input = input_ItemNewExt( p_playlist, psz_uri, - _("Media Library"), 1, &psz_option, -1 ); + const char *const options[1] = { "meta-file", }; + /* that option has to be cleaned in input_item_subitem_tree_added() */ + /* vlc_gc_decref() in the same function */ + p_input = input_item_NewExt( p_playlist, psz_uri, _("Media Library"), + 1, options, VLC_INPUT_OPTION_TRUSTED, -1 ); + free( psz_uri ); if( p_input == NULL ) - goto error; + return VLC_EGENERIC; + + PL_LOCK; + if( p_playlist->p_media_library->p_input ) + vlc_gc_decref( p_playlist->p_media_library->p_input ); + + p_playlist->p_media_library->p_input = p_input; - p_playlist->p_ml_onelevel->p_input = - p_playlist->p_ml_category->p_input = p_input; + vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded, + input_item_subitem_tree_added, p_playlist ); - 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 ); stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD ); - p_playlist->b_doing_ml = VLC_FALSE; - vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded, - input_item_subitem_added, p_playlist ); + PL_LOCK; + pl_priv(p_playlist)->b_doing_ml = false; + PL_UNLOCK; - free( psz_uri ); - return VLC_SUCCESS; + vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded, + input_item_subitem_tree_added, p_playlist ); -error: - free( psz_uri ); - return VLC_ENOMEM; + return VLC_SUCCESS; } int playlist_MLDump( playlist_t *p_playlist ) { - char *psz_datadir = p_playlist->p_libvlc->psz_datadir; - if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; + char *psz_datadir; + + psz_datadir = config_GetUserDir( VLC_DATA_DIR ); + 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")]; - sprintf( psz_dirname, "%s", psz_datadir ); + 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; @@ -204,9 +204,8 @@ int playlist_MLDump( playlist_t *p_playlist ) strcat( psz_dirname, DIR_SEP "ml.xspf" ); stats_TimerStart( p_playlist, "ML Dump", STATS_TIMER_ML_DUMP ); - playlist_Export( p_playlist, psz_dirname, p_playlist->p_ml_category, + playlist_Export( p_playlist, psz_dirname, p_playlist->p_media_library, "export-xspf" ); - vlc_gc_decref( p_playlist->p_ml_category->p_input ); stats_TimerStop( p_playlist, STATS_TIMER_ML_DUMP ); return VLC_SUCCESS;