X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=b1dc3abaa333e5bb70742690e9f4b97afec51038;hb=6efc8da001c90f46d2b91a09dc57dedd59a5415c;hp=4c56c363ec7aca8e781bb8362a51f887a66d22ea;hpb=c7edfac702b32cef1e1f85ef04a528e567e8e27d;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 4c56c363ec..b1dc3abaa3 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -30,62 +30,75 @@ #include "playlist_internal.h" #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_Dbg( p_playlist, "saving %s to file %s", - p_export_root->p_input->psz_name, psz_filename ); + playlist_export_t *p_export = + vlc_custom_create( p_playlist, sizeof( *p_export ), VLC_OBJECT_GENERIC, + "playlist export" ); + if( !p_export ) + return VLC_ENOMEM; + + 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 ); + + int ret = VLC_EGENERIC; /* Prepare the playlist_export_t structure */ - p_export = (playlist_export_t *)malloc( sizeof(playlist_export_t) ); - if( !p_export) - return VLC_ENOMEM; - p_export->psz_filename = NULL; - if ( psz_filename ) - p_export->psz_filename = strdup( psz_filename ); + p_export->p_root = p_export_root; + p_export->psz_filename = 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)", + if( p_export->p_file == NULL ) + msg_Err( p_export, "could not create playlist file %s (%m)", psz_filename ); - return VLC_EGENERIC; - } - - p_export->p_root = p_export_root; + else + { + 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; +} - /* Lock the playlist */ - vlc_object_lock( p_playlist ); - p_playlist->p_private = (void *)p_export; +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 ); - /* And call the module ! All work is done now */ - p_module = module_Need( p_playlist, "playlist export", psz_type, true); - if( !p_module ) - { - msg_Warn( p_playlist, "exporting playlist failed" ); - vlc_object_unlock( p_playlist ); - return VLC_ENOOBJ; - } - module_Unneed( p_playlist , p_module ); + if( psz_uri == NULL ) + return VLC_EGENERIC; - /* Clean up */ - fclose( p_export->p_file ); - free( p_export->psz_filename ); - free ( p_export ); - p_playlist->p_private = NULL; - vlc_object_unlock( p_playlist ); + p_input = input_item_NewExt( p_playlist, psz_uri, psz_file, + 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, -1 ); + free( psz_uri ); - return VLC_SUCCESS; + playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END, + true, false ); + return input_Read( p_playlist, p_input, true ); } /***************************************************************************** @@ -105,45 +118,55 @@ static void input_item_subitem_added( const vlc_event_t * p_event, int playlist_MLLoad( playlist_t *p_playlist ) { - char *psz_datadir = config_GetUserDataDir(); + char *psz_datadir; char *psz_uri = NULL; input_item_t *p_input; - if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; + if( !config_GetInt( p_playlist, "media-library") ) + return VLC_SUCCESS; + + 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; + if( asprintf( &psz_uri, "%s" DIR_SEP "ml.xspf", psz_datadir ) != -1 ) + { /* loosy check for media library file */ + struct stat st; + int ret = utf8_stat( psz_uri , &st ); + free( psz_uri ); + if( ret ) + { + free( psz_datadir ); + return VLC_EGENERIC; + } } - 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 = make_URI( psz_datadir ); + free( psz_datadir ); + psz_datadir = psz_uri; + if( psz_datadir == NULL ) + return VLC_EGENERIC; + + /* Force XSPF demux (psz_datadir was a path, now it is a file URI) */ + if( asprintf( &psz_uri, "file/xspf-open%s/ml.xspf", psz_datadir+4 ) == -1 ) psz_uri = NULL; - goto error; - } free( psz_datadir ); psz_datadir = NULL; + if( psz_uri == NULL ) + return VLC_ENOMEM; - const char *const psz_option = "meta-file"; + const char *const options[1] = { "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 ); + 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_ml_onelevel->p_input ) @@ -160,7 +183,7 @@ int playlist_MLLoad( playlist_t *p_playlist ) vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, input_item_subitem_added, p_playlist ); - p_playlist->b_doing_ml = true; + pl_priv(p_playlist)->b_doing_ml = true; PL_UNLOCK; stats_TimerStart( p_playlist, "ML Load", STATS_TIMER_ML_LOAD ); @@ -168,26 +191,25 @@ int playlist_MLLoad( playlist_t *p_playlist ) stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD ); PL_LOCK; - p_playlist->b_doing_ml = false; + 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 ); return VLC_SUCCESS; - -error: - free( psz_uri ); - free( psz_datadir ); - return VLC_ENOMEM; } int playlist_MLDump( playlist_t *p_playlist ) { - char *psz_datadir = config_GetUserDataDir(); - if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; + char *psz_datadir; + + if( !config_GetInt( p_playlist, "media-library") ) + return VLC_SUCCESS; + + 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") ;