SD: remove category node when it becomes empty

[vlc] / src / playlist / loadsave.c

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 7477b67c6255f41c3786674fb5cf8408b3e98c85..968105833636c9756fb02b023ac3a3e7d898c14b 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -29,13 +29,12 @@
 #include <vlc_events.h>
 #include "playlist_internal.h"
 #include "config/configuration.h"
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_url.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
 
 int playlist_Export( playlist_t * p_playlist, const char *psz_filename,
                      playlist_item_t *p_export_root, const char *psz_type )
@@ -57,7 +56,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename,
     /* Prepare the playlist_export_t structure */
     p_export->p_root = p_export_root;
     p_export->psz_filename = psz_filename;
-    p_export->p_file = utf8_fopen( psz_filename, "wt" );
+    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 );
@@ -98,22 +97,23 @@ int playlist_Import( playlist_t *p_playlist, const char *psz_file )
 
     playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END,
                        true, false );
-    return input_Read( p_playlist, p_input, true );
+    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, !pl_priv(p_playlist)->b_tree );
+    PL_UNLOCK;
 }
 
 int playlist_MLLoad( playlist_t *p_playlist )
@@ -122,10 +122,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
     char *psz_uri = NULL;
     input_item_t *p_input;
 
-    if( !config_GetInt( p_playlist, "media-library") )
-        return VLC_SUCCESS;
-
-    psz_datadir = config_GetUserDataDir();
+    psz_datadir = config_GetUserDir( VLC_DATA_DIR );
 
     if( !psz_datadir ) /* XXX: This should never happen */
     {
@@ -136,7 +133,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
     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 );
+        int ret = vlc_stat( psz_uri , &st );
         free( psz_uri );
         if( ret )
         {
@@ -160,7 +157,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
         return VLC_ENOMEM;
 
     const char *const options[1] = { "meta-file", };
-    /* that option has to be cleaned in input_item_subitem_added() */
+    /* 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 );
@@ -169,35 +166,28 @@ int playlist_MLLoad( playlist_t *p_playlist )
         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 );
 
     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 );
+    input_Read( p_playlist, p_input );
     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_event_detach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded,
+                        input_item_subitem_tree_added, p_playlist );
 
-    vlc_gc_decref( p_input );
     return VLC_SUCCESS;
 }
 
@@ -205,10 +195,7 @@ int playlist_MLDump( playlist_t *p_playlist )
 {
     char *psz_datadir;
 
-    if( !config_GetInt( p_playlist, "media-library") )
-        return VLC_SUCCESS;
-
-    psz_datadir = config_GetUserDataDir();
+    psz_datadir = config_GetUserDir( VLC_DATA_DIR );
 
     if( !psz_datadir ) /* XXX: This should never happen */
     {
@@ -227,7 +214,7 @@ 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 );