This commit is contained in:
2017-06-20 02:36:17 -07:00
parent a0705a54e4
commit 9352804246

View File

@@ -4,7 +4,7 @@
// Yuba // Yuba
// // // //
////////////////////////////////////////// //////////////////////////////////////////
$version = "0.6.0"; $version = "0.6.0.1";
ini_set('memory_limit', '4096M'); ini_set('memory_limit', '4096M');
date_default_timezone_set("America/Los_Angeles"); date_default_timezone_set("America/Los_Angeles");
@@ -740,8 +740,6 @@ if ($wopt_thumbs) {
$shellpath = escapeshellarg($pathname); $shellpath = escapeshellarg($pathname);
$tempfile = $tempdir."/".$fid.".jpg"; $tempfile = $tempdir."/".$fid.".jpg";
/*
// first try to make a thumb with external tools // first try to make a thumb with external tools
$cmd = null; $cmd = null;
if (in_array($ext, $t_files['vips'])) { if (in_array($ext, $t_files['vips'])) {
@@ -752,8 +750,6 @@ if ($wopt_thumbs) {
if ($cmd) { shell_exec($cmd." 2>&1"); } if ($cmd) { shell_exec($cmd." 2>&1"); }
*/
// if those tools failed, try quicklook // if those tools failed, try quicklook
if (!@filesize($tempfile)) { if (!@filesize($tempfile)) {
$cmd = $bin_tq." ".$shellpath." ".$tempfile." public.jpeg-2000 ".$wopt_thumb_size." ".$wopt_thumb_size; $cmd = $bin_tq." ".$shellpath." ".$tempfile." public.jpeg-2000 ".$wopt_thumb_size." ".$wopt_thumb_size;
@@ -782,7 +778,7 @@ if ($wopt_hash) {
$dbh->exec("CREATE TABLE IF NOT EXISTS hash (fid TEXT, hash TEXT)"); $dbh->exec("CREATE TABLE IF NOT EXISTS hash (fid TEXT, hash TEXT)");
if ($wopt_hash_limit) { if ($wopt_hash_limit) {
$message = "Generating hashes for files under".$wopt_hash_limit."GB"; $message = "Generating hashes for files under ".$wopt_hash_limit."GB";
} else { } else {
$message = "Generating hashes for all files"; $message = "Generating hashes for all files";
} }