X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=85a3e9eb8bb54d966038a385b86f574f99f280ec;hb=d6ee0fb364a634b1eba8e2db002430e2ed1ee6e1;hp=e542b872d5ddfedc2e432eb5b11c8b5a44530bcb;hpb=acbad93b8b447ac9f776a53bf3e8f74f15132fe4;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index e542b872d5..85a3e9eb8b 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -1,193 +1,190 @@ /***************************************************************************** * loadsave.c : Playlist loading / saving functions ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2004 VLC authors and VideoLAN * $Id$ * * Authors: Samuel Hocevar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include +#include + #include #include #include #include "playlist_internal.h" #include "config/configuration.h" -#include +#include +#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 ); - - /* Prepare the playlist_export_t structure */ - p_export = (playlist_export_t *)malloc( sizeof(playlist_export_t) ); - if( !p_export) + playlist_export_t *p_export = + vlc_custom_create( p_playlist, sizeof( *p_export ), "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; + msg_Dbg( p_export, "saving %s to file %s", + p_export_root->p_input->psz_name, psz_filename ); - /* Lock the playlist */ - vlc_object_lock( p_playlist ); - 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, 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_object_unlock( p_playlist ); - 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 ); - free( p_export->psz_filename ); - free ( p_export ); - p_playlist->p_private = NULL; - vlc_object_unlock( p_playlist ); +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 = vlc_path2uri( psz_file, NULL ); - return VLC_SUCCESS; + if( psz_uri == NULL ) + return VLC_EGENERIC; + + p_input = input_item_NewExt( 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; + input_item_node_t *p_root = + p_event->u.input_item_subitem_tree_added.p_root; - /* 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 ); + PL_LOCK; + playlist_InsertInputItemTree ( p_playlist, p_playlist->p_media_library, + p_root, 0, false ); + PL_UNLOCK; } int playlist_MLLoad( playlist_t *p_playlist ) { - char *psz_datadir = config_GetUserDataDir(); - 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 ) ) - goto error; - 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; - /* 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 ) + /* lousy check for media library file */ + struct stat st; + if( vlc_stat( psz_file, &st ) ) { - psz_uri = NULL; - goto error; + free( psz_file ); + return VLC_EGENERIC; } - free( psz_datadir ); - psz_datadir = NULL; - const char *const psz_option = "meta-file"; - /* that option has to be cleaned in input_item_subitem_added() */ + char *psz_uri = vlc_path2uri( psz_file, "file/xspf-open" ); + free( psz_file ); + if( psz_uri == NULL ) + return VLC_ENOMEM; + + 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, &psz_option, -1 ); + p_input = input_item_NewExt( 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 ) - 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 ); + if( p_playlist->p_media_library->p_input ) + vlc_gc_decref( p_playlist->p_media_library->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 ); + p_playlist->p_media_library->p_input = p_input; - vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, - input_item_subitem_added, p_playlist ); + vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded, + input_item_subitem_tree_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 ); - input_Read( p_playlist, p_input, true ); - stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD ); + input_Read( p_playlist, p_input ); 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_event_detach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded, + input_item_subitem_tree_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; + + 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") ; @@ -204,10 +201,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" ); - stats_TimerStop( p_playlist, STATS_TIMER_ML_DUMP ); return VLC_SUCCESS; }