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

0.7.9.3

Browse Source
This commit is contained in:
profiteroles
2019-04-09 01:13:49 -07:00
parent 01d7489c05
commit 9884d19108
6 changed files with 171 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/rtc.php
View File

@@ -1,10 +1,10 @@
<?
/////////////////////////////////////////////////////////////////
// Skim RTC Browser
// Yuba RTC Browser
/////////////////////////////////////////////////////////////////
$browser_version = "0.7.9";
$browser_version = "0.7.9.2";
require "togggle.php";
require "lib/debug.php";
@@ -22,6 +22,8 @@ $pad = 28;
html { font-family: Helvetica; word-wrap: break-word; }
div#exectime { position: absolute; right: 8px; top: 8px; }
div.container { display: flex; flex-flow: row wrap; justify-content: center; }
div.item { width: <?=$icon_size+$pad;?>px; height: <?=$icon_size+$pad;?>px; padding: <?=$pad;?>px; }
div.item { font-size: 11px; }
@@ -224,13 +226,14 @@ if ($db_file) {
if (!is_readable($db_file)) { echo "can't read db file"; die; }
$dbo = new PDO("sqlite:".$db_file);
$dbx = new PDO("sqlite:".dirname($db_file)."/pool.sqlite3");
$dbp = new PDO("sqlite:".dirname($db_file)."/pool.sqlite3");
$dbo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
$dbx->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
$dbp->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
// Get zpath
$zpath = $dbo->query("SELECT zpath FROM _skim")->fetch()['zpath'];
$skim_version = $dbo->query("SELECT version FROM _skim")->fetch()['version'];
// Check for initial view
@@ -322,18 +325,18 @@ if ($db_file) {
// newer version stores rowid rather than 0 or 1 for has_exif etc
if (isset($row_a['has_exif'])) {
$row_c = $dbx->query("SELECT * FROM exiftool WHERE (rowid='".$row_a['has_exif']."')")->fetch();
$row_c = $dbp->query("SELECT * FROM exiftool WHERE (rowid='".$row_a['has_exif']."')")->fetch();
}
if (isset($row_a['has_mediainfo'])) {
$row_d = $dbx->query("SELECT * FROM mediainfo WHERE (rowid='".$row_a['has_mediainfo']."')")->fetch();
$row_d = $dbp->query("SELECT * FROM mediainfo WHERE (rowid='".$row_a['has_mediainfo']."')")->fetch();
}
} else {
// fetch exif and mediainfo by slower fid
$row_c = $dbx->query("SELECT * FROM exiftool WHERE (fid='".$row_a['fid']."')")->fetch();
$row_d = $dbx->query("SELECT * FROM mediainfo WHERE (fid='".$row_a['fid']."')")->fetch();
$row_c = $dbp->query("SELECT * FROM exiftool WHERE (fid='".$row_a['fid']."')")->fetch();
$row_d = $dbp->query("SELECT * FROM mediainfo WHERE (fid='".$row_a['fid']."')")->fetch();
}
@@ -583,7 +586,7 @@ if ($db_file) {
echo number_format($info['passed_total'])." files, ";
if ($info['image_file']) { echo $info['image_file'].", "; }
echo $status;
if (strpos($info['spotlight_status'],"disabled")) { echo " (no spotlight)"; }
if (strpos($info['mdutil'],"disabled")) { echo " (no spotlight)"; }
echo "</div>";
}
echo "</div>";
@@ -592,7 +595,8 @@ if ($db_file) {
/////////////////////////////////////////////////////////////////
echo "<hr><br>".round($time = microtime(true)-$_SERVER["REQUEST_TIME_FLOAT"],2)." seconds";
echo "<hr><div id='exectime'>".round($time = microtime(true)-$_SERVER["REQUEST_TIME_FLOAT"],2)." seconds</div>";
echo "<div>Skim version = ".$skim_version.", RTC Browser Version = ".$browser_version."</div>";
?>