p/Yuba
1
0
Fork 0
Code Issues 1 Pull Requests Releases 6 Wiki Activity

0.7.12.6pre

Browse Source
This commit is contained in:
profiteroles
2019-06-11 01:13:27 -07:00
parent 0f49dfc62b
commit 86098e024d
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Yuba.php
View File

@@ -603,8 +603,12 @@ if ($p['thumbs']) {
$ext = pathinfo($pathname,PATHINFO_EXTENSION);
$tpath = $bpath."/thumbs/".substr($fid, 0, 2);
if (!is_dir($tpath)) { mkdir($tpath); }
$tfile = $tpath."/".$fid."_".$p['thumb_size'].".jpg";
$tpfile = $tpath."/".$fid."_".$p['thumb_size'].".png";
//$tfile = $tpath."/".$fid."_".$p['thumb_size'].".jpg";
//$tpfile = $tpath."/".$fid."_".$p['thumb_size'].".png";
$tfile = $tpath."/".$fid.".jpg";
$tpfile = $tpath."/".$fid.".png";
if (count($p['t_skip']) && in_array($ext, $p['t_skip'])) {
echo ProgressBar::next("Skipping ".shortlabel($pathname));

14
web/rtc.php
View File

@@ -4,7 +4,7 @@
// Yuba RTC Browser
/////////////////////////////////////////////////////////////////
$browser_version = "0.7.12.5";
$browser_version = "0.7.12.6";
require "togggle.php";
require "lib/ref/ref.php";
@@ -681,6 +681,18 @@ if ($db_file) {
$visibility = "unhidden";
}
////////////////////////////////////////////////
// hack to preview mixed icon/thumb view
$opts = unserialize($dbo->query("SELECT opts FROM _skim")->fetch()['opts']);
$skipicon = array("jpg","png","JPG","jpeg","tif","tiff","DNG","dng","NEF");
if($item['icon_filename'] && !in_array($item['Extension'],$skipicon)) {
$item['thumb_filename'] = $item['icon_filename'];
$item['thumb_width'] = $opts['thumb_size'];
$item['thumb_height'] = $opts['thumb_size'];
$item['thumb_tool'] = "qltool";
}
////////////////////////////////////////////////
if ($item['thumb_filename']) {
$aspect = $item['thumb_width']/$item['thumb_height'];
if ($aspect > 1) {