Assembla home | Assembla project page
 

Changeset 1027

Show
Ignore:
Timestamp:
07/20/08 10:33:39 (4 months ago)
Author:
Pernod
Message:

Selecting a playlist to automatically load now lists playlists in sub-directories recursively.

Refs #154

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/swisscenter/base/browse.php

    r1014 r1027  
    190190  // ---------------------------------------------------------------------------------- 
    191191 
    192   function dir_contents_FS( $dir, $filetypes, &$dir_list, &$file_list) 
     192  function dir_contents_FS( $dir, $filetypes, &$dir_list, &$file_list, $recursive=false) 
    193193  { 
    194194    if (($dh = @opendir($dir)) !== false) 
    …… 
    198198        if (is_dir($dir.$name) && $name != '.' && $name != '..') 
    199199        { 
    200           $dir_list[]  = array("dirname" => $dir, "filename" => $name);           
     200          $dir_list[]  = array("dirname" => $dir, "filename" => $name); 
     201          if ($recursive) 
     202            dir_contents_FS(str_suffix($dir.$name,'/'), $filetypes, $dir_list, $file_list, $recursive); 
    201203        } 
    202204        elseif ( in_array(file_ext(strtolower($name)), $filetypes)) 

  • trunk/swisscenter/config/config_playlists.php

    r1025 r1027  
    1515    $dir_list  = array(); 
    1616    $file_list = array(); 
    17     dir_contents_FS(str_suffix(get_sys_pref('PLAYLISTS'),'/'), media_exts_playlists(), $dir_list, $file_list); 
     17    dir_contents_FS(str_suffix(get_sys_pref('PLAYLISTS'),'/'), media_exts_playlists(), $dir_list, $file_list, true); 
    1818    $playlists = array(); 
    1919    foreach ($file_list as $file) 
    20       $playlists[file_noext($file["filename"])] = $file["dirname"].$file["filename"]; 
     20    { 
     21      $playlist_name = str_replace(str_suffix(get_sys_pref('PLAYLISTS'),'/'), '', $file["dirname"].$file["filename"]); 
     22      $parts = explode( '.', $playlist_name ); 
     23      unset($parts[count($parts)-1]); 
     24      $playlists[implode('.',$parts)] = $file["dirname"].$file["filename"]; 
     25    } 
    2126     
    2227    echo '<p><h1>'.str('PLAYLISTS').'<p>';