/*****************************************************************************
* directory.c: expands a directory (directory: access plug-in)
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: directory.c,v 1.5 2004/02/16 17:16:24 zorglub Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
+
#include <vlc/vlc.h>
#include <vlc/input.h>
+#include <vlc_playlist.h>
#include <stdlib.h>
#include <string.h>
#endif
/*****************************************************************************
- * Constants and structures
- *****************************************************************************/
-#define MAX_DIR_SIZE 100000
-
-#define MODE_EXPAND 0
-#define MODE_COLLAPSE 1
-#define MODE_NONE 2
-
-typedef struct input_directory_s
-{
- char p_dir_buffer[MAX_DIR_SIZE];
- int i_buf_pos;
- int i_buf_length;
- int i_pos;
-} input_directory_t;
-
-
-/*****************************************************************************
- * Local prototypes
+ * Module descriptor
*****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
-static ssize_t Read ( input_thread_t *, byte_t *, size_t );
-int ReadDir( input_thread_t *p_input, char *psz_name , int i_mode );
+static int DemuxOpen ( vlc_object_t * );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-#define RECURSIVE_TEXT N_("Includes subdirectories ?")
+#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" )
+ "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( "access", 55 );
+ 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 );
+ 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();
+/*****************************************************************************
+ * 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 );
+
+
+static int ReadDir( playlist_t *, char *psz_name, int i_mode, int *pi_pos,
+ playlist_item_t * );
+
/*****************************************************************************
* Open: open the directory
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- char * psz_name;
- input_directory_t * p_access_data;
- char * psz_mode;
- int i_mode;
+ access_t *p_access = (access_t*)p_this;
+
#ifdef HAVE_SYS_STAT_H
- struct stat stat_info;
-#endif
+ struct stat stat_info;
- /* Initialize access plug-in structures. */
- if( p_input->i_mtu == 0 )
+ 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
{
- /* Improve speed. */
- p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
+ return VLC_EGENERIC;
}
- p_input->pf_read = Read;
- p_input->pf_set_program = NULL;
- p_input->pf_set_area = NULL;
- p_input->pf_seek = NULL;
+ p_access->pf_read = Read;
+ p_access->pf_block = NULL;
+ p_access->pf_seek = NULL;
+ p_access->pf_control= Control;
+
+ /* Force a demux */
+ p_access->psz_demux = strdup( "directory" );
+
+ 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;
+}
+
+/*****************************************************************************
+ * Read: read the directory
+ *****************************************************************************/
+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;
+
+ 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( !p_playlist )
+ {
+ msg_Err( p_access, "can't find playlist" );
+ goto end;
+ }
/* Remove the ending '/' char */
- psz_name = strdup( p_input->psz_name );
+ psz_name = strdup( p_access->psz_path );
if( psz_name == NULL )
- return VLC_EGENERIC;
+ goto end;
if( (psz_name[strlen(psz_name)-1] == '/') ||
(psz_name[strlen(psz_name)-1] == '\\') )
psz_name[strlen(psz_name)-1] = '\0';
}
-#ifdef HAVE_SYS_STAT_H
- if( ( stat( psz_name, &stat_info ) == -1 ) ||
- !S_ISDIR( stat_info.st_mode ) )
-#else
- if( !p_input->psz_access || strcmp(p_input->psz_access, "dir") )
-#endif
- {
- free( psz_name );
- return VLC_EGENERIC;
- }
-
/* Initialize structure */
- msg_Dbg( p_input, "opening directory `%s'", psz_name );
- p_access_data = malloc( sizeof(input_directory_t) );
- p_input->p_access_data = (void *)p_access_data;
- if( p_access_data == NULL )
+ psz = var_CreateGetString( p_access, "recursive" );
+ if( *psz == '\0' || !strncmp( psz, "none" , 4 ) )
{
- msg_Err( p_input, "out of memory" );
- free( psz_name );
- return VLC_ENOMEM;
+ i_mode = MODE_NONE;
}
- p_access_data->i_pos = 0;
-
- psz_mode = config_GetPsz( p_input , "recursive" );
- if( !psz_mode )
+ else if( !strncmp( psz, "collapse", 8 ) )
{
- msg_Err( p_input, "Unable to get configuration" );
- return VLC_EGENERIC;
+ i_mode = MODE_COLLAPSE;
}
-
- if( !strncmp( psz_mode, "none" , 4 ) )
+ else
{
- i_mode = MODE_NONE;
+ i_mode = MODE_EXPAND;
}
- else if( !strncmp( psz_mode, "collapse", 8 ) )
+ 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'", psz_name );
+
+ if( &p_playlist->status.p_item->input ==
+ ((input_thread_t *)p_access->p_parent)->input.p_item )
{
- i_mode = MODE_COLLAPSE;
+ p_item = p_playlist->status.p_item;
+ b_play = VLC_TRUE;
+ msg_Dbg( p_access, "starting directory playback");
}
else
{
- i_mode = MODE_EXPAND;
+ 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;
}
- if( ReadDir( p_input, psz_name , i_mode ) != VLC_SUCCESS )
+ p_item->input.i_type = ITEM_TYPE_DIRECTORY;
+ if( ReadDir( p_playlist, psz_name , i_mode, &i_pos,
+ p_item ) != VLC_SUCCESS )
{
- free( p_access_data );
- free( psz_name );
- return VLC_EGENERIC;
}
+end:
- msg_Dbg(p_input,"Directory read complete. Read %i bytes",
- p_access_data->i_pos);
+ /* 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 );
- p_access_data->p_dir_buffer[p_access_data->i_pos] = '\0';
- p_access_data->i_pos++;
- p_access_data->i_buf_length = p_access_data->i_pos;
- p_access_data->i_buf_pos = 0;
+ /* Return fake data forever */
+ p_access->pf_read = ReadNull;
+ return ReadNull( p_access, p_buffer, i_len );
+}
- /* Force m3u demuxer */
- p_input->psz_demux = "m3u";
+/*****************************************************************************
+ * DemuxOpen:
+ *****************************************************************************/
+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;
+ switch( i_query )
+ {
+ /* */
+ case ACCESS_CAN_SEEK:
+ case ACCESS_CAN_FASTSEEK:
+ 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 */
+ 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;
+ break;
+
+ /* */
+ case ACCESS_SET_PAUSE_STATE:
+ case ACCESS_GET_TITLE_INFO:
+ case ACCESS_SET_TITLE:
+ case ACCESS_SET_SEEKPOINT:
+ case ACCESS_SET_PRIVATE_ID_STATE:
+ return VLC_EGENERIC;
+
+ default:
+ msg_Warn( p_access, "unimplemented query in control" );
+ return VLC_EGENERIC;
+ }
return VLC_SUCCESS;
}
/*****************************************************************************
- * Close: close the target
+ * DemuxOpen:
*****************************************************************************/
-static void Close( vlc_object_t * p_this )
+static int DemuxOpen ( vlc_object_t *p_this )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- input_directory_t * p_access_data =
- (input_directory_t *)p_input->p_access_data;
+ demux_t *p_demux = (demux_t*)p_this;
- msg_Info( p_input, "closing `%s/%s://%s'",
- p_input->psz_access, p_input->psz_demux, p_input->psz_name );
+ if( strcmp( p_demux->psz_demux, "directory" ) )
+ return VLC_EGENERIC;
- free( p_access_data );
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = DemuxControl;
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * Read: read directory and output to demux.
+ * Demux: EOF
*****************************************************************************/
-static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
+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 ** ) )
{
- input_directory_t * p_access_data =
- (input_directory_t *)p_input->p_access_data;
- unsigned int i_remaining = p_access_data->i_buf_length -
- p_access_data->i_buf_pos;
+ DIR * p_dir;
+ struct dirent * p_content;
+ struct dirent ** pp_list;
+ int ret, size;
+
+ if( !namelist || !( p_dir = opendir( name ) ) ) return -1;
- if( i_remaining > 0 )
+ ret = 0;
+ pp_list = NULL;
+ while( ( p_content = readdir( p_dir ) ) )
{
- int i_ret;
-
- i_ret = __MIN( i_len, i_remaining );
- memcpy( p_buffer,
- &p_access_data->p_dir_buffer[p_access_data->i_buf_pos],
- i_ret );
- p_access_data->i_buf_pos += i_ret;
- return (ssize_t) i_ret;
+ 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 );
}
- return 0;
-}
-/* Local functions */
+ *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
*****************************************************************************/
-int ReadDir( input_thread_t *p_input, char *psz_name , int i_mode )
+static int ReadDir( playlist_t *p_playlist,
+ char *psz_name , int i_mode, int *pi_position,
+ playlist_item_t *p_parent )
{
- DIR * p_current_dir;
- struct dirent * p_dir_content;
+ struct dirent *p_dir_content;
+ struct dirent **pp_dir_content;
+ int i_dir_content, i = 0;
+ playlist_item_t *p_node;
- input_directory_t * p_access_data =
- (input_directory_t *)p_input->p_access_data;
-
- /* have to cd into this dir */
- p_current_dir = opendir( psz_name );
+ /* Change the item to a node */
+ if( p_parent->i_children == -1 )
+ {
+ playlist_LockItemToNode( p_playlist,p_parent );
+ }
- 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_input, "cannot open directory `%s' (%s)",
- psz_name, strerror(errno));
-# else
- msg_Warn( p_input, "cannot open directory `%s'", psz_name );
-# endif
+ msg_Warn( p_playlist, "Failed to read directory" );
return VLC_EGENERIC;
}
-
- p_dir_content = readdir( p_current_dir );
+ 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( p_dir_content != NULL && p_access_data->i_pos < MAX_DIR_SIZE )
+ while( i < i_dir_content )
{
int i_size_entry = strlen( psz_name ) +
strlen( p_dir_content->d_name ) + 2;
- char *psz_entry = (char *)malloc( sizeof(char)*i_size_entry);
+ char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
- sprintf( psz_entry, "%s/%s",psz_name,p_dir_content->d_name);
+ sprintf( psz_uri, "%s/%s", psz_name, p_dir_content->d_name );
-#if 0 /* Disable this message, it makes too much output */
- msg_Dbg( p_input, "Entry %s",psz_entry );
-#endif
-
- /* if it is "." or "..", forget it */
- if( strcmp( p_dir_content->d_name, "." ) &&
- strcmp( p_dir_content->d_name, ".." ) &&
- p_access_data->i_pos + i_size_entry < MAX_DIR_SIZE )
+ /* if it starts with '.' then forget it */
+ if( p_dir_content->d_name[0] != '.' )
{
- if( p_dir_content->d_type == DT_DIR )
+#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_input, "Skipping subdirectory %s",psz_entry );
- p_dir_content = readdir( p_current_dir );
+ msg_Dbg( p_playlist, "Skipping subdirectory %s", psz_uri );
+ i++;
+ p_dir_content = pp_dir_content[i];
continue;
}
else if(i_mode == MODE_EXPAND )
{
- msg_Dbg(p_input, "Reading subdirectory %s",psz_entry );
- if( ReadDir( p_input, psz_entry , MODE_EXPAND )
- != VLC_SUCCESS )
+ 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;
}
- }
- else
- {
- sprintf( &p_access_data->p_dir_buffer[p_access_data->i_pos],
- "%s", psz_entry );
- p_access_data->i_pos += i_size_entry -1 ;
- p_access_data->p_dir_buffer[p_access_data->i_pos] = '\n';
- p_access_data->i_pos++;
+
+ free( psz_newname );
}
}
else
{
- sprintf( &p_access_data->p_dir_buffer[p_access_data->i_pos],
- "%s", psz_entry );
- p_access_data->i_pos += i_size_entry - 1;
- p_access_data->p_dir_buffer[p_access_data->i_pos] = '\n';
- p_access_data->i_pos++;
+ 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_entry );
- p_dir_content = readdir( p_current_dir );
+ free( psz_uri );
+ i++;
+ p_dir_content = pp_dir_content[i];
}
- closedir( p_current_dir );
+ free( pp_dir_content );
return VLC_SUCCESS;
}
projects / vlc / blobdiff