/*****************************************************************************
* directory.c: expands a directory (directory: access plug-in)
*****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
* $Id$
*
* 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>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_access.h>
-#include <stdlib.h>
-#include <string.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#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>
#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
-#elif defined( UNDER_CE )
-# define strcoll strcmp
#endif
#ifdef HAVE_DIRENT_H
# include <dirent.h>
#endif
-#include "charset.h"
+#include <vlc_charset.h>
+#include <vlc_url.h>
/*****************************************************************************
* 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" \
"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") };
+static const char *const psz_recursive_list[] = { "none", "collapse", "expand" };
+static const char *const psz_recursive_list_text[] = {
+ N_("none"), N_("collapse"), N_("expand") };
-#define IGNORE_TEXT N_("Ignore files with these extensions")
+#define IGNORE_TEXT N_("Ignored extensions")
#define IGNORE_LONGTEXT N_( \
- "Specify a comma seperated list of file extensions. " \
- "Files with these extensions will not be added to playlist when opening a directory. " \
- "This is useful if you add directories that contain mp3 albums for instance." )
-
-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" );
+ "Files with these extensions will not be added to playlist when " \
+ "opening a directory.\n" \
+ "This is useful if you add directories that contain playlist files " \
+ "for instance. Use a comma-separated list of extensions." )
+
+vlc_module_begin ()
+ set_category( CAT_INPUT )
+ set_shortname( N_("Directory" ) )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
+ set_description( N_("Standard filesystem directory input") )
+ set_capability( "access", 55 )
+ add_shortcut( "directory" )
+ add_shortcut( "dir" )
+ add_shortcut( "file" )
add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
- RECURSIVE_LONGTEXT, VLC_FALSE );
- change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
-#ifdef HAVE_STRSEP
- add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
- NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
-#endif
- set_callbacks( Open, Close );
-
- add_submodule();
- set_description( "Directory EOF");
- set_capability( "demux2", 0 );
- add_shortcut( "directory" );
- set_callbacks( DemuxOpen, NULL );
-vlc_module_end();
+ RECURSIVE_LONGTEXT, false )
+ change_string_list( psz_recursive_list, psz_recursive_list_text, 0 )
+ add_string( "ignore-filetypes", "m3u,db,nfo,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa",
+ NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes, constants, structures
*****************************************************************************/
-#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 );
+enum
+{
+ MODE_EXPAND,
+ MODE_COLLAPSE,
+ MODE_NONE
+};
+typedef struct directory_t directory_t;
+struct directory_t
+{
+ directory_t *parent;
+ DIR *handle;
+ char *uri;
+#ifndef WIN32
+ struct stat st;
+#endif
+ char path[1];
+};
-static int ReadDir( playlist_t *, char *psz_name, int i_mode, int *pi_pos,
- playlist_item_t * );
+struct access_sys_t
+{
+ directory_t *current;
+ DIR *handle;
+ char *ignored_exts;
+ int mode;
+ int i_item_count;
+ char *psz_xspf_extension;
+};
+
+static block_t *Block( access_t * );
+static int Control( access_t *, int, va_list );
/*****************************************************************************
* Open: open the directory
static int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
+ access_sys_t *p_sys;
-#ifdef HAVE_SYS_STAT_H
- struct stat stat_info;
- char *psz_path = ToLocale( p_access->psz_path );
-
- if( ( stat( psz_path, &stat_info ) == -1 ) ||
- !S_ISDIR( stat_info.st_mode ) )
-#elif defined(WIN32)
- int i_ret;
-
-# ifdef UNICODE
- wchar_t psz_path[MAX_PATH];
- mbstowcs( psz_path, p_access->psz_path, MAX_PATH );
- psz_path[MAX_PATH-1] = 0;
-# else
- char *psz_path = p_access->psz_path;
-# endif /* UNICODE */
-
- i_ret = GetFileAttributes( psz_path );
- if( i_ret == -1 || !(i_ret & FILE_ATTRIBUTE_DIRECTORY) )
+ if( !p_access->psz_path )
+ return VLC_EGENERIC;
+ DIR *handle;
+ if (strcmp (p_access->psz_path, "-"))
+ handle = utf8_opendir (p_access->psz_path);
+ else
+ {
+#if 0 /* This won't work yet, it generates paths like "-/music.ogg".
+ * We'd need to use openat() here and in the file access... */
+ int fd = dup (0);
+ handle = fdopendir (fd);
+ if (handle == NULL)
+ close (fd);
#else
- if( strcmp( p_access->psz_access, "dir") &&
- strcmp( p_access->psz_access, "directory") )
+ return VLC_EGENERIC;
#endif
- {
- LocaleFree( psz_path );
+ }
+
+ if (handle == NULL)
return VLC_EGENERIC;
+
+ p_sys = malloc (sizeof (*p_sys));
+ if (!p_sys)
+ {
+ closedir( handle );
+ return VLC_ENOMEM;
}
- LocaleFree( psz_path );
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
+ p_access->p_sys = p_sys;
+ p_sys->current = NULL;
+ p_sys->handle = handle;
+ p_sys->ignored_exts = var_CreateGetString (p_access, "ignore-filetypes");
+ p_sys->i_item_count = 0;
+ p_sys->psz_xspf_extension = strdup( "" );
+
+ /* Handle mode */
+ char *psz = var_CreateGetString( p_access, "recursive" );
+ if( *psz == '\0' || !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 );
+
+ p_access->pf_read = NULL;
+ p_access->pf_block = Block;
p_access->pf_seek = NULL;
p_access->pf_control= Control;
-
- /* Force a demux */
- p_access->psz_demux = strdup( "directory" );
+ free (p_access->psz_demux);
+ p_access->psz_demux = strdup ("xspf-open");
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
-}
+ access_t *p_access = (access_t*)p_this;
+ access_sys_t *p_sys = p_access->p_sys;
-/*****************************************************************************
- * 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;
+ while (p_sys->current)
+ {
+ directory_t *current = p_sys->current;
+
+ p_sys->current = current->parent;
+ closedir (current->handle);
+ free (current->uri);
+ free (current);
+ }
+ if (p_sys->handle != NULL)
+ closedir (p_sys->handle); /* corner case,:Block() not called ever */
+ free (p_sys->psz_xspf_extension);
+ free (p_sys->ignored_exts);
+ free (p_sys);
}
-/*****************************************************************************
- * Read: read the directory
- *****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
+/**
+ * URI-encodes a file path. The only reserved characters is slash.
+ */
+static char *encode_path (const char *path)
{
- char *psz_name = NULL;
- char *psz;
- int i_mode, i_pos;
+ static const char sep[]= "%2F";
+ char *enc = encode_URI_component (path), *ptr = enc;
- playlist_item_t *p_item;
- vlc_bool_t b_play = VLC_FALSE;
+ if (enc == NULL)
+ return NULL;
- playlist_t *p_playlist =
- (playlist_t *) vlc_object_find( p_access,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-
- if( !p_playlist )
+ /* Replace '%2F' with '/'. TODO: extend encode_URI*() */
+ /* (On Windows, both ':' and '\\' will be encoded) */
+ while ((ptr = strstr (ptr, sep)) != NULL)
{
- msg_Err( p_access, "can't find playlist" );
- goto end;
+ *ptr++ = '/';
+ memmove (ptr, ptr + 2, strlen (ptr) - 1);
}
- else
- {
- char *ptr;
+ return enc;
+}
- psz_name = ToLocale( p_access->psz_path );
- ptr = strdup( psz_name );
- LocaleFree( psz_name );
- if( ptr == NULL )
- goto end;
+/* Detect directories that recurse into themselves. */
+static bool has_inode_loop (const directory_t *dir)
+{
+#ifndef WIN32
+ dev_t dev = dir->st.st_dev;
+ ino_t inode = dir->st.st_ino;
- psz_name = ptr;
+ while ((dir = dir->parent) != NULL)
+ if ((dir->st.st_dev == dev) && (dir->st.st_ino == inode))
+ return true;
+#else
+# define fstat( fd, st ) (0)
+#endif
+ return false;
+}
- /* Remove the ending '/' char */
- ptr += strlen( ptr );
- if( ( ptr > psz_name ) )
+static block_t *Block (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 (current == NULL)
+ { /* 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);
+
+ /* "Open" the base directory */
+ current = malloc (sizeof (*current) + strlen (p_access->psz_path));
+ if (current == NULL)
{
- switch( *--ptr )
- {
- case '/':
- case '\\':
- *ptr = '\0';
- }
+ block_Release (block);
+ goto fatal;
+ }
+ current->parent = NULL;
+ current->handle = p_sys->handle;
+ strcpy (current->path, p_access->psz_path);
+ current->uri = encode_path (current->path);
+ if ((current->uri == NULL)
+ || fstat (dirfd (current->handle), ¤t->st))
+ {
+ free (current->uri);
+ free (current);
+ block_Release (block);
+ goto fatal;
}
- }
- /* Initialize structure */
- psz = var_CreateGetString( p_access, "recursive" );
- if( *psz == '\0' || !strncmp( psz, "none" , 4 ) )
- {
- i_mode = MODE_NONE;
+ p_sys->handle = NULL;
+ p_sys->current = current;
+ return block;
}
- else if( !strncmp( psz, "collapse", 8 ) )
- {
- i_mode = MODE_COLLAPSE;
+
+ char *entry = utf8_readdir (current->handle);
+ if (entry == NULL)
+ { /* End of directory, go back to parent */
+ closedir (current->handle);
+ p_sys->current = current->parent;
+ 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->psz_xspf_extension );
+ if( len < 0 )
+ goto fatal;
+
+ block_t *block = block_Alloc ( len );
+ if (!block)
+ goto fatal;
+ memcpy (block->p_buffer, footer, len);
+ 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_extension = p_sys->psz_xspf_extension;
+ if (old_xspf_extension == NULL)
+ goto fatal;
+
+ int len2 = asprintf( &p_sys->psz_xspf_extension, "%s </vlc:node>\n", old_xspf_extension );
+ if (len2 == -1)
+ goto fatal;
+ free( old_xspf_extension );
+ }
+ return NULL;
}
- else
+
+ /* Skip current, parent and hidden directories */
+ if (entry[0] == '.')
+ return NULL;
+ /* Handle recursion */
+ if (p_sys->mode != MODE_COLLAPSE)
{
- i_mode = MODE_EXPAND;
- }
- free( psz );
+ directory_t *sub = malloc (sizeof (*sub) + strlen (current->path) + 1
+ + strlen (entry));
+ if (sub == NULL)
+ return NULL;
+ sprintf (sub->path, "%s/%s", current->path, entry);
+
+ DIR *handle = utf8_opendir (sub->path);
+ if (handle != NULL)
+ {
+ sub->parent = current;
+ sub->handle = handle;
+
+ char *encoded = encode_URI_component (entry);
+ if ((encoded == NULL)
+ || (asprintf (&sub->uri, "%s/%s", current->uri, encoded) == -1))
+ sub->uri = NULL;
+ free (encoded);
+
+ if ((p_sys->mode == MODE_NONE)
+ || fstat (dirfd (handle), &sub->st)
+ || has_inode_loop (sub)
+ || (sub->uri == NULL))
+ {
+ closedir (handle);
+ free (sub);
+ return NULL;
+ }
+ p_sys->current = sub;
- /* 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;
+ /* Add node to xspf extension */
+ char *old_xspf_extension = p_sys->psz_xspf_extension;
+ if (old_xspf_extension == NULL)
+ goto fatal;
- msg_Dbg( p_access, "opening directory `%s'", p_access->psz_path );
+ int len2 = asprintf( &p_sys->psz_xspf_extension, "%s <vlc:node title=\"%s\">\n", old_xspf_extension, entry );
+ if (len2 == -1)
+ goto fatal;
+ free( old_xspf_extension );
- if( &p_playlist->status.p_item->input ==
- ((input_thread_t *)p_access->p_parent)->input.p_item )
- {
- 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 )
- {
- msg_Dbg( p_playlist, "unable to find item in playlist");
- return -1;
+ return NULL;
}
- b_play = VLC_FALSE;
+ else
+ free (sub);
}
- p_item->input.i_type = ITEM_TYPE_DIRECTORY;
- if( ReadDir( p_playlist, psz_name , i_mode, &i_pos,
- p_item ) != VLC_SUCCESS )
+ /* 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))
+ 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>file://%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_extension = p_sys->psz_xspf_extension;
+ if (old_xspf_extension == NULL)
+ goto fatal;
+
+ int len2 = asprintf( &p_sys->psz_xspf_extension, "%s <vlc:item tid=\"%i\" />\n",
+ old_xspf_extension, p_sys->i_item_count-1 );
+ if (len2 == -1)
+ goto fatal;
+ free( old_xspf_extension );
+
+ /* TODO: new block allocator for malloc()ated data */
+ block_t *block = block_Alloc (len);
+ if (!block)
{
- 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 );
+ memcpy (block->p_buffer, entry, len);
+ free (entry);
+ 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;
}
/*****************************************************************************
- * DemuxOpen:
+ * Control:
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
- int *pi_int;
- int64_t *pi_64;
+ bool *pb_bool;
+ int64_t *pi_64;
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_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 */
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_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;
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 );
-}
-
-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 **pp_dir_content;
- int i_dir_content, i;
- playlist_item_t *p_node;
-
- /* Build array with ignores */
-#ifdef HAVE_STRSEP
- char **ppsz_extensions = 0;
- int i_extensions = 0;
- char *psz_ignore = var_CreateGetString( p_playlist, "ignore-filetypes" );
- if( psz_ignore && *psz_ignore )
- {
- char *psz_backup;
- char *psz_parser = psz_backup = strdup( psz_ignore );
- int a = 0;
-
- while( strsep( &psz_parser, "," ) ) i_extensions++;
- free( psz_backup );
-
- ppsz_extensions = (char **)malloc( sizeof( char * ) * i_extensions );
-
- psz_parser = psz_ignore;
- while( a < i_extensions &&
- ( ppsz_extensions[a++] = strsep( &psz_parser, "," ) ) );
- }
-#endif /* HAVE_STRSEP */
-
- /* 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;
- }
-
- /* While we still have entries in the directory */
- for( i = 0; i < i_dir_content; i++ )
- {
- struct dirent *p_dir_content = pp_dir_content[i];
- 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;
-
- if( !stat( psz_uri, &stat_data )
- && 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 );
- free( psz_uri );
- continue;
- }
- else if( i_mode == MODE_EXPAND )
- {
- char *psz_newname, *psz_tmp;
- msg_Dbg(p_playlist, "Reading subdirectory %s", psz_uri );
-
- psz_tmp = FromLocale( p_dir_content->d_name );
- psz_newname = vlc_fix_readdir_charset(
- p_playlist, psz_tmp );
- LocaleFree( psz_tmp );
-
- 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;
- }
-
- /* an strdup() just because of Mac OS X */
- free( psz_newname );
- }
- }
- else
- {
- playlist_item_t *p_item;
- char *psz_tmp1, *psz_tmp2, *psz_loc;
-
-#ifdef HAVE_STRSEP
- if( i_extensions > 0 )
- {
- char *psz_dot = strrchr( p_dir_content->d_name, '.' );
- if( psz_dot++ && *psz_dot )
- {
- int a;
- for( a = 0; a < i_extensions; a++ )
- {
- if( !strcmp( psz_dot, ppsz_extensions[a] ) )
- break;
- }
- if( a < i_extensions )
- {
- msg_Dbg( p_playlist, "Ignoring file %s", psz_uri );
- free( psz_uri );
- continue;
- }
- }
- }
-#endif /* HAVE_STRSEP */
-
- psz_loc = FromLocale( psz_uri );
- psz_tmp1 = vlc_fix_readdir_charset( VLC_OBJECT(p_playlist),
- psz_loc );
- LocaleFree( psz_loc );
-
- psz_loc = FromLocale( p_dir_content->d_name );
- psz_tmp2 = vlc_fix_readdir_charset( VLC_OBJECT(p_playlist),
- psz_loc );
- LocaleFree( psz_loc );
-
- p_item = playlist_ItemNewWithType( VLC_OBJECT(p_playlist),
- psz_tmp1, psz_tmp2, 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 );
- }
-
-#ifdef HAVE_STRSEP
- if( ppsz_extensions ) free( ppsz_extensions );
- if( psz_ignore ) free( psz_ignore );
-#endif /* HAVE_STRSEP */
-
- free( pp_dir_content );
- return VLC_SUCCESS;
-}
projects / vlc / blobdiff