X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=537a3de06cf7340895d195bb145b28b8f0496e91;hb=fe3726deb89923477e320af1953887a9132fe628;hp=10945281e50ee37c8fed6939fb281d7c5b230476;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 10945281e5..537a3de06c 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -20,137 +20,198 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include /* free(), strtol() */ -#include /* sprintf() */ -#include /* strerror() */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include "playlist_internal.h" +#include "config/configuration.h" +#include + +#include +#include +#include #include -#include -#include -#include -#include - -#include "vlc_playlist.h" - -#define PLAYLIST_FILE_HEADER "# vlc playlist file version 0.5" - -/** - * Import a certain playlist file into the library - * This file will get inserted as a new category - * - * XXX: TODO - * \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 ) +int playlist_Export( playlist_t * p_playlist, const char *psz_filename , + playlist_item_t *p_export_root,const char *psz_type ) { - playlist_item_t *p_item; - char *psz_uri; - int i_id; + module_t *p_module; + playlist_export_t *p_export; - msg_Info( p_playlist, "clearing playlist"); - playlist_Clear( p_playlist ); + 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 ); - psz_uri = (char *)malloc(sizeof(char)*strlen(psz_filename) + 17 ); - sprintf( psz_uri, "file/playlist://%s", psz_filename); + /* 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 = 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 (%m)", + psz_filename ); + free( p_export->psz_filename ); + free( p_export ); + return VLC_EGENERIC; + } - i_id = playlist_Add( p_playlist, psz_uri, psz_uri, - PLAYLIST_INSERT , PLAYLIST_END); + p_export->p_root = p_export_root; - vlc_mutex_lock( &p_playlist->object_lock ); - p_item = playlist_ItemGetById( p_playlist, i_id ); - p_item->b_autodeletion = VLC_TRUE; - vlc_mutex_unlock( &p_playlist->object_lock ); + /* Lock the playlist */ + vlc_object_lock( p_playlist ); + p_playlist->p_private = (void *)p_export; - playlist_Play(p_playlist); + /* And call the module ! All work is done now */ + int i_ret; + p_module = module_need( p_playlist, "playlist export", psz_type, true); + if( !p_module ) + { + msg_Warn( p_playlist, "exporting playlist failed" ); + i_ret = VLC_ENOOBJ; + } + else + { + module_unneed( p_playlist , p_module ); + i_ret = VLC_SUCCESS; + } - return VLC_SUCCESS; + /* 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 ); + + return i_ret; } -/** - * Load a certain playlist file into the playlist - * This file will replace the contents of the "current" 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_Load( playlist_t * p_playlist, const char *psz_filename ) +/***************************************************************************** + * 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_item_t *p_item; - char *psz_uri; - int i_id; - - msg_Info( p_playlist, "clearing playlist"); - playlist_Clear( p_playlist ); - + playlist_t *p_playlist = user_data; + input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child; - psz_uri = (char *)malloc(sizeof(char)*strlen(psz_filename) + 17 ); - sprintf( psz_uri, "file/playlist://%s", psz_filename); - - i_id = playlist_Add( p_playlist, psz_uri, psz_uri, - PLAYLIST_INSERT , PLAYLIST_END); - - vlc_mutex_lock( &p_playlist->object_lock ); - p_item = playlist_ItemGetById( p_playlist, i_id ); - p_item->b_autodeletion = VLC_TRUE; - vlc_mutex_unlock( &p_playlist->object_lock ); - - playlist_Play(p_playlist); - - return VLC_SUCCESS; + /* 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 ); } -/** - * Export a 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 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 , - const char *psz_type) +int playlist_MLLoad( playlist_t *p_playlist ) { - module_t *p_module; - playlist_export_t *p_export; + char *psz_datadir = config_GetUserDataDir(); + char *psz_uri = NULL; + input_item_t *p_input; - msg_Info( p_playlist, "saving playlist to file %s", psz_filename ); + if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; + if( !psz_datadir ) /* XXX: This should never happen */ + { + msg_Err( p_playlist, "no data directory, cannot load media library") ; + return VLC_EGENERIC; + } - /* Prepare the playlist_export_t structure */ - p_export = (playlist_export_t *)malloc( sizeof(playlist_export_t) ); - if( !p_export) + if( asprintf( &psz_uri, "%s" DIR_SEP "ml.xspf", psz_datadir ) == -1 ) { - msg_Err( p_playlist, "out of memory"); - return VLC_ENOMEM; + psz_uri = NULL; + goto error; } - p_export->p_file = fopen( psz_filename, "wt" ); - if( !p_export->p_file ) + 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 ) { - msg_Err( p_playlist , "could not create playlist file %s" - " (%s)", psz_filename, strerror(errno) ); - return VLC_EGENERIC; + 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; + /* 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; + + stats_TimerStart( p_playlist, "ML Load", STATS_TIMER_ML_LOAD ); + input_Read( p_playlist, p_input, true ); + stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD ); + + 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 ); + return VLC_SUCCESS; - p_playlist->p_private = (void *)p_export; - /* Lock the playlist */ - vlc_mutex_lock( &p_playlist->object_lock ); +error: + free( psz_uri ); + free( psz_datadir ); + return VLC_ENOMEM; +} - /* And call the module ! All work is done now */ - p_module = module_Need( p_playlist, "playlist export", psz_type, VLC_TRUE); - if( !p_module ) +int playlist_MLDump( playlist_t *p_playlist ) +{ + char *psz_datadir = config_GetUserDataDir(); + if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; + if( !psz_datadir ) /* XXX: This should never happen */ { - msg_Warn( p_playlist, "failed to export playlist" ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return VLC_ENOOBJ; + msg_Err( p_playlist, "no data directory, cannot save media library") ; + return VLC_EGENERIC; } - module_Unneed( p_playlist , p_module ); - fclose( p_export->p_file ); + 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; + } + + strcat( psz_dirname, DIR_SEP "ml.xspf" ); - vlc_mutex_unlock( &p_playlist->object_lock ); + stats_TimerStart( p_playlist, "ML Dump", STATS_TIMER_ML_DUMP ); + playlist_Export( p_playlist, psz_dirname, p_playlist->p_ml_category, + "export-xspf" ); + stats_TimerStop( p_playlist, STATS_TIMER_ML_DUMP ); return VLC_SUCCESS; }