* Copyright (C) 2002-2004 the VideoLAN team
* $Id$
*
- * Authors: Derk-Jan Hartman <hartman at videolan dot org>>
+ * Authors: Derk-Jan Hartman <hartman at videolan dot org>
*
* 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.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/input.h>
#include <vlc_playlist.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_demux.h>
#include <stdlib.h>
#include <string.h>
# include <dirent.h>
#endif
+#include <vlc_charset.h>
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
"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 *psz_recursive_list[] = { "none", "collapse", "expand" };
+static const char *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." )
+ "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 );
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();
static int DemuxControl( demux_t *p_demux, int i_query, va_list args );
-static int ReadDir( playlist_t *, char *psz_name, int i_mode, int *pi_pos,
- playlist_item_t * );
+static int ReadDir( playlist_t *, const char *psz_name, int i_mode,
+ playlist_item_t *, playlist_item_t *, input_item_t * );
/*****************************************************************************
* Open: open the directory
{
access_t *p_access = (access_t*)p_this;
-#ifdef HAVE_SYS_STAT_H
struct stat stat_info;
- if( ( stat( p_access->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) )
-
+#ifdef S_ISDIR
+ if (utf8_stat (p_access->psz_path, &stat_info)
+ || !S_ISDIR (stat_info.st_mode))
#else
if( strcmp( p_access->psz_access, "dir") &&
strcmp( p_access->psz_access, "directory") )
#endif
- {
return VLC_EGENERIC;
- }
p_access->pf_read = Read;
p_access->pf_block = NULL;
*****************************************************************************/
static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
{
- char *psz_name = NULL;
- char *psz;
- int i_mode, i_pos;
+ char *psz;
+ int i_mode, i_activity;
+ playlist_t *p_playlist = pl_Yield( p_access );
+ playlist_item_t *p_item_in_category;
+ input_item_t *p_current_input = input_GetItem(
+ (input_thread_t*)p_access->p_parent);
+ playlist_item_t *p_current = playlist_ItemGetByInput( p_playlist,
+ p_current_input,
+ VLC_FALSE );
+ char *psz_name = strdup (p_access->psz_path);
- 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 );
+ if( psz_name == NULL )
+ return VLC_ENOMEM;
- if( !p_playlist )
- {
- msg_Err( p_access, "can't find playlist" );
- goto end;
+ if( p_current == NULL ) {
+ msg_Err( p_access, "unable to find item in playlist" );
+ return VLC_ENOOBJ;
}
/* Remove the ending '/' char */
- psz_name = strdup( p_access->psz_path );
- if( psz_name == NULL )
- goto end;
-
- if( (psz_name[strlen(psz_name)-1] == '/') ||
- (psz_name[strlen(psz_name)-1] == '\\') )
+ if (psz_name[0])
{
- psz_name[strlen(psz_name)-1] = '\0';
+ char *ptr = psz_name + strlen (psz_name);
+ switch (*--ptr)
+ {
+ case '/':
+ case '\\':
+ *ptr = '\0';
+ }
}
- /* Initialize structure */
+ /* Handle mode */
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;
- }
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;
+ msg_Dbg( p_access, "opening directory `%s'", p_access->psz_path );
- msg_Dbg( p_access, "opening directory `%s'", psz_name );
+ p_current->p_input->i_type = ITEM_TYPE_DIRECTORY;
+ p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
+ VLC_FALSE );
- 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;
- }
- b_play = VLC_FALSE;
- }
+ i_activity = var_GetInteger( p_playlist, "activity" );
+ var_SetInteger( p_playlist, "activity", i_activity +
+ DIRECTORY_ACTIVITY );
- p_item->input.i_type = ITEM_TYPE_DIRECTORY;
- if( ReadDir( p_playlist, psz_name , i_mode, &i_pos,
- p_item ) != VLC_SUCCESS )
- {
- }
-end:
+ ReadDir( p_playlist, psz_name, i_mode, p_current, p_item_in_category,
+ p_current_input );
+
+ i_activity = var_GetInteger( p_playlist, "activity" );
+ var_SetInteger( p_playlist, "activity", i_activity -
+ DIRECTORY_ACTIVITY );
+
+ playlist_Signal( p_playlist );
- /* Begin to read the directory */
- if( b_play )
- {
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- p_playlist->status.i_view,
- p_playlist->status.p_item, NULL );
- }
if( psz_name ) free( psz_name );
vlc_object_release( p_playlist );
{
return 0;
}
+
/*****************************************************************************
* DemuxControl:
*****************************************************************************/
return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
}
-#if defined(SYS_BEOS) || defined(WIN32) || defined(SYS_SOLARIS)
-/* 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 ** ) )
+static int Sort (const char **a, const char **b)
{
- 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;
+ return strcoll (*a, *b);
}
-#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 )
+static int ReadDir( playlist_t *p_playlist, const char *psz_name,
+ int i_mode, playlist_item_t *p_parent,
+ playlist_item_t *p_parent_category,
+ input_item_t *p_current_input )
{
- struct dirent **pp_dir_content;
- int i_dir_content, i;
+ char **pp_dir_content = NULL;
+ int i_dir_content, i, i_return = VLC_SUCCESS;
playlist_item_t *p_node;
- /* Build array with ignores */
-#ifdef HAVE_STRSEP
- char **ppsz_extensions = 0;
+ char **ppsz_extensions = NULL;
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 );
- }
+ char *psz_ignore;
- /* get the first directory entry */
- i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort );
+ /* Get the first directory entry */
+ i_dir_content = utf8_scandir (psz_name, &pp_dir_content, NULL, Sort);
if( i_dir_content == -1 )
{
- msg_Warn( p_playlist, "Failed to read directory" );
+ msg_Warn( p_playlist, "failed to read directory" );
return VLC_EGENERIC;
}
else if( i_dir_content <= 0 )
{
/* directory is empty */
+ if( pp_dir_content ) free( pp_dir_content );
return VLC_SUCCESS;
}
+ /* Build array with ignores */
+ psz_ignore = var_CreateGetString( p_playlist, "ignore-filetypes" );
+ if( psz_ignore && *psz_ignore )
+ {
+ char *psz_parser = psz_ignore;
+ int a;
+
+ for( a = 0; psz_parser[a] != '\0'; a++ )
+ {
+ if( psz_parser[a] == ',' ) i_extensions++;
+ }
+
+ ppsz_extensions = (char **)calloc (i_extensions, sizeof (char *));
+
+ for( a = 0; a < i_extensions; a++ )
+ {
+ char *tmp, *ptr;
+
+ while( psz_parser[0] != '\0' && psz_parser[0] == ' ' ) psz_parser++;
+ ptr = strchr( psz_parser, ',');
+ tmp = ( ptr == NULL )
+ ? strdup( psz_parser )
+ : strndup( psz_parser, ptr - psz_parser );
+
+ ppsz_extensions[a] = tmp;
+ psz_parser = ptr + 1;
+ }
+ }
+ if( psz_ignore ) free( psz_ignore );
+
/* 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];
+ const char *entry = 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 );
+ strlen( entry ) + 2 + 7 /* strlen("file://") */;
+ char psz_uri[i_size_entry];
- sprintf( psz_uri, "%s/%s", psz_name, p_dir_content->d_name );
+ sprintf( psz_uri, "%s/%s", psz_name, entry);
/* if it starts with '.' then forget it */
- if( p_dir_content->d_name[0] != '.' )
+ if (entry[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 )
+
+ if (!utf8_stat (psz_uri, &stat_data)
+ && S_ISDIR(stat_data.st_mode) && i_mode != MODE_COLLAPSE )
#else
if( 0 )
#endif
{
+#if defined( S_ISLNK )
+/*
+ * FIXME: there is a ToCToU race condition here; but it is rather tricky
+ * impossible to fix while keeping some kind of portable code, and maybe even
+ * in a non-portable way.
+ */
+ if (utf8_lstat (psz_uri, &stat_data)
+ || S_ISLNK(stat_data.st_mode) )
+ {
+ msg_Dbg( p_playlist, "skipping directory symlink %s",
+ psz_uri );
+ continue;
+ }
+#endif
if( i_mode == MODE_NONE )
{
- msg_Dbg( p_playlist, "Skipping subdirectory %s", psz_uri );
- free( psz_uri );
+ msg_Dbg( p_playlist, "skipping subdirectory %s", psz_uri );
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 );
+ msg_Dbg(p_playlist, "creading subdirectory %s", psz_uri );
- playlist_CopyParents( p_parent, p_node );
-
- p_node->input.i_type = ITEM_TYPE_DIRECTORY;
+ p_node = playlist_NodeCreate( p_playlist, entry,
+ p_parent_category,
+ PLAYLIST_NO_REBUILD );
+ /* If we had the parent in category, the it is now node.
+ * Else, we still don't have */
if( ReadDir( p_playlist, psz_uri , MODE_EXPAND,
- pi_position, p_node ) != VLC_SUCCESS )
+ p_node, p_parent_category ? p_node : NULL,
+ p_current_input )
+ != VLC_SUCCESS )
{
- return VLC_EGENERIC;
+ i_return = VLC_EGENERIC;
+ break;
}
-
- free( psz_newname );
}
}
else
{
- playlist_item_t *p_item;
+ input_item_t *p_input;
-#ifdef HAVE_STRSEP
if( i_extensions > 0 )
{
- char *psz_dot = strrchr( p_dir_content->d_name, '.' );
+ const char *psz_dot = strrchr (entry, '.' );
if( psz_dot++ && *psz_dot )
{
int a;
}
if( a < i_extensions )
{
- msg_Dbg( p_playlist, "Ignoring file %s", psz_uri );
- free( psz_uri );
+ msg_Dbg( p_playlist, "ignoring file %s", psz_uri );
continue;
}
}
}
-#endif /* HAVE_STRSEP */
-
- p_item = playlist_ItemNewWithType( VLC_OBJECT(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 );
+ memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7);
+ memcpy (psz_uri, "file://", 7);
+ p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
+ psz_uri, entry, 0, NULL,
+ -1, ITEM_TYPE_VFILE );
+ if (p_input != NULL)
+ {
+ if( p_current_input )
+ input_ItemCopyOptions( p_current_input, p_input );
+ playlist_BothAddInput( p_playlist, p_input,
+ p_parent_category,
+ PLAYLIST_APPEND|PLAYLIST_PREPARSE|
+ PLAYLIST_NO_REBUILD,
+ PLAYLIST_END, NULL, NULL );
+ }
}
}
- free( psz_uri );
}
-#ifdef HAVE_STRSEP
+ for( i = 0; i < i_extensions; i++ )
+ if( ppsz_extensions[i] ) free( ppsz_extensions[i] );
if( ppsz_extensions ) free( ppsz_extensions );
- if( psz_ignore ) free( psz_ignore );
-#endif /* HAVE_STRSEP */
- free( pp_dir_content );
- return VLC_SUCCESS;
+ for( i = 0; i < i_dir_content; i++ )
+ if( pp_dir_content[i] ) free( pp_dir_content[i] );
+ if( pp_dir_content ) free( pp_dir_content );
+
+ return i_return;
}
projects / vlc / blobdiff