1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 03:49:56 +02:00

tweaking it a little

This commit is contained in:
Karl 'vollmerk' Vollmer 2006-01-08 08:35:29 +00:00
parent 4e7b4730a5
commit 3529017916

View file

@ -136,15 +136,16 @@ function sort_find_home($song,$sort_pattern,$base) {
$sort_pattern = preg_replace("/\/?%o\//","",$sort_pattern); $sort_pattern = preg_replace("/\/?%o\//","",$sort_pattern);
$first_element = substr($sort_pattern,0,2); $first_element = substr($sort_pattern,0,2);
$element = sort_element_name($first_element); $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); $alphabet = preg_replace("/[^A-Za-z0-9]/","ZZ",$alphabet);
$home .= "/$alphabet"; $home .= "/$alphabet";
} }
/* Replace everything we can find */ /* Replace everything we can find */
$replace_array = array('%a','%A','%t','%T','%y','%g'); $replace_array = array('%a','%A','%t','%T','%y','%g','%C');
$content_array = array($artist,$album,$title,$track,$year,$genre); $content_array = array($artist,$album,$title,$track,$year,$genre,'C');
$sort_pattern = str_replace($replace_array,$content_array,$sort_pattern); $sort_pattern = str_replace($replace_array,$content_array,$sort_pattern);
/* Remove non A-Z0-9 chars */ /* Remove non A-Z0-9 chars */
@ -182,7 +183,6 @@ function sort_element_name($key) {
return 'genre'; return 'genre';
break; break;
default: default:
return 'album';
break; break;
} // switch on key } // switch on key