*****************************************************************************/
#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 "charset.h"
+#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_("Ignored extensions")
#define IGNORE_LONGTEXT N_( \
static int ReadDir( playlist_t *, const char *psz_name, int i_mode,
- playlist_item_t *, playlist_item_t * );
+ 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;
- 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) )
+#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
- {
- 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 int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
{
- char *psz_name = NULL;
- char *psz;
- char *ptr;
- int i_mode, i_activity;
-
- playlist_item_t *p_item, *p_root_category;
- vlc_bool_t b_play = VLC_FALSE;
-
- playlist_t *p_playlist =
- (playlist_t *) vlc_object_find( p_access,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-
- if( !p_playlist )
- {
- msg_Err( p_access, "can't find playlist" );
- goto end;
+ 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);
+
+ if( psz_name == NULL )
+ return VLC_ENOMEM;
+
+ if( p_current == NULL ) {
+ msg_Err( p_access, "unable to find item in playlist" );
+ return VLC_ENOOBJ;
}
- psz_name = ToLocale( p_access->psz_path );
- ptr = strdup( psz_name );
- LocaleFree( psz_name );
- if( ptr == NULL )
- goto end;
-
- psz_name = ptr;
-
/* Remove the ending '/' char */
- ptr += strlen( ptr );
- if( ( ptr > psz_name ) )
+ if (psz_name[0])
{
- switch( *--ptr )
+ char *ptr = psz_name + strlen (psz_name);
+ switch (*--ptr)
{
case '/':
case '\\':
msg_Dbg( p_access, "opening directory `%s'", p_access->psz_path );
- 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;
- 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;
- }
- p_item->p_input->i_type = ITEM_TYPE_DIRECTORY;
-
- p_root_category = playlist_LockItemToNode( p_playlist, p_item );
+ p_current->p_input->i_type = ITEM_TYPE_DIRECTORY;
+ p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
+ VLC_FALSE );
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 );
+ 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 );
-end:
- /* Begin to read the directory */
- if( b_play )
- {
-#if 0
- /// \bug we can start playing an already deleted item. Fix ?*/
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, 1242,
- p_playlist->status.p_item, NULL );
-#endif
- }
+ playlist_Signal( p_playlist );
+
if( psz_name ) free( psz_name );
vlc_object_release( p_playlist );
return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
}
-static int Filter( const struct dirent *foo )
+
+static int Sort (const char **a, const char **b)
{
- return VLC_TRUE;
+ return strcoll (*a, *b);
}
/*****************************************************************************
*****************************************************************************/
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 )
+ playlist_item_t *p_parent_category,
+ input_item_t *p_current_input )
{
- struct dirent **pp_dir_content = 0;
+ char **pp_dir_content = NULL;
int i_dir_content, i, i_return = VLC_SUCCESS;
playlist_item_t *p_node;
- char **ppsz_extensions = 0;
+ char **ppsz_extensions = NULL;
int i_extensions = 0;
char *psz_ignore;
/* Get the first directory entry */
- i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort );
+ 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" );
if( psz_parser[a] == ',' ) i_extensions++;
}
- ppsz_extensions = (char **)malloc( sizeof( char * ) * i_extensions );
+ ppsz_extensions = (char **)calloc (i_extensions, sizeof (char *));
for( a = 0; a < i_extensions; a++ )
{
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;
- if( !stat( psz_uri, &stat_data )
+ if (!utf8_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
* impossible to fix while keeping some kind of portable code, and maybe even
* in a non-portable way.
*/
- if( lstat( psz_uri, &stat_data )
+ if (utf8_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 );
- free( psz_uri );
continue;
}
else if( i_mode == MODE_EXPAND )
{
- char *psz_newname, *psz_tmp;
- msg_Dbg(p_playlist, "reading subdirectory %s", psz_uri );
+ msg_Dbg(p_playlist, "creading 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
- {
- p_node = playlist_NodeCreate( p_playlist, psz_newname,
- p_parent_category );
- }
-
- /* an strdup() just because of Mac OS X */
- free( psz_newname );
+ 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,
- p_node, p_parent_category ? p_node : NULL )
+ p_node, p_parent_category ? p_node : NULL,
+ p_current_input )
!= VLC_SUCCESS )
{
i_return = VLC_EGENERIC;
else
{
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, '.' );
+ 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 );
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 );
-
+ memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7);
+ memcpy (psz_uri, "file://", 7);
p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
- psz_tmp1, psz_tmp2, 0, NULL,
+ psz_uri, entry, 0, NULL,
-1, ITEM_TYPE_VFILE );
-
- playlist_AddWhereverNeeded( p_playlist, p_input, p_parent,
- p_parent_category, VLC_FALSE,
- PLAYLIST_APPEND|PLAYLIST_PREPARSE);
+ 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 );
}
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 );
projects / vlc / blobdiff