]> git.sesse.net Git - vlc/blobdiff - modules/access/directory.c
Use var_InheritString for --decklink-video-connection.
[vlc] / modules / access / directory.c
index e3ee777f909e80630b9ca394c384195066e7181e..b778cf0e252ff37cac3c064a0a556c3092462a77 100644 (file)
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * directory.c: expands a directory (directory: access plug-in)
  *****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
+ *          RĂ©mi Denis-Courmont
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
-#include <vlc_playlist.h>
-#include <vlc_input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include "fs.h"
 #include <vlc_access.h>
-#include <vlc_demux.h>
 
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
-#ifdef HAVE_ERRNO_H
-#   include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
+#   include <fcntl.h>
 #elif defined( WIN32 ) && !defined( UNDER_CE )
 #   include <io.h>
-#elif defined( UNDER_CE )
-#   define strcoll strcmp
 #endif
 
-#ifdef HAVE_DIRENT_H
-#   include <dirent.h>
+#ifdef __sun__
+static inline int dirfd (DIR *dir)
+{
+    return dir->dd_fd;
+}
 #endif
 
-#include <vlc_charset.h>
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-static int  Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
-
-static int  DemuxOpen ( vlc_object_t * );
-
-#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" )
-
-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_( \
-        "Files with these extensions will not be added to playlist when " \
-        "opening a directory.\n" \
-        "This is useful if you add directories that contain playlist files " \
-        "for instance. Use a comma-separated list of extensions." )
-
-vlc_module_begin();
-    set_category( CAT_INPUT );
-    set_shortname( _("Directory" ) );
-    set_subcategory( SUBCAT_INPUT_ACCESS );
-    set_description( _("Standard filesystem directory input") );
-    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 );
-    add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
-                NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
-    set_callbacks( Open, Close );
-
-    add_submodule();
-        set_description( "Directory EOF");
-        set_capability( "demux2", 0 );
-        add_shortcut( "directory" );
-        set_callbacks( DemuxOpen, NULL );
-vlc_module_end();
+#include <vlc_fs.h>
+#include <vlc_url.h>
+#include <vlc_strings.h>
 
+enum
+{
+    MODE_NONE,
+    MODE_COLLAPSE,
+    MODE_EXPAND,
+};
 
-/*****************************************************************************
- * 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 );
-
+typedef struct directory_t directory_t;
+struct directory_t
+{
+    directory_t *parent;
+    DIR         *handle;
+    char        *uri;
+#ifndef WIN32
+    struct stat  st;
+#endif
+#ifndef HAVE_OPENAT
+    char         *path;
+#endif
+};
 
-static int ReadDir( playlist_t *, const char *psz_name, int i_mode,
-                    playlist_item_t *, playlist_item_t *, input_item_t * );
+struct access_sys_t
+{
+    directory_t *current;
+    DIR *handle;
+    char *uri;
+    char *ignored_exts;
+    int mode;
+    int i_item_count;
+    char *psz_xspf_extension;
+};
 
 /*****************************************************************************
  * Open: open the directory
  *****************************************************************************/
-static int Open( vlc_object_t *p_this )
+int DirOpen( vlc_object_t *p_this )
 {
     access_t *p_access = (access_t*)p_this;
 
-    struct stat stat_info;
-
-#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
+    if( !p_access->psz_filepath )
         return VLC_EGENERIC;
 
-    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 )
-{
-}
+    DIR *handle = vlc_opendir (p_access->psz_filepath);
+    if (handle == NULL)
+        return VLC_EGENERIC;
 
-/*****************************************************************************
- * 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;
+    return DirInit (p_access, handle);
 }
 
-/*****************************************************************************
- * Read: read the directory
- *****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
+int DirInit (access_t *p_access, DIR *handle)
 {
-    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;
-    }
+    access_sys_t *p_sys = malloc (sizeof (*p_sys));
+    if (unlikely(p_sys == NULL))
+        goto error;
 
-    /* Remove the ending '/' char */
-    if (psz_name[0])
+    char *uri;
+    if (!strcmp (p_access->psz_access, "fd"))
     {
-        char *ptr = psz_name + strlen (psz_name);
-        switch (*--ptr)
-        {
-            case '/':
-            case '\\':
-                *ptr = '\0';
-        }
+        if (asprintf (&uri, "fd://%s", p_access->psz_location) == -1)
+            uri = NULL;
     }
