/*****************************************************************************
* directory.c: expands a directory (directory: access plug-in)
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2008 the VideoLAN team
* $Id$
*
- * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Authors: Derk-Jan Hartman <hartman at videolan dot org>
+ * RĂ©mi Denis-Courmont
*
* 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
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc_playlist.h>
-
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
+
+#include <vlc_common.h>
+#include "fs.h"
+#include <vlc_access.h>
+
+#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
+# include <fcntl.h>
#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
+#include <vlc_fs.h>
+#include <vlc_url.h>
+#include <vlc_strings.h>
+
+enum
+{
+ MODE_NONE,
+ MODE_COLLAPSE,
+ MODE_EXPAND,
+};
+
+typedef struct directory_t directory_t;
+struct directory_t
+{
+ directory_t *parent;
+ DIR *handle;
+ char *uri;
+ char **filev;
+ int filec, i;
+#ifdef HAVE_OPENAT
+ dev_t device;
+ ino_t inode;
+#else
+ char *path;
#endif
+};
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
-
-static int DemuxOpen ( vlc_object_t * );
-
-#define RECURSIVE_TEXT N_("Subdirectory behavior")
-#define RECURSIVE_LONGTEXT N_( \
- "Select whether subdirectories must be expanded.\n" \
- "none: subdirectories do not appear in the playlist.\n" \
- "collapse: subdirectories appear but are expanded on first play.\n" \
- "expand: all subdirectories are expanded.\n" )
-
-static char *psz_recursive_list[] = { "none", "collapse", "expand" };
-static char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
- N_("expand") };
-
-vlc_module_begin();
- set_category( CAT_INPUT );
- set_shortname( _("Directory" ) );
- set_subcategory( SUBCAT_INPUT_ACCESS );
- set_description( _("Standard filesystem directory input") );
- set_capability( "access2", 55 );
- add_shortcut( "directory" );
- add_shortcut( "dir" );
- add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
- RECURSIVE_LONGTEXT, VLC_FALSE );
- change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
- set_callbacks( Open, Close );
-
- add_submodule();
- set_description( "Directory EOF");
- set_capability( "demux2", 0 );
- add_shortcut( "directory" );
- set_callbacks( DemuxOpen, NULL );
-vlc_module_end();
+struct access_sys_t
+{
+ directory_t *current;
+ char *ignored_exts;
+ char mode;
+ bool header;
+ int i_item_count;
+ char *xspf_ext;
+};
+
+/* Select non-hidden files only */
+static int visible (const char *name)
+{
+ return name[0] != '.';
+}
+static int collate (const char **a, const char **b)
+{
+#ifdef HAVE_STRCOLL
+ return strcoll (*a, *b);
+#else
+ return strcmp (*a, *b);
+#endif
+}
/*****************************************************************************
- * Local prototypes, constants, structures
+ * Open: open the directory
*****************************************************************************/
+int DirOpen( vlc_object_t *p_this )
+{
+ access_t *p_access = (access_t*)p_this;
-#define MODE_EXPAND 0
-#define MODE_COLLAPSE 1
-#define MODE_NONE 2
-
-static int Read( access_t *, uint8_t *, int );
-static int ReadNull( access_t *, uint8_t *, int );
-static int Control( access_t *, int, va_list );
-
-static int Demux( demux_t *p_demux );
-static int DemuxControl( demux_t *p_demux, int i_query, va_list args );
+ if( !p_access->psz_filepath )
+ return VLC_EGENERIC;
+ DIR *handle = vlc_opendir (p_access->psz_filepath);
+ if (handle == NULL)
+ return VLC_EGENERIC;
-static int ReadDir( playlist_t *, char *psz_name, int i_mode, int *pi_pos,
- playlist_item_t * );
+ return DirInit (p_access, handle);
+}
-/*****************************************************************************
- * Open: open the directory
- *****************************************************************************/
-static int Open( vlc_object_t *p_this )
+int DirInit (access_t *p_access, DIR *handle)
{
- access_t *p_access = (access_t*)p_this;
+ access_sys_t *p_sys = malloc (sizeof (*p_sys));
+ if (unlikely(p_sys == NULL))
+ goto error;
-#ifdef HAVE_SYS_STAT_H
- struct stat stat_info;
+ char *uri;
+ if (!strcmp (p_access->psz_access, "fd"))
+ {
+ if (asprintf (&uri, "fd://%s", p_access->psz_location) == -1)
+ uri = NULL;
+ }
+ else
+ uri = make_URI (p_access->psz_filepath, "file");
+ if (unlikely(uri == NULL))
+ goto error;
- if( ( stat( p_access->psz_path, &stat_info ) == -1 ) ||
- !S_ISDIR( stat_info.st_mode ) )
-#else
- if( strcmp( p_access->psz_access, "dir") &&
- strcmp( p_access->psz_access, "directory") )
-#endif
+ /* "Open" the base directory */
+ directory_t *root = malloc (sizeof (*root));
+ if (unlikely(root == NULL))
{
- return VLC_EGENERIC;
+ free (uri);
+ goto error;
}
+ root->parent = NULL;
+ root->handle = handle;
+ root->uri = uri;
+ root->filec = vlc_loaddir (handle, &root->filev, visible, collate);
+ if (root->filec < 0)
+ root->filev = NULL;
+ root->i = 0;
+#ifdef HAVE_OPENAT
+ struct stat st;
+ if (fstat (dirfd (handle), &st))
+ {
+ free (root);
+ free (uri);
+ goto error;
+ }
+ root->device = st.st_dev;
+ root->inode = st.st_ino;
+#else
+ root->path = strdup (p_access->psz_filepath);
+#endif
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
- p_access->pf_seek = NULL;
- p_access->pf_control= Control;
+ p_access->p_sys = p_sys;
+ p_sys->current = root;
+ p_sys->ignored_exts = var_InheritString (p_access, "ignore-filetypes");
+ p_sys->header = true;
+ p_sys->i_item_count = 0;
+ p_sys->xspf_ext = strdup ("");
+
+ /* Handle mode */
+ char *psz = var_InheritString (p_access, "recursive");
+ if (psz == NULL || !strcasecmp (psz, "none"))
+ p_sys->mode = MODE_NONE;
+ else if( !strcasecmp( psz, "collapse" ) )
+ p_sys->mode = MODE_COLLAPSE;
+ else
+ p_sys->mode = MODE_EXPAND;
+ free( psz );
- /* Force a demux */
- p_access->psz_demux = strdup( "directory" );
+ access_InitFields(p_access);
+ p_access->pf_read = NULL;
+ p_access->pf_block = DirBlock;
+ p_access->pf_seek = NULL;
+ p_access->pf_control= DirControl;
+ free (p_access->psz_demux);
+ p_access->psz_demux = strdup ("xspf-open");
return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Close: close the target
- *****************************************************************************/
-static void Close( vlc_object_t * p_this )
-{
-}
-/*****************************************************************************
- * ReadNull: read the directory
- *****************************************************************************/
-static int ReadNull( access_t *p_access, uint8_t *p_buffer, int i_len)
-{
- /* Return fake data */
- memset( p_buffer, 0, i_len );
- return i_len;
+error:
+ closedir (handle);
+ free (p_sys);
+ return VLC_EGENERIC;
}
/*****************************************************************************
- * Read: read the directory
+ * Close: close the target
*****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
+void DirClose( vlc_object_t * p_this )
{
- char *psz_name = NULL;
- char *psz;
- int i_mode, i_pos;
-
- playlist_item_t *p_item;
- vlc_bool_t b_play = VLC_FALSE;
-
- playlist_t *p_playlist =
- (playlist_t *) vlc_object_find( p_access,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ access_t *p_access = (access_t*)p_this;
+ access_sys_t *p_sys = p_access->p_sys;
- if( !p_playlist )
+ while (p_sys->current)
{
- msg_Err( p_access, "can't find playlist" );
- goto end;
+ directory_t *current = p_sys->current;
+
+ p_sys->current = current->parent;
+ closedir (current->handle);
+ free (current->uri);
+ while (current->i < current->filec)
+ free (current->filev[current->i++]);
+ free (current->filev);
+#ifndef HAVE_OPENAT
+ free (current->path);
+#endif
+ free (current);
}
- /* Remove the ending '/' char */
- psz_name = strdup( p_access->psz_path );
- if( psz_name == NULL )
- goto end;
+ free (p_sys->xspf_ext);
+ free (p_sys->ignored_exts);
+ free (p_sys);
+}
- if( (psz_name[strlen(psz_name)-1] == '/') ||
- (psz_name[strlen(psz_name)-1] == '\\') )
+#ifdef HAVE_OPENAT
+/* Detect directories that recurse into themselves. */
+static bool has_inode_loop (const directory_t *dir, dev_t dev, ino_t inode)
+{
+ while (dir != NULL)
{
- psz_name[strlen(psz_name)-1] = '\0';
+ if ((dir->device == dev) && (dir->inode == inode))
+ return true;
+ dir = dir->parent;
}
+ return false;
+}
+#endif
- /* Initialize structure */
- psz = var_CreateGetString( p_access, "recursive" );
- if( *psz == '\0' || !strncmp( psz, "none" , 4 ) )
- {
- i_mode = MODE_NONE;
- }
- else if( !strncmp( psz, "collapse", 8 ) )
- {
- i_mode = MODE_COLLAPSE;
- }
- else
- {
- i_mode = MODE_EXPAND;
+block_t *DirBlock (access_t *p_access)
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ directory_t *current = p_sys->current;
+
+ if (p_access->info.b_eof)
+ return NULL;
+
+ if (p_sys->header)
+ { /* Startup: send the XSPF header */
+ static const char header[] =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\" xmlns:vlc=\"http://www.videolan.org/vlc/playlist/ns/0/\">\n"
+ " <trackList>\n";
+ block_t *block = block_Alloc (sizeof (header) - 1);
+ if (!block)
+ goto fatal;
+ memcpy (block->p_buffer, header, sizeof (header) - 1);
+ p_sys->header = false;
+ return block;
}
- free( psz );
- /* Make sure we are deleted when we are done */
- /* The playlist position we will use for the add */
- i_pos = p_playlist->i_index + 1;
+ if (current->i >= current->filec)
+ { /* End of directory, go back to parent */
+ closedir (current->handle);
+ p_sys->current = current->parent;
+ free (current->uri);
+ free (current->filev);
+#ifndef HAVE_OPENAT
+ free (current->path);
+#endif
+ free (current);
+
+ if (p_sys->current == NULL)
+ { /* End of XSPF playlist */
+ char *footer;
+ int len = asprintf (&footer, " </trackList>\n"
+ " <extension application=\"http://www.videolan.org/"
+ "vlc/playlist/0\">\n"
+ "%s"
+ " </extension>\n"
+ "</playlist>\n", p_sys->xspf_ext ? p_sys->xspf_ext : "");
+ if (unlikely(len == -1))
+ goto fatal;
+
+ block_t *block = block_heap_Alloc (footer, footer, len);
+ if (unlikely(block == NULL))
+ free (footer);
+ p_access->info.b_eof = true;
+ return block;
+ }
+ else
+ {
+ /* This was the end of a "subnode" */
+ /* Write the ID to the extension */
+ char *old_xspf_ext = p_sys->xspf_ext;
+ if (old_xspf_ext != NULL
+ && asprintf (&p_sys->xspf_ext, "%s </vlc:node>\n",
+ old_xspf_ext ? old_xspf_ext : "") == -1)
+ p_sys->xspf_ext = NULL;
+ free (old_xspf_ext);
+ }
+ return NULL;
+ }
- msg_Dbg( p_access, "opening directory `%s'", psz_name );
+ char *entry = current->filev[current->i++];
- if( &p_playlist->status.p_item->input ==
- ((input_thread_t *)p_access->p_parent)->input.p_item )
+ /* Handle recursion */
+ if (p_sys->mode != MODE_COLLAPSE)
{
- p_item = p_playlist->status.p_item;
- b_play = VLC_TRUE;
- msg_Dbg( p_access, "starting directory playback");
- }
- else
- {
- input_item_t *p_current = ( (input_thread_t*)p_access->p_parent)->
- input.p_item;
- p_item = playlist_LockItemGetByInput( p_playlist, p_current );
- msg_Dbg( p_access, "not starting directory playback");
- if( !p_item )
+ DIR *handle;
+#ifdef HAVE_OPENAT
+ int fd = vlc_openat (dirfd (current->handle), entry, O_RDONLY);
+ if (fd == -1)
+ goto skip; /* File cannot be opened... forget it */
+
+ struct stat st;
+ if (fstat (fd, &st))
+ {
+ close (fd);
+ goto skip; /* cannot stat?! */
+ }
+ if (!S_ISDIR (st.st_mode))
+ {
+ close (fd);
+ goto notdir;
+ }
+ if (p_sys->mode == MODE_NONE
+ || has_inode_loop (current, st.st_dev, st.st_ino)
+ || (handle = fdopendir (fd)) == NULL)
+ {
+ close (fd);
+ goto skip;
+ }
+#else
+ char *path;
+ if (asprintf (&path, "%s/%s", current->path, entry) == -1)
+ goto skip;
+ if ((handle = vlc_opendir (path)) == NULL)
+ goto notdir;
+ if (p_sys->mode == MODE_NONE)
+ goto skip;
+#endif
+ directory_t *sub = malloc (sizeof (*sub));
+ if (unlikely(sub == NULL))
{
- msg_Dbg( p_playlist, "unable to find item in playlist");
- return -1;
+ closedir (handle);
+#ifndef HAVE_OPENAT
+ free (path);
+#endif
+ goto skip;
+ }
+ sub->parent = current;
+ sub->handle = handle;
+ sub->filec = vlc_loaddir (handle, &sub->filev, visible, collate);
+ if (sub->filec < 0)
+ sub->filev = NULL;
+ sub->i = 0;
+#ifdef HAVE_OPENAT
+ sub->device = st.st_dev;
+ sub->inode = st.st_ino;
+#else
+ sub->path = path;
+#endif
+ p_sys->current = sub;
+
+ char *encoded = encode_URI_component (entry);
+ if (encoded == NULL
+ || (asprintf (&sub->uri, "%s/%s", current->uri, encoded) == -1))
+ sub->uri = NULL;
+ free (encoded);
+ if (unlikely(sub->uri == NULL))
+ {
+ free (entry);
+ goto fatal;
}
- b_play = VLC_FALSE;
+
+ /* Add node to XSPF extension */
+ char *old_xspf_ext = p_sys->xspf_ext;
+ char *title = convert_xml_special_chars (entry);
+ if (old_xspf_ext != NULL && title != NULL
+ && asprintf (&p_sys->xspf_ext, "%s <vlc:node title=\"%s\">\n",
+ old_xspf_ext, title) == -1)
+ p_sys->xspf_ext = NULL;
+ free (old_xspf_ext);
+ free (title);
+ goto skip;
}
- p_item->input.i_type = ITEM_TYPE_DIRECTORY;
- if( ReadDir( p_playlist, psz_name , i_mode, &i_pos,
- p_item ) != VLC_SUCCESS )
+
+notdir:
+ /* Skip files with ignored extensions */
+ if (p_sys->ignored_exts != NULL)
{
+ const char *ext = strrchr (entry, '.');
+ if (ext != NULL)
+ {
+ size_t extlen = strlen (++ext);
+ for (const char *type = p_sys->ignored_exts, *end;
+ type[0]; type = end + 1)
+ {
+ end = strchr (type, ',');
+ if (end == NULL)
+ end = type + strlen (type);
+
+ if (type + extlen == end
+ && !strncasecmp (ext, type, extlen))
+ {
+ free (entry);
+ return NULL;
+ }
+
+ if (*end == '\0')
+ break;
+ }
+ }
}
-end:
- /* Begin to read the directory */
- if( b_play )
+ char *encoded = encode_URI_component (entry);
+ free (entry);
+ if (encoded == NULL)
+ goto fatal;
+ int len = asprintf (&entry,
+ " <track><location>%s/%s</location>\n" \
+ " <extension application=\"http://www.videolan.org/vlc/playlist/0\">\n" \
+ " <vlc:id>%d</vlc:id>\n" \
+ " </extension>\n" \
+ " </track>\n",
+ current->uri, encoded, p_sys->i_item_count++);
+ free (encoded);
+ if (len == -1)
+ goto fatal;
+
+ /* Write the ID to the extension */
+ char *old_xspf_ext = p_sys->xspf_ext;
+ if (old_xspf_ext != NULL
+ && asprintf (&p_sys->xspf_ext, "%s <vlc:item tid=\"%i\" />\n",
+ old_xspf_ext, p_sys->i_item_count - 1) == -1)
+ p_sys->xspf_ext = NULL;
+ free (old_xspf_ext);
+
+ block_t *block = block_heap_Alloc (entry, entry, len);
+ if (unlikely(block == NULL))
{
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- p_playlist->status.i_view,
- p_playlist->status.p_item, NULL );
+ free (entry);
+ goto fatal;
}
- if( psz_name ) free( psz_name );
- vlc_object_release( p_playlist );
+ return block;
- /* Return fake data forever */
- p_access->pf_read = ReadNull;
- return ReadNull( p_access, p_buffer, i_len );
+fatal:
+ p_access->info.b_eof = true;
+ return NULL;
+
+skip:
+ free (entry);
+ return NULL;
}
/*****************************************************************************
- * DemuxOpen:
+ * Control:
*****************************************************************************/
-static int Control( access_t *p_access, int i_query, va_list args )
+int DirControl( access_t *p_access, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
- int *pi_int;
- int64_t *pi_64;
-
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
+ *va_arg( args, bool* ) = false;
+ break;
+
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_FALSE; /* FIXME */
+ *va_arg( args, bool* ) = true;
break;
/* */
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = 0;
- break;
-
case ACCESS_GET_PTS_DELAY:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = DEFAULT_PTS_DELAY * 1000;
+ *va_arg( args, int64_t * ) = DEFAULT_PTS_DELAY * 1000;
break;
/* */
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
+ case ACCESS_GET_CONTENT_TYPE:
+ case ACCESS_GET_META:
return VLC_EGENERIC;
default:
}
return VLC_SUCCESS;
}
-
-/*****************************************************************************
- * DemuxOpen:
- *****************************************************************************/
-static int DemuxOpen ( vlc_object_t *p_this )
-{
- demux_t *p_demux = (demux_t*)p_this;
-
- if( strcmp( p_demux->psz_demux, "directory" ) )
- return VLC_EGENERIC;
-
- p_demux->pf_demux = Demux;
- p_demux->pf_control = DemuxControl;
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Demux: EOF
- *****************************************************************************/
-static int Demux( demux_t *p_demux )
-{
- return 0;
-}
-/*****************************************************************************
- * DemuxControl:
- *****************************************************************************/
-static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
-{
- return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
-}
-
-#if defined(SYS_BEOS) || defined(WIN32)
-/* BeOS doesn't have scandir/alphasort/versionsort */
-static int alphasort( const struct dirent **a, const struct dirent **b )
-{
- return strcoll( (*a)->d_name, (*b)->d_name );
-}
-
-static int scandir( const char *name, struct dirent ***namelist,
- int (*filter) ( const struct dirent * ),
- int (*compar) ( const struct dirent **,
- const struct dirent ** ) )
-{
- DIR * p_dir;
- struct dirent * p_content;
- struct dirent ** pp_list;
- int ret, size;
-
- if( !namelist || !( p_dir = opendir( name ) ) ) return -1;
-
- ret = 0;
- pp_list = NULL;
- while( ( p_content = readdir( p_dir ) ) )
- {
- if( filter && !filter( p_content ) )
- {
- continue;
- }
- pp_list = realloc( pp_list, ( ret + 1 ) * sizeof( struct dirent * ) );
- size = sizeof( struct dirent ) + strlen( p_content->d_name ) + 1;
- pp_list[ret] = malloc( size );
- memcpy( pp_list[ret], p_content, size );
- ret++;
- }
-
- closedir( p_dir );
-
- if( compar )
- {
- qsort( pp_list, ret, sizeof( struct dirent * ),
- (int (*)(const void *, const void *)) compar );
- }
-
- *namelist = pp_list;
- return ret;
-}
-#endif
-
-static int Filter( const struct dirent *foo )
-{
- return VLC_TRUE;
-}
-/*****************************************************************************
- * ReadDir: read a directory and add its content to the list
- *****************************************************************************/
-static int ReadDir( playlist_t *p_playlist,
- char *psz_name , int i_mode, int *pi_position,
- playlist_item_t *p_parent )
-{
- struct dirent *p_dir_content;
- struct dirent **pp_dir_content;
- int i_dir_content, i = 0;
- playlist_item_t *p_node;
-
- /* Change the item to a node */
- if( p_parent->i_children == -1 )
- {
- playlist_LockItemToNode( p_playlist,p_parent );
- }
-
- /* get the first directory entry */
- i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort );
- if( i_dir_content == -1 )
- {
- msg_Warn( p_playlist, "Failed to read directory" );
- return VLC_EGENERIC;
- }
- else if( i_dir_content <= 0 )
- {
- /* directory is empty */
- return VLC_SUCCESS;
- }
- p_dir_content = pp_dir_content[0];
-
- /* while we still have entries in the directory */
- while( i < i_dir_content )
- {
- int i_size_entry = strlen( psz_name ) +
- strlen( p_dir_content->d_name ) + 2;
- char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
-
- sprintf( psz_uri, "%s/%s", psz_name, p_dir_content->d_name );
-
- /* if it starts with '.' then forget it */
- if( p_dir_content->d_name[0] != '.' )
- {
-#if defined( S_ISDIR )
- struct stat stat_data;
- stat( psz_uri, &stat_data );
- if( S_ISDIR(stat_data.st_mode) && i_mode != MODE_COLLAPSE )
-#elif defined( DT_DIR )
- if( ( p_dir_content->d_type & DT_DIR ) && i_mode != MODE_COLLAPSE )
-#else
- if( 0 )
-#endif
- {
- if( i_mode == MODE_NONE )
- {
- msg_Dbg( p_playlist, "Skipping subdirectory %s", psz_uri );
- i++;
- p_dir_content = pp_dir_content[i];
- continue;
- }
- else if(i_mode == MODE_EXPAND )
- {
- char *psz_newname;
- msg_Dbg(p_playlist, "Reading subdirectory %s", psz_uri );
-
- if( !strncmp( psz_uri, psz_name, strlen( psz_name ) ) )
- {
- char *psz_subdir = psz_uri;
- /* Skip the parent path + the separator */
- psz_subdir += strlen( psz_name ) + 1;
- psz_newname = strdup( psz_subdir );
- }
- else
- {
- psz_newname = strdup( psz_uri );
- }
- p_node = playlist_NodeCreate( p_playlist,
- p_parent->pp_parents[0]->i_view,
- psz_newname, p_parent );
-
- playlist_CopyParents( p_parent, p_node );
-
- p_node->input.i_type = ITEM_TYPE_DIRECTORY;
-
- if( ReadDir( p_playlist, psz_uri , MODE_EXPAND,
- pi_position, p_node ) != VLC_SUCCESS )
- {
- return VLC_EGENERIC;
- }
-
- free( psz_newname );
- }
- }
- else
- {
- playlist_item_t *p_item = playlist_ItemNewWithType(
- p_playlist,
- psz_uri,
- p_dir_content->d_name,
- ITEM_TYPE_VFILE );
- playlist_NodeAddItem( p_playlist,p_item,
- p_parent->pp_parents[0]->i_view,
- p_parent,
- PLAYLIST_APPEND, PLAYLIST_END );
-
- playlist_CopyParents( p_parent, p_item );
- }
- }
- free( psz_uri );
- i++;
- p_dir_content = pp_dir_content[i];
- }
- free( pp_dir_content );
- return VLC_SUCCESS;
-}