This commit is contained in:
2019-10-19 07:49:11 -07:00
parent 6edb46cc86
commit 4c161b0526
6 changed files with 31 additions and 18 deletions

View File

@@ -90,7 +90,7 @@ dfm("BATCH INIT ".$file.":".print_r($argv,true),2);
// Thumbs //////////////////////////////////////////
thumbs:
if ($p['thumbs'] && $btype == "file" && $ext != "DS_Store") {
if ($p['thumbs'] && $ext && $ext != "DS_Store") {
dfm("THUMBS",1);
@@ -162,6 +162,7 @@ if ($p['thumbs'] && $btype == "file" && $ext != "DS_Store") {
$cmd['ql-thumbnail'] = $bin_qlthumb." ".$shellpath." ".$tfile." public.jpeg ".$p['thumb_size']." ".$p['thumb_size']." .8";
$cmd['qlmanage'] = $bin_qlmanage." -t -s ".$p['thumb_size']." -o ".dirname($tpfile)." ".$shellpath."; ".$bin_sips." -s format jpeg -s formatOptions 80 ".escapeshellarg($tpfile)." --out ".$tfile;
$cmd['qltool'] = $bin_qltool." dp ".$shellpath." ".$p['thumb_size']." ".$p['thumb_size']." | base64 --decode | ".$bin_convert." - -scale 50% ".$tfile;
switch ($p['thumb_mode']) {
case 0: // most files
@@ -307,8 +308,8 @@ if ($p['icons'] && $ext != "DS_Store") {
if ($btype == "dir") {
dfm($pathname." is a dir, proceeding with directory check");
$stmt->BindValue(":fid",$fid);
if (file_exists($pathname."/Icon\r")) {
dfm("Custom icon found, processing ".$pathname." with qltool");
if ($ext || file_exists($pathname."/Icon\r")) {
dfm("Ext or custom icon found, processing ".$pathname." with qltool");
$tools = array("qltool");
} 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");