X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdirectory.c;h=51ea50b3c13284bd673bdc719220c8cb1fe57b00;hb=b751665aa8f78719eb3e4fe30545fffd5c423948;hp=832cb6c5cb1fed92509789a6170761239c735dab;hpb=85ff1461a28b5ec29f881aaaa960a242750704fb;p=vlc diff --git a/modules/access/directory.c b/modules/access/directory.c index 832cb6c5cb..51ea50b3c1 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -26,14 +26,19 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#warning playlist code must not be used here. #include #include #include #include -#include -#include #ifdef HAVE_SYS_TYPES_H # include #endif @@ -76,9 +81,9 @@ static int DemuxOpen ( vlc_object_t * ); "collapse: subdirectories appear but are expanded on first play.\n" \ "expand: all subdirectories are expanded.\n" ) -static const char *psz_recursive_list[] = { "none", "collapse", "expand" }; -static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"), - N_("expand") }; +static const char *const psz_recursive_list[] = { "none", "collapse", "expand" }; +static const char *const psz_recursive_list_text[] = { + N_("none"), N_("collapse"), N_("expand") }; #define IGNORE_TEXT N_("Ignored extensions") #define IGNORE_LONGTEXT N_( \ @@ -89,24 +94,23 @@ static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"), vlc_module_begin(); set_category( CAT_INPUT ); - set_shortname( _("Directory" ) ); + set_shortname( N_("Directory" ) ); set_subcategory( SUBCAT_INPUT_ACCESS ); - set_description( _("Standard filesystem directory input") ); - set_capability( "access2", 55 ); + set_description( N_("Standard filesystem directory input") ); + set_capability( "access", 55 ); add_shortcut( "directory" ); add_shortcut( "dir" ); add_shortcut( "file" ); add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT, - RECURSIVE_LONGTEXT, VLC_FALSE ); + RECURSIVE_LONGTEXT, 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 ); + NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false ); set_callbacks( Open, Close ); add_submodule(); set_description( "Directory EOF"); - set_capability( "demux2", 0 ); - add_shortcut( "directory" ); + set_capability( "demux", 0 ); set_callbacks( DemuxOpen, NULL ); vlc_module_end(); @@ -124,16 +128,16 @@ enum typedef struct stat_list_t stat_list_t; -static int Read( access_t *, uint8_t *, int ); -static int ReadNull( access_t *, uint8_t *, int ); +static ssize_t Read( access_t *, uint8_t *, size_t ); +static ssize_t ReadNull( access_t *, uint8_t *, size_t ); 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 *, const char *psz_name, int i_mode, - playlist_item_t *, playlist_item_t *, input_item_t *, +static int ReadDir( access_t *, playlist_t *, const char *psz_name, + int i_mode, playlist_item_t *, input_item_t *, DIR *handle, stat_list_t *stats ); static DIR *OpenDir (vlc_object_t *obj, const char *psz_name); @@ -145,6 +149,13 @@ static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; + if( !p_access->psz_path ) + return VLC_EGENERIC; + + struct stat st; + if( !stat( p_access->psz_path, &st ) && !S_ISDIR( st.st_mode ) ) + return VLC_EGENERIC; + DIR *handle = OpenDir (p_this, p_access->psz_path); if (handle == NULL) return VLC_EGENERIC; @@ -157,6 +168,7 @@ static int Open( vlc_object_t *p_this ) p_access->pf_control= Control; /* Force a demux */ + free( p_access->psz_demux ); p_access->psz_demux = strdup( "directory" ); return VLC_SUCCESS; @@ -175,7 +187,7 @@ 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) +static ssize_t ReadNull( access_t *p_access, uint8_t *p_buffer, size_t i_len) { /* Return fake data */ memset( p_buffer, 0, i_len ); @@ -185,32 +197,42 @@ static int ReadNull( access_t *p_access, uint8_t *p_buffer, int i_len) /***************************************************************************** * Read: read the directory *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len) { char *psz; - int i_mode, i_activity; + int i_mode; char *psz_name = strdup (p_access->psz_path); if( psz_name == NULL ) return VLC_ENOMEM; playlist_t *p_playlist = pl_Yield( p_access ); + input_thread_t *p_input = (input_thread_t*)vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT ); + 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 ); + input_item_t *p_current_input; + playlist_item_t *p_current; - if( p_current == NULL ) + if( !p_input ) + { + msg_Err( p_access, "unable to find input (internal error)" ); + pl_Release( p_access ); + return VLC_ENOOBJ; + } + + p_current_input = input_GetItem( p_input ); + p_current = playlist_ItemGetByInput( p_playlist, p_current_input, pl_Unlocked ); + + if( !p_current ) { msg_Err( p_access, "unable to find item in playlist" ); - vlc_object_release( p_playlist ); + vlc_object_release( p_input ); + pl_Release( p_access ); return VLC_ENOOBJ; } /* Remove the ending '/' char */ - if (psz_name[0]) + if( psz_name[0] ) { char *ptr = psz_name + strlen (psz_name); switch (*--ptr) @@ -233,35 +255,30 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) 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 ); + pl_Unlocked ); + assert( p_item_in_category ); - ReadDir( p_playlist, psz_name, i_mode, p_current, p_item_in_category, + ReadDir( p_access, p_playlist, psz_name, i_mode, + p_item_in_category, p_current_input, (DIR *)p_access->p_sys, NULL ); - i_activity = var_GetInteger( p_playlist, "activity" ); - var_SetInteger( p_playlist, "activity", i_activity - - DIRECTORY_ACTIVITY ); - playlist_Signal( p_playlist ); - if( psz_name ) free( psz_name ); - vlc_object_release( p_playlist ); + free( psz_name ); + vlc_object_release( p_input ); + pl_Release( p_access ); /* Return fake data forever */ p_access->pf_read = ReadNull; - return ReadNull( p_access, p_buffer, i_len ); + return -1; } /***************************************************************************** - * DemuxOpen: + * Control: *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - vlc_bool_t *pb_bool; + bool *pb_bool; int *pi_int; int64_t *pi_64; @@ -272,8 +289,8 @@ static int Control( access_t *p_access, int i_query, va_list args ) 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 */ + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; /* FIXME */ break; /* */ @@ -293,6 +310,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: @@ -330,7 +348,7 @@ static int Demux( demux_t *p_demux ) *****************************************************************************/ 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 demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args ); } @@ -349,8 +367,9 @@ struct stat_list_t /***************************************************************************** * ReadDir: read a directory and add its content to the list *****************************************************************************/ -static int ReadDir( playlist_t *p_playlist, const char *psz_name, - int i_mode, playlist_item_t *p_parent, +static int ReadDir( access_t *p_access, playlist_t *p_playlist, + const char *psz_name, + int i_mode, playlist_item_t *p_parent_category, input_item_t *p_current_input, DIR *handle, stat_list_t *stparent ) @@ -359,6 +378,12 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, int i_dir_content, i, i_return = VLC_SUCCESS; playlist_item_t *p_node; + if( !vlc_object_alive( p_access ) ) + return VLC_EGENERIC; + + if( !vlc_object_alive( p_playlist ) ) + return VLC_EGENERIC; + char **ppsz_extensions = NULL; int i_extensions = 0; char *psz_ignore; @@ -369,8 +394,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, if ((fd == -1) || fstat (fd, &stself.st)) { - msg_Err (p_playlist, "cannot stat `%s': %s", psz_name, - strerror (errno)); + msg_Err (p_playlist, "cannot stat `%s': %m", psz_name); return VLC_EGENERIC; } @@ -397,8 +421,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, i_dir_content = utf8_loaddir (handle, &pp_dir_content, NULL, Sort); if( i_dir_content == -1 ) { - msg_Err (p_playlist, "cannot read `%s': %s", psz_name, - strerror (errno)); + msg_Err (p_playlist, "cannot read `%s': %m", psz_name); return VLC_EGENERIC; } else if( i_dir_content <= 0 ) @@ -437,7 +460,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, psz_parser = ptr + 1; } } - if( psz_ignore ) free( psz_ignore ); + free( psz_ignore ); /* While we still have entries in the directory */ for( i = 0; i < i_dir_content; i++ ) @@ -467,14 +490,16 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, msg_Dbg (p_playlist, "creating subdirectory %s", psz_uri); + PL_LOCK; p_node = playlist_NodeCreate( p_playlist, entry, p_parent_category, - PLAYLIST_NO_REBUILD ); - + PLAYLIST_NO_REBUILD, NULL ); + PL_UNLOCK; + assert( p_node ); /* If we had the parent in category, the it is now node. * Else, we still don't have */ - i_return = ReadDir( p_playlist, psz_uri , MODE_EXPAND, - p_node, p_parent_category ? p_node : NULL, + i_return = ReadDir( p_access, p_playlist, psz_uri , MODE_EXPAND, + p_parent_category ? p_node : NULL, p_current_input, subdir, &stself ); closedir (subdir); if (i_return) @@ -505,31 +530,35 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7); memcpy (psz_uri, "file://", 7); - p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), + p_input = input_ItemNewWithType( p_playlist, psz_uri, entry, 0, NULL, - -1, ITEM_TYPE_VFILE ); + -1, ITEM_TYPE_FILE ); if (p_input != NULL) { if( p_current_input ) input_ItemCopyOptions( p_current_input, p_input ); - playlist_BothAddInput( p_playlist, p_input, + assert( p_parent_category ); + int i_ret = playlist_BothAddInput( p_playlist, p_input, p_parent_category, PLAYLIST_APPEND|PLAYLIST_PREPARSE| PLAYLIST_NO_REBUILD, PLAYLIST_END, NULL, NULL, - VLC_FALSE ); + pl_Unlocked ); + vlc_gc_decref( p_input ); + if( i_ret != VLC_SUCCESS ) + return VLC_EGENERIC; } } } } for( i = 0; i < i_extensions; i++ ) - if( ppsz_extensions[i] ) free( ppsz_extensions[i] ); - if( ppsz_extensions ) free( ppsz_extensions ); + free( ppsz_extensions[i] ); + free( ppsz_extensions ); 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 ); + free( pp_dir_content[i] ); + free( pp_dir_content ); return i_return; } @@ -543,7 +572,7 @@ static DIR *OpenDir (vlc_object_t *obj, const char *path) { int err = errno; if (err != ENOTDIR) - msg_Err (obj, "%s: %s", path, strerror (err)); + msg_Err (obj, "%s: %m", path); else msg_Dbg (obj, "skipping non-directory `%s'", path); errno = err;