This commit is contained in:
2019-10-21 18:56:29 -07:00
parent 4c161b0526
commit 743ee4be1f
7 changed files with 33 additions and 15 deletions

View File

@@ -272,6 +272,7 @@ if ($p['icons'] && $ext != "DS_Store") {
$cmd['flacicon'] = $bin_flacicon." ".$shellpath." ".$p['icon_size']." ".$tfile;
$cmd['ql-icon'] = $bin_qlicon." --input=".$shellpath." --width=".$p['icon_size']." --height=".$p['icon_size']." | ".$bin_pngquant." - -o ".$tfile;
$cmd['iff'] = $bin_iff." --input=".$shellpath." --width=".($p['icon_size']/2)." --height=".($p['icon_size']/2)." | ".$bin_pngquant." - -o ".$tfile;
$cmd['qltool'] = $bin_qltool." di ".$shellpath." ".$p['icon_size']." ".$p['icon_size']." | base64 --decode | ".$bin_convert." - -scale 50% - | ".$bin_pngquant." - -o ".$tfile;
if ($p['icon_mode'] == 2) {
@@ -309,8 +310,8 @@ if ($p['icons'] && $ext != "DS_Store") {
dfm($pathname." is a dir, proceeding with directory check");
$stmt->BindValue(":fid",$fid);
if ($ext || file_exists($pathname."/Icon\r")) {
dfm("Ext or custom icon found, processing ".$pathname." with qltool");
$tools = array("qltool");
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)) {
dfm("Album files and cover found, processing ".$pathname." with flacdiricon");
$cmd['flacdiricon'] = $bin_flacdiricon." ".$shellpath." ".$p['icon_size']." ".escapeshellarg(array_shift($test))." ".$tfile;
@@ -324,9 +325,9 @@ if ($p['icons'] && $ext != "DS_Store") {
} else {
$stmt->BindValue(":fid",$fid);
if (in_array($extl, $p['i_sox'])) {
$tools = array("flacicon","ql-icon","qltool");
$tools = array("flacicon","ql-icon","iff");
} else {
$tools = array("ql-icon","qltool");
$tools = array("ql-icon","iff");
}
}