X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=357592b6e7fc0bc5a7f15a2bdb654eb4141d7741;hb=22b2b54f1fae6b33583e588b5afc167ffdd99e11;hp=4a32c991115dbeff6f908efad7b90bc5922941c9;hpb=db9d9941618ed8641ed18c34a9968e51892979c6;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 4a32c99111..357592b6e7 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -20,122 +20,209 @@ * 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 +#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 ); + 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) - { - 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_root = p_export_root; + p_export->psz_filename = psz_filename; p_export->p_file = utf8_fopen( psz_filename, "wt" ); - if( !p_export->p_file ) + if( p_export->p_file == NULL ) + msg_Err( p_export, "could not create playlist file %s (%m)", + psz_filename ); + else { - msg_Err( p_playlist , "could not create playlist file %s" - " (%s)", psz_filename, strerror(errno) ); - return VLC_EGENERIC; - } + 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; +} - p_export->p_root = p_export_root; +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 ); - /* Lock the playlist */ - vlc_mutex_lock( &p_playlist->object_lock ); - p_playlist->p_private = (void *)p_export; + if( psz_uri == NULL ) + return 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 ) - { - msg_Warn( p_playlist, "exporting playlist failed" ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return VLC_ENOOBJ; - } - module_Unneed( p_playlist , p_module ); + p_input = input_item_NewExt( p_playlist, psz_uri, psz_file, + 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, -1 ); + free( psz_uri ); - /* 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 ); + playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END, + true, false ); + return input_Read( p_playlist, p_input ); +} - 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_libvlc->psz_homedir; + char *psz_datadir; + char *psz_uri = NULL; input_item_t *p_input; - if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; - if( !psz_homedir ) + psz_datadir = config_GetUserDir( VLC_DATA_DIR ); + + 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 ) + { /* 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; + } + } + + 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; + free( psz_datadir ); + psz_datadir = NULL; + if( psz_uri == NULL ) + return VLC_ENOMEM; + + 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, options, VLC_INPUT_OPTION_TRUSTED, -1 ); + free( psz_uri ); + if( p_input == NULL ) + return VLC_EGENERIC; + + 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 ); stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD ); - p_playlist->b_doing_ml = VLC_FALSE; - free( psz_uri ); + 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 ); return VLC_SUCCESS; } int playlist_MLDump( playlist_t *p_playlist ) { - char *psz_uri, *psz_homedir = p_playlist->p_libvlc->psz_homedir; - if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; - if( !psz_homedir ) + char *psz_datadir; + + psz_datadir = config_GetUserDir( VLC_DATA_DIR ); + + 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; }