+    else
+        uri = make_URI (p_access->psz_filepath, "file");
+    if (unlikely(uri == NULL))
+        goto error;
+
+    p_access->p_sys = p_sys;
+    p_sys->current = NULL;
+    p_sys->handle = handle;
+    p_sys->uri = uri;
+    p_sys->ignored_exts = var_InheritString (p_access, "ignore-filetypes");
+    p_sys->i_item_count = 0;
+    p_sys->psz_xspf_extension = strdup( "" );
 
     /* 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;
+    char *psz = var_InheritString (p_access, "recursive");
+    if (psz == NULL || !strcasecmp (psz, "none"))
+        p_sys->mode = MODE_NONE;
+    else if( !strcasecmp( psz, "collapse" )  )
+        p_sys->mode = MODE_COLLAPSE;
     else
-        i_mode = MODE_EXPAND;
+        p_sys->mode = MODE_EXPAND;
     free( psz );
 
-    msg_Dbg( p_access, "opening directory `%s'", p_access->psz_path );
-
-    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_current, p_item_in_category,
-             p_current_input );
-
-    i_activity = var_GetInteger( p_playlist, "activity" );
-    var_SetInteger( p_playlist, "activity", i_activity -
-                    DIRECTORY_ACTIVITY );
+    access_InitFields(p_access);
+    p_access->pf_read  = NULL;
+    p_access->pf_block = DirBlock;
+    p_access->pf_seek  = NULL;
+    p_access->pf_control= DirControl;
+    free (p_access->psz_demux);
+    p_access->psz_demux = strdup ("xspf-open");
 
-    if( psz_name ) free( psz_name );
-    vlc_object_release( p_playlist );
+    return VLC_SUCCESS;
 
-    /* Return fake data forever */
-    p_access->pf_read = ReadNull;
-    return ReadNull( p_access, p_buffer, i_len );
+error:
+    closedir (handle);
+    free (p_sys);
+    return VLC_EGENERIC;
 }
 
 /*****************************************************************************
- * DemuxOpen:
+ * Close: close the target
  *****************************************************************************/
-static int Control( access_t *p_access, int i_query, va_list args )
+void DirClose( vlc_object_t * p_this )
 {
-    vlc_bool_t   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    access_t *p_access = (access_t*)p_this;
+    access_sys_t *p_sys = p_access->p_sys;
 
-    switch( i_query )
+    while (p_sys->current)
     {
-        /* */
-        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;
+        directory_t *current = p_sys->current;
 
-        /* */
-        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;
+        p_sys->current = current->parent;
+        closedir (current->handle);
+        free (current->uri);
+#ifndef HAVE_OPENAT
+        free (current->path);
+#endif
+        free (current);
     }
-    return VLC_SUCCESS;
-}
 
-/*****************************************************************************
- * DemuxOpen:
- *****************************************************************************/
-static int DemuxOpen ( vlc_object_t *p_this )
-{
-    demux_t *p_demux = (demux_t*)p_this;
-
-    if( strcmp( p_demux->psz_demux, "directory" ) )
-        return VLC_EGENERIC;
-
-    p_demux->pf_demux   = Demux;
-    p_demux->pf_control = DemuxControl;
-    return VLC_SUCCESS;
-}
+    /* corner case: Block() not called ever */
+    if (p_sys->handle != NULL)
+        closedir (p_sys->handle);
+    free (p_sys->uri);
 
-/*****************************************************************************
- * Demux: EOF
- *****************************************************************************/
-static int Demux( demux_t *p_demux )
-{
-    return 0;
+    free (p_sys->psz_xspf_extension);
+    free (p_sys->ignored_exts);
+    free (p_sys);
 }
 
-/*****************************************************************************
- * DemuxControl:
- *****************************************************************************/
-static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
+/* Detect directories that recurse into themselves. */
+static bool has_inode_loop (const directory_t *dir)
 {
-    return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
-}
-
+#ifndef WIN32
+    dev_t dev = dir->st.st_dev;
+    ino_t inode = dir->st.st_ino;
 
