X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdirectory.c;h=9d43eec97d538a254c222b1c4e8f502f30393b7f;hb=1369d55b16a19dc00d7b5ed0756ce847c0e904db;hp=1438e2083c24eb510bd26bd4ed0d9f7277ea5e84;hpb=4f15591e47d52903b559507bdac13e1f5176de45;p=vlc diff --git a/modules/access/directory.c b/modules/access/directory.c index 1438e2083c..9d43eec97d 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -124,7 +125,7 @@ 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 *, playlist_item_t * ); /***************************************************************************** * Open: open the directory @@ -198,101 +199,72 @@ 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; + char *ptr; + int i_mode, i_activity; - playlist_item_t *p_item; - vlc_bool_t b_play = VLC_FALSE; + playlist_item_t *p_item, *p_root_category; + playlist_t *p_playlist = pl_Yield( p_access ); - 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" ); + psz_name = ToLocale( p_access->psz_path ); + ptr = strdup( psz_name ); + LocaleFree( psz_name ); + if( ptr == NULL ) goto end; - } - else - { - char *ptr; - psz_name = ToLocale( p_access->psz_path ); - ptr = strdup( psz_name ); - LocaleFree( psz_name ); - if( ptr == NULL ) - goto end; + psz_name = ptr; - psz_name = ptr; - - /* Remove the ending '/' char */ - ptr += strlen( ptr ); - if( ( ptr > psz_name ) ) + /* Remove the ending '/' char */ + ptr += strlen( ptr ); + if( ( ptr > psz_name ) ) + { + switch( *--ptr ) { - switch( *--ptr ) - { - case '/': - case '\\': - *ptr = '\0'; - } + 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 */ - /* 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 ); - if( &p_playlist->status.p_item->input == + 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; + return VLC_ENOOBJ; } - b_play = VLC_FALSE; } + p_item->p_input->i_type = ITEM_TYPE_DIRECTORY; - p_item->input.i_type = ITEM_TYPE_DIRECTORY; - if( ReadDir( p_playlist, psz_name , i_mode, p_item ) != VLC_SUCCESS ) - { - } -end: + p_root_category = playlist_LockItemToNode( p_playlist, p_item ); - /* 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 ); - } + 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 ); @@ -387,16 +359,33 @@ static int Filter( const struct dirent *foo ) * 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 ) + int i_mode, playlist_item_t *p_parent, + playlist_item_t *p_parent_category ) { - struct dirent **pp_dir_content; - int i_dir_content, i; + struct dirent **pp_dir_content = 0; + int i_dir_content, i, i_return = VLC_SUCCESS; playlist_item_t *p_node; - /* Build array with ignores */ char **ppsz_extensions = 0; int i_extensions = 0; - char *psz_ignore = var_CreateGetString( p_playlist, "ignore-filetypes" ); + char *psz_ignore; + + /* Get the first directory entry */ + i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort ); + if( i_dir_content == -1 ) + { + 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; @@ -411,41 +400,19 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, for( a = 0; a < i_extensions; a++ ) { - int b; - char *tmp; + char *tmp, *ptr; while( psz_parser[0] != '\0' && psz_parser[0] == ' ' ) psz_parser++; - for( b = 0; psz_parser[b] != '\0'; b++ ) - { - if( psz_parser[b] == ',' ) break; - } - tmp = malloc( b + 1 ); - strncpy( tmp, psz_parser, b ); - tmp[b] = 0; + ptr = strchr( psz_parser, ','); + tmp = ( ptr == NULL ) + ? strdup( psz_parser ) + : strndup( psz_parser, ptr - psz_parser ); + ppsz_extensions[a] = tmp; - psz_parser += b+1; + psz_parser = ptr + 1; } } - /* Change the item to a node */ - if( p_parent->i_children == -1 ) - { - playlist_LockItemToNode( p_playlist,p_parent ); - } - - /* get the first directory entry */ - i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort ); - if( i_dir_content == -1 ) - { - msg_Warn( p_playlist, "failed to read directory" ); - return VLC_EGENERIC; - } - else if( i_dir_content <= 0 ) - { - /* directory is empty */ - return VLC_SUCCESS; - } - /* While we still have entries in the directory */ for( i = 0; i < i_dir_content; i++ ) { @@ -501,27 +468,34 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, p_playlist, psz_tmp ); LocaleFree( psz_tmp ); - 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, - p_node ) != VLC_SUCCESS ) + 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_item_t *p_item; + input_item_t *p_input; char *psz_tmp1, *psz_tmp2, *psz_loc; if( i_extensions > 0 ) @@ -554,30 +528,27 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name, psz_loc ); LocaleFree( psz_loc ); - p_item = playlist_ItemNewWithType( VLC_OBJECT(p_playlist), - psz_tmp1, psz_tmp2, ITEM_TYPE_VFILE ); - playlist_NodeAddItem( p_playlist,p_item, - p_parent->pp_parents[0]->i_view, - p_parent, - PLAYLIST_APPEND | PLAYLIST_PREPARSE, - PLAYLIST_END ); + p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), + psz_tmp1, psz_tmp2, 0, NULL, + -1, ITEM_TYPE_VFILE ); - playlist_CopyParents( p_parent, p_item ); + playlist_AddWhereverNeeded( p_playlist, p_input, p_parent, + p_parent_category, VLC_FALSE, + PLAYLIST_APPEND|PLAYLIST_PREPARSE); } } free( psz_uri ); } for( i = 0; i < i_extensions; i++ ) - { - if( ppsz_extensions[i] ) - free( ppsz_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 VLC_SUCCESS; + + return i_return; }