From 4c161b052644463ca08e61cf9b9f6a7973ce38ac Mon Sep 17 00:00:00 2001 From: profiteroles Date: Sat, 19 Oct 2019 07:49:11 -0700 Subject: [PATCH] 0.8.0.2 --- CHANGELOG.md | 3 ++- Tester.zip | Bin 68648670 -> 68648670 bytes Yuba.app.zip | Bin 43872372 -> 43872439 bytes Yuba.php | 35 ++++++++++++++++++++++------------- filetypes.php | 4 +++- helper.php | 7 ++++--- 6 files changed, 31 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0563aa5..279139f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ All notable changes to this project will be documented in this file. Older changes are summarized on individual commits. ## [0.8.0.2] -- Tweaks to directory icons +- Tweaks to directory and bundle icons - Output redirection fixes - Thumbnail bindings - "Add to existing" prefs option +- Fixed a fid bug introduced in 0.8.0.0 ## [0.8.0.1] - Move batchfile generation to Prescan diff --git a/Tester.zip b/Tester.zip index 01c6a20981b92313ed6149741c14d9f50882bae0..c0f97e650fe1d2b068e63f1ed4c688917ce1eee7 100644 GIT binary patch delta 13955 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 delta 13955 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 diff --git a/Yuba.app.zip b/Yuba.app.zip index 4315a32fc2d8f09b286819bfaef19e8d85005297..35af1829f5a955b3e7ec9be0300f3560472ef077 100644 GIT binary patch delta 24241 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¥LWM1=AnMqv_!!C4^pJN_Hp+A%08?Y_x>X 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"SELECT * FROM icons WHERE fid='".$pid."'")->fetch(); - if (@$fetch_icon['relative_path']) { - $stmt->BindValue(":icon_filename",$fetch_icon['relative_path']); - $stmt->BindValue(":icon_tool",$fetch_icon['tool']); - } - - } elseif ($type == "file") { - $fetch_icon = @$dbp->query("SELECT * FROM icons WHERE fid='".$fid."'")->fetch(); if (@$fetch_icon['relative_path']) { $stmt->BindValue(":icon_filename",$fetch_icon['relative_path']); @@ -808,6 +796,27 @@ foreach ($files as $splFileInfo) { $stmt->BindValue(":thumb_filename",null); } + } else { + + unset($fetch_icon, $fetch_thumb); + + $fetch_icon = @$dbp->query("SELECT * FROM icons WHERE fid='".$pid."'")->fetch(); + if (@$fetch_icon['relative_path']) { + $stmt->BindValue(":icon_filename",$fetch_icon['relative_path']); + $stmt->BindValue(":icon_tool",$fetch_icon['tool']); + } + + $fetch_thumb = $dbp->query("SELECT * FROM thumbs WHERE fid='".$pid."'")->fetch(); + + if (@$fetch_thumb['relative_path']) { + $stmt->BindValue(":thumb_filename",$fetch_thumb['relative_path']); + $stmt->BindValue(":thumb_width",$fetch_thumb['width']); + $stmt->BindValue(":thumb_height",$fetch_thumb['height']); + $stmt->BindValue(":thumb_tool",$fetch_thumb['tool']); + } else { + $stmt->BindValue(":thumb_filename",null); + } + } // ------------------------------------------------ // diff --git a/filetypes.php b/filetypes.php index 8da943b..9db07dc 100755 --- a/filetypes.php +++ b/filetypes.php @@ -128,6 +128,8 @@ $p['t_b']['m4a'] = array("sox","ql-thumbnail"); $p['t_b']['m4b'] = array("sox","ql-thumbnail"); $p['t_b']['ogg'] = array("sox","ql-thumbnail"); +foreach ($p['bundles'] as $bundle) { $p['t_b'][$bundle] = array("qltool"); } + $p['t_b']['*'] = "ql-thumbnail"; // Don't make icons for these files @@ -303,7 +305,7 @@ foreach (array_merge($mb['t'],$mb['a']) as $item) { $ibuild[] = ":".$item; } -unset($item); +unset($item, $bundle, $ext, $file); // Album dirs ////////////////////////////////////////// diff --git a/helper.php b/helper.php index 4c62fcc..3ecd764 100755 --- a/helper.php +++ b/helper.php @@ -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");