-static int Sort (const char **a, const char **b)
-{
-    return strcoll (*a, *b);
+    while ((dir = dir->parent) != NULL)
+        if ((dir->st.st_dev == dev) && (dir->st.st_ino == inode))
+            return true;
+#else
+# undef fstat
+# define fstat( fd, st ) (0)
+    VLC_UNUSED( dir );
+#endif
+    return false;
 }
 
-/*****************************************************************************
- * 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,
-                    playlist_item_t *p_parent_category,
-                    input_item_t *p_current_input )
+block_t *DirBlock (access_t *p_access)
 {
-    char **pp_dir_content = NULL;
-    int             i_dir_content, i, i_return = VLC_SUCCESS;
-    playlist_item_t *p_node;
+    access_sys_t *p_sys = p_access->p_sys;
+    directory_t *current = p_sys->current;
+
+    if (p_access->info.b_eof)
+        return NULL;
+
+    if (current == NULL)
+    {   /* Startup: send the XSPF header */
+        static const char header[] =
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+            "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\" xmlns:vlc=\"http://www.videolan.org/vlc/playlist/ns/0/\">\n"
+            " <trackList>\n";
+        block_t *block = block_Alloc (sizeof (header) - 1);
+        if (!block)
+            goto fatal;
+        memcpy (block->p_buffer, header, sizeof (header) - 1);
+
+        /* "Open" the base directory */
+        current = malloc (sizeof (*current));
+        if (current == NULL)
+        {
+            block_Release (block);
+            goto fatal;
+        }
+        current->parent = NULL;
+        current->handle = p_sys->handle;
+#ifndef HAVE_OPENAT
+        current->path = strdup (p_access->psz_filepath);
+#endif
+        current->uri = p_sys->uri;
+        if (fstat (dirfd (current->handle), &current->st))
+        {
+            free (current);
+            block_Release (block);
+            goto fatal;
+        }
 
-    char **ppsz_extensions = NULL;
-    int i_extensions = 0;
-    char *psz_ignore;
+        p_sys->handle = NULL;
+        p_sys->uri = NULL;
+        p_sys->current = current;
+        return block;
+    }
 
-    /* Get the first directory entry */
-    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" );
-        return VLC_EGENERIC;
+    char *entry = vlc_readdir (current->handle);
+    if (entry == NULL)
+    {   /* End of directory, go back to parent */
+        closedir (current->handle);
+        p_sys->current = current->parent;
+        free (current->uri);
+#ifndef HAVE_OPENAT
+        free (current->path);
+#endif
+        free (current);
+
+        if (p_sys->current == NULL)
+        {   /* End of XSPF playlist */
+            char *footer;
+            int len = asprintf( &footer, " </trackList>\n" \
+                " <extension application=\"http://www.videolan.org/vlc/playlist/0\">\n" \
+                "%s" \
+                " </extension>\n" \
+                "</playlist>\n", p_sys->psz_xspf_extension );
+            if (unlikely(len == -1))
+                goto fatal;
+
+            block_t *block = block_heap_Alloc (footer, footer, len);
+            if (unlikely(block == NULL))
+                free (footer);
+            p_access->info.b_eof = true;
+            return block;
+        }
+        else
+        {
+            /* This was the end of a "subnode" */
+            /* Write the ID to the extension */
+            char *old_xspf_extension = p_sys->psz_xspf_extension;
+            if (old_xspf_extension == NULL)
+                goto fatal;
+
+            int len2 = asprintf( &p_sys->psz_xspf_extension, "%s  </vlc:node>\n", old_xspf_extension );
+            if (len2 == -1)
+                goto fatal;
+            free( old_xspf_extension );
+        }
+        return NULL;
     }
-    else if( i_dir_content <= 0 )
+
+    /* Skip current, parent and hidden directories */
+    if (entry[0] == '.')
     {
-        /* directory is empty */
-        if( pp_dir_content ) free( pp_dir_content );
-        return VLC_SUCCESS;
+        free (entry);
+        return NULL;
     }
