This commit is contained in:
2020-01-27 03:32:56 -08:00
parent 743ee4be1f
commit fbe2b8a7e8
10 changed files with 58 additions and 16 deletions

View File

@@ -111,7 +111,7 @@ if ($p['thumbs'] && $ext && $ext != "DS_Store") {
if (!is_dir(dirname($tfile))) { @mkdir(dirname($tfile),0777,true); dfm("mkdir ".dirname($tfile)); }
if ($ext == "DS_Store") {
if (empty($p['t_b'][$ext])) {
// file extension is in the skip list
$estring .= " ->t_skip";
dfm("skipping ds_store");
@@ -312,7 +312,7 @@ if ($p['icons'] && $ext != "DS_Store") {
if ($ext || file_exists($pathname."/Icon\r")) {
dfm("Ext or custom icon found, processing ".$pathname." with iff");
$tools = array("iff");
} elseif (glob($globsafe."/".globstring($p['album_files']),GLOB_BRACE) && $test = glob($globsafe."/".globstring($p['cover_exts'],$p['cover_files']),GLOB_BRACE)) {
} elseif (( glob($globsafe."/".globstring($p['album_files']),GLOB_BRACE) || glob($globsafe."/*/".globstring($p['album_files']),GLOB_BRACE)) && $test = glob($globsafe."/".globstring($p['cover_exts'],$p['cover_files']),GLOB_BRACE)) {
dfm("Album files and cover found, processing ".$pathname." with flacdiricon");
$cmd['flacdiricon'] = $bin_flacdiricon." ".$shellpath." ".$p['icon_size']." ".escapeshellarg(array_shift($test))." ".$tfile;
$tools = array("flacdiricon");