/*****************************************************************************
* directory.c: expands a directory (directory: access plug-in)
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2004 the VideoLAN team
* $Id$
*
- * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * 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 <stdlib.h>
#include <string.h>
# include <unistd.h>
#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
+#elif defined( UNDER_CE )
+# define strcoll strcmp
#endif
-#if (!defined( WIN32 ) || defined(__MINGW32__))
-/* Mingw has its own version of dirent */
+#ifdef HAVE_DIRENT_H
# include <dirent.h>
#endif
+#include "charset.h"
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
N_("expand") };
+#define IGNORE_TEXT N_("Ignored extensions")
+#define IGNORE_LONGTEXT N_( \
+ "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( _("Directory" ) );
+ set_subcategory( SUBCAT_INPUT_ACCESS );
set_description( _("Standard filesystem directory input") );
set_capability( "access2", 55 );
add_shortcut( "directory" );
add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
RECURSIVE_LONGTEXT, VLC_FALSE );
change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
+ add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
+ NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
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 );
+static int ReadDir( playlist_t *, const char *psz_name, int i_mode,
+ playlist_item_t *, playlist_item_t * );
/*****************************************************************************
* Open: open the directory
#ifdef HAVE_SYS_STAT_H
struct stat stat_info;
+ char *psz_path = ToLocale( p_access->psz_path );
- if( ( stat( p_access->psz_path, &stat_info ) == -1 ) ||
+ 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) )
+
#else
if( strcmp( p_access->psz_access, "dir") &&
strcmp( p_access->psz_access, "directory") )
#endif
{
+ LocaleFree( psz_path );
return VLC_EGENERIC;
}
+ LocaleFree( psz_path );
p_access->pf_read = Read;
p_access->pf_block = NULL;
p_access->pf_seek = NULL;
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
-
}
/*****************************************************************************
{
char *psz_name = NULL;
char *psz;
- int i_mode, i_pos;
+ char *ptr;
+ int i_mode, i_activity;
- playlist_t *p_playlist =
- (playlist_t *) vlc_object_find( p_access,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ playlist_item_t *p_item, *p_root_category;
+ playlist_t *p_playlist = pl_Yield( p_access );
- if( !p_playlist )
- {
- msg_Err( p_access, "can't find playlist" );
+ psz_name = ToLocale( p_access->psz_path );
+ ptr = strdup( psz_name );
+ LocaleFree( psz_name );
+ if( ptr == NULL )
goto end;
- }
- /* Remove the ending '/' char */
- psz_name = strdup( p_access->psz_path );
- if( psz_name == NULL )
- goto end;
+ psz_name = ptr;
- if( (psz_name[strlen(psz_name)-1] == '/') ||
- (psz_name[strlen(psz_name)-1] == '\\') )
+ /* Remove the ending '/' char */
+ ptr += strlen( ptr );
+ if( ( ptr > psz_name ) )
{
- psz_name[strlen(psz_name)-1] = '\0';
+ 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 */
- p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
- /* 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 );
- if( ReadDir( p_playlist, psz_name , i_mode, &i_pos ) != VLC_SUCCESS )
+ if( p_playlist->status.p_item && p_playlist->status.p_item->p_input ==
+ ((input_thread_t *)p_access->p_parent)->input.p_item )
+ p_item = p_playlist->status.p_item;
+ else
{
- goto end;
+ input_item_t *p_current = ( (input_thread_t*)p_access->p_parent)->
+ input.p_item;
+ p_item = playlist_LockItemGetByInput( p_playlist, p_current );
+ if( !p_item )
+ {
+ msg_Dbg( p_playlist, "unable to find item in playlist");
+ return VLC_ENOOBJ;
+ }
}
+ p_item->p_input->i_type = ITEM_TYPE_DIRECTORY;
+
+ p_root_category = playlist_LockItemToNode( p_playlist, p_item );
+
+ i_activity = var_GetInteger( p_playlist, "activity" );
+ var_SetInteger( p_playlist, "activity", i_activity +
+ DIRECTORY_ACTIVITY );
+
+ ReadDir( p_playlist, psz_name , i_mode, p_item, p_root_category );
+ i_activity = var_GetInteger( p_playlist, "activity" );
+ var_SetInteger( p_playlist, "activity", i_activity -
+ DIRECTORY_ACTIVITY );
end:
if( psz_name ) free( psz_name );
vlc_object_release( p_playlist );
{
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 );
+ 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 )
+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 )
{
- DIR * p_current_dir;
- struct dirent * p_dir_content;
+ struct dirent **pp_dir_content = 0;
+ int i_dir_content, i, i_return = VLC_SUCCESS;
+ playlist_item_t *p_node;
- /* Open the dir */
- p_current_dir = opendir( psz_name );
+ char **ppsz_extensions = 0;
+ int i_extensions = 0;
+ char *psz_ignore;
- if( p_current_dir == NULL )
+ /* Get the first directory entry */
+ i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort );
+ if( i_dir_content == -1 )
{
- /* something went bad, get out of here ! */
-# ifdef HAVE_ERRNO_H
- msg_Warn( p_playlist, "cannot open directory `%s' (%s)",
- psz_name, strerror(errno));
-# else
- msg_Warn( p_playlist, "cannot open directory `%s'", psz_name );
-# endif
+ 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;
- /* get the first directory entry */
- p_dir_content = readdir( p_current_dir );
+ for( a = 0; psz_parser[a] != '\0'; a++ )
+ {
+ if( psz_parser[a] == ',' ) i_extensions++;
+ }
+
+ ppsz_extensions = (char **)malloc( sizeof( char * ) * i_extensions );
+
+ 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;
+ }
+ }
- /* while we still have entries in the directory */
- while( p_dir_content != NULL )
+ /* 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);
+ char *psz_uri = (char *)malloc( sizeof(char) * i_size_entry );
sprintf( psz_uri, "%s/%s", psz_name, p_dir_content->d_name );
{
#if defined( S_ISDIR )
struct stat stat_data;
- stat( psz_uri, &stat_data );
- if( S_ISDIR(stat_data.st_mode) && i_mode != MODE_COLLAPSE )
+
+ 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 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( lstat( psz_uri, &stat_data )
+ || S_ISLNK(stat_data.st_mode) )
+ {
+ msg_Dbg( p_playlist, "skipping directory symlink %s",
+ psz_uri );
+ free( psz_uri );
+ continue;
+ }
+#endif
if( i_mode == MODE_NONE )
{
- msg_Dbg( p_playlist, "Skipping subdirectory %s", psz_uri );
- p_dir_content = readdir( p_current_dir );
+ msg_Dbg( p_playlist, "skipping subdirectory %s", psz_uri );
+ free( psz_uri );
continue;
}
- else if(i_mode == MODE_EXPAND )
+ else if( i_mode == MODE_EXPAND )
{
- msg_Dbg(p_playlist, "Reading subdirectory %s", psz_uri );
- if( ReadDir( p_playlist, psz_uri , MODE_EXPAND, pi_position )
- != VLC_SUCCESS )
+ 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 );
+
+ if( p_parent_category )
+ {
+ p_node = playlist_NodeCreate( p_playlist, psz_newname,
+ p_parent_category );
+ }
+ else
{
- return VLC_EGENERIC;
+ p_node = playlist_NodeCreate( p_playlist, psz_newname,
+ p_parent_category );
+ }
+
+ /* an strdup() just because of Mac OS X */
+ free( psz_newname );
+
+ /* 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,
+ p_node, p_parent_category ? p_node : NULL )
+ != VLC_SUCCESS )
+ {
+ i_return = VLC_EGENERIC;
+ break;
}
}
}
else
{
- playlist_Add( p_playlist, psz_uri, p_dir_content->d_name,
- PLAYLIST_INSERT, *pi_position );
- (*pi_position)++;
+ input_item_t *p_input;
+ char *psz_tmp1, *psz_tmp2, *psz_loc;
+
+ 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;
+ }
+ }
+ }
+
+ 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_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
+ psz_tmp1, psz_tmp2, 0, NULL,
+ -1, ITEM_TYPE_VFILE );
+
+ playlist_AddWhereverNeeded( p_playlist, p_input, p_parent,
+ p_parent_category, VLC_FALSE,
+ PLAYLIST_APPEND|PLAYLIST_PREPARSE);
}
}
free( psz_uri );
- p_dir_content = readdir( p_current_dir );
}
- closedir( p_current_dir );
- return VLC_SUCCESS;
-}
+ 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 );
+ 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