-
-    /* Build array with ignores */
-    psz_ignore = var_CreateGetString( p_playlist, "ignore-filetypes" );
-    if( psz_ignore && *psz_ignore )
+    /* Handle recursion */
+    if (p_sys->mode != MODE_COLLAPSE)
     {
-        char *psz_parser = psz_ignore;
-        int a;
-
-        for( a = 0; psz_parser[a] != '\0'; a++ )
+        directory_t *sub = malloc (sizeof (*sub));
+        if (sub == NULL)
         {
-            if( psz_parser[a] == ',' ) i_extensions++;
+            free (entry);
+            return NULL;
         }
 
-        ppsz_extensions = (char **)calloc (i_extensions, sizeof (char *));
-
-        for( a = 0; a < i_extensions; a++ )
+        DIR *handle;
+#ifdef HAVE_OPENAT
+        int fd = vlc_openat (dirfd (current->handle), entry, O_RDONLY);
+        if (fd != -1)
         {
-            char *tmp, *ptr;
+            handle = fdopendir (fd);
+            if (handle == NULL)
+                close (fd);
+        }
+        else
+            handle = NULL;
+#else
+        if (asprintf (&sub->path, "%s/%s", current->path, entry) != -1)
+            handle = vlc_opendir (sub->path);
+        else
+            handle = NULL;
+#endif
+        if (handle != NULL)
+        {
+            sub->parent = current;
+            sub->handle = handle;
+
+            char *encoded = encode_URI_component (entry);
+            if ((encoded == NULL)
+             || (asprintf (&sub->uri, "%s/%s", current->uri, encoded) == -1))
+                 sub->uri = NULL;
+            free (encoded);
+
+            if ((p_sys->mode == MODE_NONE)
+             || fstat (dirfd (handle), &sub->st)
+             || has_inode_loop (sub)
+             || (sub->uri == NULL))
+            {
+                free (entry);
+                closedir (handle);
+                free (sub->uri);
+                free (sub);
+                return NULL;
+            }
+            p_sys->current = sub;
 
-            while( psz_parser[0] != '\0' && psz_parser[0] == ' ' ) psz_parser++;
-            ptr = strchr( psz_parser, ',');
-            tmp = ( ptr == NULL )
-                 ? strdup( psz_parser )
-                 : strndup( psz_parser, ptr - psz_parser );
+            /* Add node to xspf extension */
+            char *old_xspf_extension = p_sys->psz_xspf_extension;
+            if (old_xspf_extension == NULL)
+            {
+                free (entry);
+                goto fatal;
+            }
 
-            ppsz_extensions[a] = tmp;
-            psz_parser = ptr + 1;
+            char *title = convert_xml_special_chars (entry);
+            free (entry);
+            if (title == NULL
+             || asprintf (&p_sys->psz_xspf_extension, "%s"
+                          "  <vlc:node title=\"%s\">\n", old_xspf_extension,
+                          title) == -1)
+            {
+                free (title);
+                goto fatal;
+            }
+            free (title);
+            free (old_xspf_extension);
+            return NULL;
         }
+        else
+            free (sub);
     }
-    if( psz_ignore ) free( psz_ignore );
 
