/*****************************************************************************
* directory.c: expands a directory (directory: access plug-in)
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * 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" \
vlc_module_begin();
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 );
set_callbacks( Open, Close );
+
+ add_submodule();
+ set_description( _("Directory EOF") );
+ set_capability( "demux2", 0 );
+ add_shortcut( "directory" );
+ set_callbacks( DemuxOpen, NULL );
vlc_module_end();
/*****************************************************************************
- * Open: open the directory
+ * Local prototypes, constants, structures
*****************************************************************************/
-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;
-#ifdef HAVE_SYS_STAT_H
- struct stat stat_info;
-#endif
- /* Initialize access plug-in structures. */
- if( p_input->i_mtu == 0 )
- {
- /* Improve speed. */
- p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
- }
+#define MODE_EXPAND 0
+#define MODE_COLLAPSE 1
+#define MODE_NONE 2
- p_input->pf_read = Read;
- p_input->pf_set_program = NULL;
- p_input->pf_set_area = NULL;
- p_input->pf_seek = NULL;
+static int Read( access_t *, uint8_t *, int );
+static int ReadNull( access_t *, uint8_t *, int );
+static int Control( access_t *, int, va_list );
- /* Remove the ending '/' char */
- psz_name = strdup( p_input->psz_name );
- if( psz_name == NULL )
- return VLC_EGENERIC;
+static int Demux( demux_t *p_demux );
+static int DemuxControl( demux_t *p_demux, int i_query, va_list args );
- if( (psz_name[strlen(psz_name)-1] == '/') ||
- (psz_name[strlen(psz_name)-1] == '\\') )
- {
- psz_name[strlen(psz_name)-1] = '\0';
- }
+
+static int ReadDir( playlist_t *, char *psz_name, int i_mode, int *pi_pos );
+
+/*****************************************************************************
+ * Open: open the directory
+ *****************************************************************************/
+static int Open( vlc_object_t *p_this )
+{
+ access_t *p_access = (access_t*)p_this;
#ifdef HAVE_SYS_STAT_H
- if( ( stat( psz_name, &stat_info ) == -1 ) ||
+ struct stat stat_info;
+
+ if( ( stat( p_access->psz_path, &stat_info ) == -1 ) ||
!S_ISDIR( stat_info.st_mode ) )
#else
- if( !p_input->psz_access || strcmp(p_input->psz_access, "dir") )
+ if( strcmp( p_access->psz_access, "dir") &&
+ strcmp( p_access->psz_access, "directory") )
#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 )
+ 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_t *p_playlist =
+ (playlist_t *) vlc_object_find( p_access,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+
+ if( !p_playlist )
{
- msg_Err( p_input, "out of memory" );
- free( psz_name );
- return VLC_ENOMEM;
+ msg_Err( p_access, "can't find playlist" );
+ goto end;
}
- p_access_data->i_pos = 0;
- psz_mode = config_GetPsz( p_input , "recursive" );
- if( !psz_mode )
+ /* 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] == '\\') )
{
- msg_Err( p_input, "Unable to get configuration" );
- return VLC_EGENERIC;
+ psz_name[strlen(psz_name)-1] = '\0';
}
- if( !strncmp( psz_mode, "none" , 4 ) )
+ /* Initialize structure */
+ psz = var_CreateGetString( p_access, "recursive" );
+ if( *psz == '\0' || !strncmp( psz, "none" , 4 ) )
{
i_mode = MODE_NONE;
}
- else if( !strncmp( psz_mode, "collapse", 8 ) )
+ else if( !strncmp( psz, "collapse", 8 ) )
{
i_mode = MODE_COLLAPSE;
}
{
i_mode = MODE_EXPAND;
}
- if( ReadDir( p_input, psz_name , i_mode ) != VLC_SUCCESS )
+ 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'", psz_name );
+ if( ReadDir( p_playlist, psz_name , i_mode, &i_pos ) != VLC_SUCCESS )
{
- free( p_access_data );
- free( psz_name );
- return VLC_EGENERIC;
+ goto end;
}
- msg_Dbg(p_input,"Directory read complete. Read %i bytes",
- p_access_data->i_pos);
+end:
+ 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 )
{
- 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;
-
- if( i_remaining > 0 )
- {
- 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;
- }
return 0;
}
-
-/* Local functions */
+/*****************************************************************************
+ * 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 );
+}
/*****************************************************************************
* 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 )
{
DIR * p_current_dir;
struct dirent * p_dir_content;
- input_directory_t * p_access_data =
- (input_directory_t *)p_input->p_access_data;
-
- /* have to cd into this dir */
+ /* Open the dir */
p_current_dir = opendir( psz_name );
if( p_current_dir == NULL )
{
/* something went bad, get out of here ! */
# ifdef HAVE_ERRNO_H
- msg_Warn( p_input, "cannot open directory `%s' (%s)",
+ msg_Warn( p_playlist, "cannot open directory `%s' (%s)",
psz_name, strerror(errno));
# else
- msg_Warn( p_input, "cannot open directory `%s'", psz_name );
+ msg_Warn( p_playlist, "cannot open directory `%s'", psz_name );
# endif
return VLC_EGENERIC;
}
+ /* get the first directory entry */
p_dir_content = readdir( p_current_dir );
/* while we still have entries in the directory */
- while( p_dir_content != NULL && p_access_data->i_pos < MAX_DIR_SIZE )
+ while( p_dir_content != NULL )
{
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 defined( DT_DIR )
- if( p_dir_content->d_type == DT_DIR )
-#elif defined( S_ISDIR )
+#if defined( S_ISDIR )
struct stat stat_data;
- stat( psz_entry, &stat_data );
- if( S_ISDIR(stat_data.st_mode) )
+ 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 );
+ msg_Dbg( p_playlist, "Skipping subdirectory %s", psz_uri );
p_dir_content = readdir( p_current_dir );
continue;
}
else if(i_mode == MODE_EXPAND )
{
- msg_Dbg(p_input, "Reading subdirectory %s",psz_entry );
- if( ReadDir( p_input, psz_entry , MODE_EXPAND )
+ msg_Dbg(p_playlist, "Reading subdirectory %s", psz_uri );
+ if( ReadDir( p_playlist, psz_uri , MODE_EXPAND, pi_position )
!= 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++;
- }
}
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_Add( p_playlist, psz_uri, p_dir_content->d_name,
+ PLAYLIST_INSERT, *pi_position );
+ (*pi_position)++;
}
}
- free( psz_entry );
+ free( psz_uri );
p_dir_content = readdir( p_current_dir );
}
closedir( p_current_dir );
return VLC_SUCCESS;
}
+
+
projects / vlc / blobdiff