diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-08 08:35:29 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-08 08:35:29 +0000 |
| commit | 35290179165ec14a3003139777a4606c0a8f15f1 (patch) | |
| tree | fba9cdd9a2176624c7b6d80f612a5adeee3fb549 /bin | |
| parent | 4e7b4730a5c8004bab743ba212b65d2c6f8bd9f6 (diff) | |
| download | ampache-35290179165ec14a3003139777a4606c0a8f15f1.tar.gz ampache-35290179165ec14a3003139777a4606c0a8f15f1.tar.bz2 ampache-35290179165ec14a3003139777a4606c0a8f15f1.zip | |
tweaking it a little
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sort_files.php.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/sort_files.php.inc b/bin/sort_files.php.inc index 335985bf..b77f3405 100644 --- a/bin/sort_files.php.inc +++ b/bin/sort_files.php.inc @@ -136,15 +136,16 @@ function sort_find_home($song,$sort_pattern,$base) { $sort_pattern = preg_replace("/\/?%o\//","",$sort_pattern); $first_element = substr($sort_pattern,0,2); $element = sort_element_name($first_element); - $alphabet = strtoupper(substr(${$element},0,1)); + if (!$element) { $alphabet = 'ZZ'; } + else { $alphabet = strtoupper(substr(${$element},0,1)); } $alphabet = preg_replace("/[^A-Za-z0-9]/","ZZ",$alphabet); $home .= "/$alphabet"; } /* Replace everything we can find */ - $replace_array = array('%a','%A','%t','%T','%y','%g'); - $content_array = array($artist,$album,$title,$track,$year,$genre); + $replace_array = array('%a','%A','%t','%T','%y','%g','%C'); + $content_array = array($artist,$album,$title,$track,$year,$genre,'C'); $sort_pattern = str_replace($replace_array,$content_array,$sort_pattern); /* Remove non A-Z0-9 chars */ @@ -182,7 +183,6 @@ function sort_element_name($key) { return 'genre'; break; default: - return 'album'; break; } // switch on key |