-    /* While we still have entries in the directory */
-    for( i = 0; i < i_dir_content; i++ )
+    /* Skip files with ignored extensions */
+    if (p_sys->ignored_exts != NULL)
     {
-        const char *entry = pp_dir_content[i];
-        int i_size_entry = strlen( psz_name ) +
-                           strlen( entry ) + 2 + 7 /* strlen("file://") */;
-        char psz_uri[i_size_entry];
-
-        sprintf( psz_uri, "%s/%s", psz_name, entry);
-
-        /* if it starts with '.' then forget it */
-        if (entry[0] != '.')
+        const char *ext = strrchr (entry, '.');
+        if (ext != NULL)
         {
-#if defined( S_ISDIR )
-            struct stat stat_data;
-
-            if (!utf8_stat (psz_uri, &stat_data)
-             && S_ISDIR(stat_data.st_mode) && i_mode != MODE_COLLAPSE )
-#else
-            if( 0 )
-#endif
+            size_t extlen = strlen (++ext);
+            for (const char *type = p_sys->ignored_exts, *end;
+                 type[0]; type = end + 1)
             {
-#if defined( S_ISLNK )
-/*
- * FIXME: there is a ToCToU race condition here; but it is rather tricky
- * impossible to fix while keeping some kind of portable code, and maybe even
- * in a non-portable way.
- */
-                if (utf8_lstat (psz_uri, &stat_data)
-                 || S_ISLNK(stat_data.st_mode) )
-                {
-                    msg_Dbg( p_playlist, "skipping directory symlink %s",
-                             psz_uri );
-                    continue;
-                }
-#endif
-                if( i_mode == MODE_NONE )
-                {
-                    msg_Dbg( p_playlist, "skipping subdirectory %s", psz_uri );
-                    continue;
-                }
-                else if( i_mode == MODE_EXPAND )
-                {
-                    msg_Dbg(p_playlist, "creading subdirectory %s", psz_uri );
-
-                    p_node = playlist_NodeCreate (p_playlist, entry,
-                                                  p_parent_category);
-
-                    /* 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_current_input )
-                          != VLC_SUCCESS )
-                    {
-                        i_return = VLC_EGENERIC;
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                input_item_t *p_input;
+                end = strchr (type, ',');
+                if (end == NULL)
+                    end = type + strlen (type);
 
-                if( i_extensions > 0 )
+                if (type + extlen == end
+                 && !strncasecmp (ext, type, extlen))
                 {
-                    const char *psz_dot = strrchr (entry, '.' );
-                    if( psz_dot++ && *psz_dot )
-                    {
-                        int a;
-                        for( a = 0; a < i_extensions; a++ )
-                        {
-                            if( !strcmp( psz_dot, ppsz_extensions[a] ) )
-                                break;
-                        }
-                        if( a < i_extensions )
-                        {
-                            msg_Dbg( p_playlist, "ignoring file %s", psz_uri );
-                            continue;
-                        }
-                    }
+                    free (entry);
+                    return NULL;
                 }
 
-                memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7);
-                memcpy (psz_uri, "file://", 7);
-                p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
-                                                 psz_uri, entry, 0, NULL,
-                                                 -1, ITEM_TYPE_VFILE );
-                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_END, NULL, NULL );
-                }
+                if (*end == '\0')
+                    break;
             }
         }
     }
 
-    for( i = 0; i < i_extensions; i++ )
-        if( ppsz_extensions[i] ) free( ppsz_extensions[i] );
-    if( ppsz_extensions ) free( ppsz_extensions );
+    char *encoded = encode_URI_component (entry);
+    free (entry);
+    if (encoded == NULL)
+        goto fatal;
+    int len = asprintf (&entry,
+                        "  <track><location>%s/%s</location>\n" \
+                        "   <extension application=\"http://www.videolan.org/vlc/playlist/0\">\n" \
+                        "    <vlc:id>%d</vlc:id>\n" \
+                        "   </extension>\n" \
+                        "  </track>\n",
+                        current->uri, encoded, p_sys->i_item_count++);
+    free (encoded);
+    if (len == -1)
+        goto fatal;
+
+    /* Write the ID to the extension */
+    char *old_xspf_extension = p_sys->psz_xspf_extension;
+    if (old_xspf_extension == NULL)
+        goto fatal;
+
+    int len2 = asprintf( &p_sys->psz_xspf_extension, "%s   <vlc:item tid=\"%i\" />\n",
+                            old_xspf_extension, p_sys->i_item_count-1 );
+    if (len2 == -1)
+        goto fatal;
+    free( old_xspf_extension );
+
+    block_t *block = block_heap_Alloc (entry, entry, len);
+    if (unlikely(block == NULL))
+    {
+        free (entry);
+        goto fatal;
+    }
+    return block;
+
+fatal:
+    p_access->info.b_eof = true;
+    return NULL;
+}
+
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+int DirControl( access_t *p_access, int i_query, va_list args )
+{
+    switch( i_query )
+    {
+        /* */
+        case ACCESS_CAN_SEEK:
+        case ACCESS_CAN_FASTSEEK:
+            *va_arg( args, bool* ) = false;
+            break;
+
+        case ACCESS_CAN_PAUSE:
+        case ACCESS_CAN_CONTROL_PACE:
+            *va_arg( args, bool* ) = true;
+            break;
 
-    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 );
+        /* */
+        case ACCESS_GET_PTS_DELAY:
+            *va_arg( args, int64_t * ) = 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:
+        case ACCESS_GET_CONTENT_TYPE:
+        case ACCESS_GET_META:
+            return VLC_EGENERIC;
 
-    return i_return;
+        default:
+            msg_Warn( p_access, "unimplemented query in control" );
+            return VLC_EGENERIC;
+    }
+    return VLC_SUCCESS;
 }