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

0.7.7

Browse Source
This commit is contained in:
profiteroles
2018-09-14 13:50:27 -07:00
parent a7716a08cc
commit 34de0a92c9
4 changed files with 218 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

279
Yuba.php
View File

@@ -3,7 +3,7 @@
// Yuba // Yuba
// // // //
////////////////////////////////////////// //////////////////////////////////////////
$version = "0.7.6"; $version = "0.7.7";
ini_set('memory_limit', '4096M'); ini_set('memory_limit', '4096M');
date_default_timezone_set("America/Los_Angeles"); date_default_timezone_set("America/Los_Angeles");
@@ -37,6 +37,7 @@ if (is_writable($zpath)) { echo "Warning: source is writeable\n"; }
$bpath = chop($bdest,"/")."/".substr(crc32($zpath),0,3)."_".$blabel.".bundle"; $bpath = chop($bdest,"/")."/".substr(crc32($zpath),0,3)."_".$blabel.".bundle";
if (!is_dir($bpath)) { mkdir($bpath); } if (!is_dir($bpath)) { mkdir($bpath); }
if (!is_dir($bpath."/thumbs")) { mkdir($bpath."/thumbs"); } if (!is_dir($bpath."/thumbs")) { mkdir($bpath."/thumbs"); }
if (!is_dir($bpath."/contents")) { mkdir($bpath."/contents"); }
// Treat these directories as files // Treat these directories as files
$p['bundles'] = array( "app", $p['bundles'] = array( "app",
@@ -100,7 +101,7 @@ $disks = shell_exec("diskutil list 2>&1");
$df = shell_exec("df 2>&1"); $df = shell_exec("df 2>&1");
$df_volume = shell_exec("df ".escapeshellarg($zpath)." | tail -n 1 | rev | cut -d' ' -f1 | rev"); $df_volume = shell_exec("df ".escapeshellarg($zpath)." | tail -n 1 | rev | cut -d' ' -f1 | rev");
$df_device = shell_exec("df ".escapeshellarg($zpath)." | tail -n 1 | cut -d' ' -f1"); $df_device = shell_exec("df ".escapeshellarg($zpath)." | tail -n 1 | cut -d' ' -f1");
$mdutil = shell_exec("mdutil -s ".escapeshellarg($df_volume)); $mdutil = shell_exec("mdutil -s ".$df_volume);
if (strpos($mdutil,"disabled")) { if (strpos($mdutil,"disabled")) {
echo "Warning: spotlight indexing is disabled\n"; echo "Warning: spotlight indexing is disabled\n";
$p['spotlight'] = false; $p['spotlight'] = false;
@@ -114,7 +115,7 @@ if (substr($zpath, 0, 9) != "/Volumes/") {
} }
$diskutil = shell_exec("diskutil info ".$zbase." 2>&1"); $diskutil = shell_exec("diskutil info ".$zbase." 2>&1");
$getstats = array( "Volume Name", $getdetail = array( "Volume Name",
"Protocol", "Protocol",
"Volume UUID", "Volume UUID",
"Device Location", "Device Location",
@@ -122,24 +123,24 @@ $getstats = array( "Volume Name",
"Volume Available Space", "Volume Available Space",
"Level Type" "Level Type"
); );
foreach ($getstats as $stat) { foreach ($getdetail as $detail) {
preg_match("/(".$stat.":)(.*)(\n)/",$diskutil,$matches); preg_match("/(".$detail.":)(.*)(\n)/",$diskutil,$matches);
if (isset($matches[2])) { if (isset($matches[2])) {
if (substr($stat, -5, 5) == "Space") { if (substr($detail, -5, 5) == "Space") {
$pieces = explode(" ", trim($matches[2])); $pieces = explode(" ", trim($matches[2]));
$summary = $pieces[0]." ".$pieces[1]; $summary = $pieces[0]." ".$pieces[1];
$stats[$stat] = $summary; $details[$detail] = $summary;
} else { } else {
$stats[$stat] = trim($matches[2]); $details[$detail] = trim($matches[2]);
} }
} }
} }
$dstats = serialize($stats); $dstring = serialize($details);
if ($zpath == "/") { if ($zpath == "/") {
$type = "Startup disk"; $type = "Startup disk";
} elseif (strtolower($zpath) == strtolower("/Volumes/".$stats["Volume Name"])) { } elseif (strtolower($zpath) == strtolower("/Volumes/".$details["Volume Name"])) {
if ($stats["Protocol"] == "Disk Image") { if ($details["Protocol"] == "Disk Image") {
$type = "Disk image"; $type = "Disk image";
} else { } else {
$type = "External disk"; $type = "External disk";
@@ -164,13 +165,11 @@ echo "Building database...\n";
$dbo = new PDO("sqlite:".$bpath."/".$stamp.".sqlite3"); $dbo = new PDO("sqlite:".$bpath."/".$stamp.".sqlite3");
$dbo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $dbo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
/*
$dbo->query("PRAGMA page_size = 4096"); $dbo->query("PRAGMA page_size = 4096");
$dbo->query("PRAGMA cache_size = 10000"); $dbo->query("PRAGMA cache_size = 10000");
$dbo->query("PRAGMA locking_mode = EXCLUSIVE"); $dbo->query("PRAGMA locking_mode = EXCLUSIVE");
$dbo->query("PRAGMA synchronous = NORMAL"); $dbo->query("PRAGMA synchronous = NORMAL");
$dbo->query("PRAGMA journal_mode = WAL"); $dbo->query("PRAGMA journal_mode = WAL");
*/
$dbo->exec("CREATE TABLE _skim ( $dbo->exec("CREATE TABLE _skim (
version TEXT, version TEXT,
@@ -187,7 +186,7 @@ $dbo->exec("CREATE TABLE _skim (
nodescended INTEGER, nodescended INTEGER,
ignored INTEGER, ignored INTEGER,
dupes INTEGER, dupes INTEGER,
stats TEXT, details TEXT,
qlmanage TEXT, qlmanage TEXT,
sysvers TEXT, sysvers TEXT,
diskutil TEXT, diskutil TEXT,
@@ -235,11 +234,10 @@ $dbo->exec("CREATE TABLE files (
thumb_filename TEXT, thumb_filename TEXT,
thumb_width INTEGER, thumb_width INTEGER,
thumb_height INTEGER, thumb_height INTEGER,
has_contents INTEGER,
contents_filename TEXT contents_filename TEXT
)"); )");
$stmt = $dbo->prepare("INSERT INTO _skim VALUES (:version, :opts, :host, :uid, :zpath, :bpath, :type, :passed_file, :passed_dir, :passed_link, :passed_total, :nodescended, :ignored, :dupes, :stats, :qlmanage, :sysvers, :diskutil, :disks, :df, :df_device, :df_volume, :mdutil, :profile, :status)"); $stmt = $dbo->prepare("INSERT INTO _skim VALUES (:version, :opts, :host, :uid, :zpath, :bpath, :type, :passed_file, :passed_dir, :passed_link, :passed_total, :nodescended, :ignored, :dupes, :details, :qlmanage, :sysvers, :diskutil, :disks, :df, :df_device, :df_volume, :mdutil, :profile, :status)");
$stmt->BindValue(":version",$version); $stmt->BindValue(":version",$version);
$stmt->BindValue(":opts",serialize($p)); $stmt->BindValue(":opts",serialize($p));
$stmt->BindValue(":host",$host); $stmt->BindValue(":host",$host);
@@ -247,7 +245,7 @@ $stmt->BindValue(":uid",posix_getuid());
$stmt->BindValue(":zpath",$zpath); $stmt->BindValue(":zpath",$zpath);
$stmt->BindValue(":bpath",$bpath); $stmt->BindValue(":bpath",$bpath);
$stmt->BindValue(":type",$type); $stmt->BindValue(":type",$type);
$stmt->BindValue(":stats",$dstats); $stmt->BindValue(":details",$dstring);
$stmt->BindValue(":qlmanage",$qlmanage); $stmt->BindValue(":qlmanage",$qlmanage);
$stmt->BindValue(":sysvers",$sysvers); $stmt->BindValue(":sysvers",$sysvers);
$stmt->BindValue(":diskutil",$diskutil); $stmt->BindValue(":diskutil",$diskutil);
@@ -329,7 +327,15 @@ echo "Total files: ".$passed_total."\n";
////////////////////////////////////////// //////////////////////////////////////////
$dbp = new PDO("sqlite:".$bpath."/pool.sqlite3"); $dbp = new PDO("sqlite:".$bpath."/pool.sqlite3");
$dbp->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $dbp->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$dbp->query("PRAGMA page_size = 4096");
$dbp->query("PRAGMA cache_size = 10000");
$dbp->query("PRAGMA locking_mode = EXCLUSIVE");
$dbp->query("PRAGMA synchronous = NORMAL");
$dbp->query("PRAGMA journal_mode = WAL");
$dbp->exec("CREATE TABLE IF NOT EXISTS md5 (fid TEXT, hash TEXT)"); $dbp->exec("CREATE TABLE IF NOT EXISTS md5 (fid TEXT, hash TEXT)");
$dbp->exec("CREATE TABLE IF NOT EXISTS exiftool (fid TEXT, tags TEXT)"); $dbp->exec("CREATE TABLE IF NOT EXISTS exiftool (fid TEXT, tags TEXT)");
$dbp->exec("CREATE TABLE IF NOT EXISTS mediainfo (fid TEXT, info TEXT)"); $dbp->exec("CREATE TABLE IF NOT EXISTS mediainfo (fid TEXT, info TEXT)");
@@ -373,19 +379,17 @@ foreach ($files as $splFileInfo) {
} }
// Cache stat values in stx array // capture stat before values change
/*
if ($splFileInfo->getType() != "link") { if ($splFileInfo->getType() != "link") {
$stx[$i] = array( $splFileInfo->getATime(), $stx[$i] = array( $splFileInfo->getATime(),
$splFileInfo->getMTime(), $splFileInfo->getMTime(),
$splFileInfo->getCTime() ); $splFileInfo->getCTime() );
} }
*/
if ($p['bypass_stat']) { $sty[$i] = statToArray(shell_exec("stat -s ".$shellpath." 2>&1"));
$sty[$i] = "bypass";
} else {
$sty[$i] = chop(shell_exec("stat -x ".$shellpath." 2>&1"));
}
// Check file can be read // Check file can be read
@@ -474,18 +478,6 @@ $dbo->exec($stmt);
$wopt_currstep++; $wopt_currstep++;
// Contents
//////////////////////////////////////////
if ($p['contents']) {
echo "DO CONTENTS HERE\n";
// make a dir in the bundle called contents (similar to thumbs)
// match files smaller than x and with file extension of txt etc
// copy files to hash dirs in bundle (like thumbs dir)
}
// Thumbnails // Thumbnails
////////////////////////////////////////// //////////////////////////////////////////
@@ -564,6 +556,42 @@ if ($p['thumbs']) {
} }
// Contents
//////////////////////////////////////////
if ($p['contents']) {
// should be rewritten to check against filemtimes
echo ProgressBar::start(count($fx),"Gathering contents (".stepString().")");
foreach ($fx as $array) {
$fid = $array[0];
$pathname = $array[1];
$ext = pathinfo($pathname,PATHINFO_EXTENSION);
$cpath = $bpath."/contents/".substr($fid, 0, 2);
$cfile = $cpath."/".$fid.".zip";
if (in_array($ext, $c_files)) {
if (!is_dir($cpath)) { mkdir($cpath); }
if (!file_exists($cfile) && filesize($pathname) < 25000) {
$stmt = $dbp->prepare("INSERT INTO contents VALUES (:fid, :created, :relative_path)");
$stmt->BindValue(":fid",$fid);
$stmt->BindValue(":created",time());
$stmt->BindValue(":relative_path",substr($cfile, strlen($bpath)));
$stmt->execute();
$zip = new ZipArchive();
$zip->open($cfile, ZipArchive::CREATE);
$zip->addfile($pathname,basename($pathname));
$zip->close();
}
}
echo ProgressBar::next(true);
}
echo ProgressBar::finish();
}
// External metadata // External metadata
////////////////////////////////////////// //////////////////////////////////////////
@@ -754,54 +782,6 @@ if ($p['spotlight']) {
} }
// Milk
//////////////////////////////////////////
// Aggregate values
$sb['a'] = array( "t*Title" => array("e_Title","k_Title","m_Title"),
"t*Dimensions" => array("k_PixelWidth.k_PixelHeight","e_PixelWidth.e_PixelHeight","m_PixelWidth.m_PixelHeight"),
"i*Seconds" => array("k_DurationSeconds","e_Duration","m_Duration"),
"d*DateTime" => array("e_DateTimeOriginal","m_EncodedDate","e_CreateDate","e_MediaCreateDate","k_ContentCreationDate"),
"t*Origin" => array("e_CameraModelName","e_Producer","e_CreatorTool","e_WriterName","e_Software","e_Encoder","m_WritingApplication"),
"t*GPS" => array("e_GPSPosition","k_Latitude.k_Longitude"),
"t*Author" => array("e_Author","e_Artist","e_Creator","e_By-line")
);
// Exiftool values
$sb['e'] = array( "i*Orientation",
"t*Compression",
"t*ProfileDescription",
"i*BitDepth",
"t*LensType",
"t*FocalLength",
"t*Aperture",
"t*LightSource",
"t*WhiteBalance" );
// Mediainfo values
$sb['m'] = array( "t*VideoFormat",
"t*AudioFormat",
"i*Tracks",
"t*Profile",
"t*Bitrate" );
// Build DB
unset($cbuild, $ibuild);
foreach (array_merge(array_keys($sb['a']),$sb['e'],$sb['m']) as $name) {
$parts = explode("*",$name);
$ibuild[] = ":".$parts[1];
if ($parts[0] == "t") {
$cbuild[] = $parts[1]." TEXT";
} else {
$cbuild[] = $parts[1]." INTEGER";
}
}
$dbo->exec("CREATE TABLE milk (".implode(",",$cbuild).")");
$stmt = $dbo->prepare("INSERT INTO milk VALUES (".implode(",",$ibuild).")");
$stmt->execute();
// Files // Files
////////////////////////////////////////// //////////////////////////////////////////
@@ -813,7 +793,7 @@ foreach ($files as $splFileInfo) {
// DB // DB
$stmt = $dbo->prepare("INSERT INTO files VALUES (:pid, :fid, :Pathname, :Path, :Filename, :Extension, :Type, :Size, :Inode, :Perms, :Owner, :ATime, :CTime, :MTime, :LinkTarget, :RealPath, :stat, :items, :newest, :gfi_type, :gfi_attr, :gfi_created, :has_exif, :has_mediainfo, :has_hash, :thumb_filename, :thumb_width, :thumb_height, :has_contents, :contents_filename)"); $stmt = $dbo->prepare("INSERT INTO files VALUES (:pid, :fid, :Pathname, :Path, :Filename, :Extension, :Type, :Size, :Inode, :Perms, :Owner, :ATime, :MTime, :CTime, :LinkTarget, :RealPath, :stat, :items, :newest, :gfi_type, :gfi_attr, :gfi_created, :has_exif, :has_mediainfo, :has_hash, :thumb_filename, :thumb_width, :thumb_height, :contents_filename)");
// Identify dir, file, link or bundle dir // Identify dir, file, link or bundle dir
@@ -841,7 +821,7 @@ foreach ($files as $splFileInfo) {
$stmt->BindValue(":Extension",$extension); $stmt->BindValue(":Extension",$extension);
//stat //stat
$stmt->BindValue(":stat",$sty[$j]); $stmt->BindValue(":stat",serialize($sty[$j]));
if ($type == "link") { if ($type == "link") {
@@ -854,9 +834,9 @@ foreach ($files as $splFileInfo) {
$stmt->BindValue(":Perms",$splFileInfo->getPerms()); $stmt->BindValue(":Perms",$splFileInfo->getPerms());
$stmt->BindValue(":Owner",$splFileInfo->getOwner().":".$splFileInfo->getGroup()); $stmt->BindValue(":Owner",$splFileInfo->getOwner().":".$splFileInfo->getGroup());
$stmt->BindValue(":ATime",$stx[$j][0]); $stmt->BindValue(":ATime",$splFileInfo->getATime());
$stmt->BindValue(":MTime",$stx[$j][1]); $stmt->BindValue(":MTime",$splFileInfo->getMTime());
$stmt->BindValue(":CTime",$stx[$j][2]); $stmt->BindValue(":CTime",$splFileInfo->getCTime());
} }
@@ -928,17 +908,18 @@ foreach ($files as $splFileInfo) {
unset($fetch_exif, $fetch_media, $fetch_hash, $fetch_thumb, $yes_exif, $yes_media, $yes_hash); unset($fetch_exif, $fetch_media, $fetch_hash, $fetch_thumb, $yes_exif, $yes_media, $yes_hash);
$fetch_exif = @unserialize($dbp->query("SELECT tags FROM exiftool WHERE fid='".$fid."'")->fetch()[0]); $yes_exif = $dbp->query("SELECT rowid FROM exiftool WHERE fid='".$fid."'")->fetch()[0];
is_array($fetch_exif) ? $yes_exif = 1 : $yes_exif = 0;
$stmt->BindValue(":has_exif",$yes_exif); $stmt->BindValue(":has_exif",$yes_exif);
$fetch_media = @unserialize($dbp->query("SELECT info FROM mediainfo WHERE fid='".$fid."'")->fetch()[0]); $yes_media = $dbp->query("SELECT rowid FROM mediainfo WHERE fid='".$fid."'")->fetch()[0];
is_array($fetch_media) ? $yes_media = 1 : $yes_media = 0;
$stmt->BindValue(":has_mediainfo",$yes_media); $stmt->BindValue(":has_mediainfo",$yes_media);
$yes_hash = $dbp->query("SELECT EXISTS(SELECT 1 FROM md5 WHERE fid='".$fid."')")->fetch()[0]; $yes_hash = $dbp->query("SELECT rowid FROM md5 WHERE fid='".$fid."'")->fetch()[0];
$stmt->BindValue(":has_hash",$yes_hash); $stmt->BindValue(":has_hash",$yes_hash);
$yes_contents = $dbp->query("SELECT relative_path FROM contents WHERE fid='".$fid."'")->fetch()[0];
$stmt->BindValue(":contents_filename",$yes_contents);
$fetch_thumb = $dbp->query("SELECT * FROM thumbs WHERE fid='".$fid."'")->fetch(); $fetch_thumb = $dbp->query("SELECT * FROM thumbs WHERE fid='".$fid."'")->fetch();
if (@$fetch_thumb['relative_path']) { if (@$fetch_thumb['relative_path']) {
$stmt->BindValue(":thumb_filename",$fetch_thumb['relative_path']); $stmt->BindValue(":thumb_filename",$fetch_thumb['relative_path']);
@@ -950,63 +931,35 @@ foreach ($files as $splFileInfo) {
} }
// ------------------------------------------------ //
// Milk
// ------------------------------------------------ // // ------------------------------------------------ //
// Write to DB // Write to DB
$stmt->execute(); $stmt->execute();
// Set fileatime back to original value
//if ($type != "link" && is_writable($pathname) && $p['fixatimes']) {
// exec("touch -at `date -r ".$atime." +%Y%m%d%H%M.%S` ".$shellpath." 2>&1");
// }
// Double check stat for file against pre-run value // Double check stat for file against pre-run value
if ($p['verify_stat'] && $type != "link") { if ($p['verify_stat'] && $type != "link") {
$pre_access = $pre_modify = $pre_change = null; $restat = statToArray(shell_exec("stat -s ".$shellpath." 2>&1"));
$post_access = $post_modify = $post_change = null;
foreach (explode("\n", $sty[$j]) as $line) {
$check = substr($line, 0, 6);
if ($check == "Access") { $pre_access = $line; }
if ($check == "Modify") { $pre_modify = $line; }
if ($check == "Change") { $pre_change = $line; }
}
foreach (explode("\n", chop(shell_exec("stat -x ".$shellpath." 2>&1"))) as $line) {
$check = substr($line, 0, 6);
if ($check == "Access") { $post_access = $line; }
if ($check == "Modify") { $post_modify = $line; }
if ($check == "Change") { $post_change = $line; }
}
$message = array(); $message = array();
if ($pre_access != $post_access) { if ($sty[$j]['st_atime'] != $restat['st_atime']) {
$message[] = "ATIME"; if ($p['fixatimes'] && $type != "link" && is_writable($pathname)) {
exec("touch -at `date -r ".$sty[$j]['st_atime']." +%Y%m%d%H%M.%S` ".$shellpath." 2>&1");
$message[] = "atime (fix)";
} else {
$message[] = "atime";
}
} }
if ($pre_modify != $post_modify) { if ($sty[$j]['st_mtime'] != $restat['st_mtime']) {
$message[] = "MTIME"; $message[] = "mtime";
} }
if ($pre_change != $post_change) { if ($sty[$j]['st_ctime'] != $restat['st_ctime']) {
$message[] = "CTIME"; $message[] = "ctime";
} }
if (count($message)) { echo "\nChanged: ".implode(", ", $message)."\n"; } if (count($message)) { echo "\nFILE = ".$filename."; CHANGE = ".implode(", ", $message)."\n"; }
} }
@@ -1017,6 +970,60 @@ foreach ($files as $splFileInfo) {
echo ProgressBar::finish(); echo ProgressBar::finish();
// Milk
//////////////////////////////////////////
// Aggregate values
$sb['a'] = array( "t*Title" => array("e_Title","k_Title","m_Title"),
"t*Dimensions" => array("k_PixelWidth.k_PixelHeight","e_PixelWidth.e_PixelHeight","m_PixelWidth.m_PixelHeight"),
"i*Seconds" => array("k_DurationSeconds","e_Duration","m_Duration"),
"d*DateTime" => array("e_DateTimeOriginal","m_EncodedDate","e_CreateDate","e_MediaCreateDate","k_ContentCreationDate"),
"t*Origin" => array("e_CameraModelName","e_Producer","e_CreatorTool","e_WriterName","e_Software","e_Encoder","m_WritingApplication"),
"t*GPS" => array("e_GPSPosition","k_Latitude.k_Longitude"),
"t*Author" => array("e_Author","e_Artist","e_Creator","e_By-line")
);
// Exiftool values
$sb['e'] = array( "i*Orientation",
"t*Compression",
"t*ProfileDescription",
"i*BitDepth",
"t*LensType",
"t*FocalLength",
"t*Aperture",
"t*LightSource",
"t*WhiteBalance" );
// Mediainfo values
$sb['m'] = array( "t*VideoFormat",
"t*AudioFormat",
"i*Tracks",
"t*Profile",
"t*Bitrate" );
// Build DB
unset($cbuild, $ibuild);
foreach (array_merge(array_keys($sb['a']),$sb['e'],$sb['m']) as $name) {
$parts = explode("*",$name);
$ibuild[] = ":".$parts[1];
if ($parts[0] == "t") {
$cbuild[] = $parts[1]." TEXT";
} else {
$cbuild[] = $parts[1]." INTEGER";
}
}
$dbo->exec("CREATE TABLE milk (".implode(",",$cbuild).")");
$stmt = $dbo->prepare("INSERT INTO milk VALUES (".implode(",",$ibuild).")");
$stmt->execute();
//$q = $dbo->query("SELECT rowid, * FROM files");
//while ($row = $q->fetch_assoc()) {
// print_r($row);
// }
//$q->free();
// Cleanup // Cleanup
////////////////////////////////////////// //////////////////////////////////////////
@@ -1033,9 +1040,9 @@ if ($p['rsync_dest']) {
echo "\nrsync...\n"; echo "\nrsync...\n";
$command = "rsync -avv -e ssh ".$bpath." ".$p['rsync_dest']; $command = "rsync -avv -e ssh ".$bpath." ".$p['rsync_dest'];
$count = trim(shell_exec("find ".escapeshellarg($bpath)." | wc -l")); $count = trim(shell_exec("find ".escapeshellarg($bpath)." | wc -l"));
echo ProgressBar::start($count,"rsync"); echo ProgressBar::start($count,$p['rsync_dest']);
$pipe = popen($command, "r"); $pipe = popen($command, "r");
while(fgets($pipe, 2048)) { echo ProgressBar::next(); } while(fgets($pipe, 2048)) { echo ProgressBar::next(true); }
pclose($pipe); pclose($pipe);
echo ProgressBar::finish(); echo ProgressBar::finish();
} }

7
filetypes.php
View File

@@ -3,6 +3,13 @@
// Filetypes // Filetypes
////////////////////////////////////////// //////////////////////////////////////////
$c_files = array( "txt",
"rtf",
"rtfd",
"xls",
"log",
"webloc" );
$t_files['ffmpeg'] = array( "mkv", $t_files['ffmpeg'] = array( "mkv",
"avi", "avi",
"mpeg", "mpeg",

11
functions.php
View File

@@ -27,7 +27,7 @@ class ProgressBar {
self::$time_remain = floor($seconds/$progress)-$seconds; self::$time_remain = floor($seconds/$progress)-$seconds;
self::$time_update = time(); self::$time_update = time();
} }
$message = gmdate("H:i:s",self::$time_remain)." | ".$message; $message = gmdate("H:i:s",self::$time_remain)." ".$message;
} }
if ($message) { if ($message) {
@@ -76,6 +76,15 @@ function getParents($zpath, $pathname) {
} }
*/ */
function statToArray($stat) {
foreach (explode(" ",$stat) as $part) {
$value = explode("=",$part);
$out[$value[0]] = $value[1];
}
return $out;
}
function stepString() { function stepString() {
global $wopt_steps; global $wopt_steps;
global $wopt_currstep; global $wopt_currstep;

75
web/rtc.php
View File

@@ -5,7 +5,7 @@
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
require "togggle.php"; require "togggle.php";
require "lib/debug.php"; require "debug.php";
$db_dir = "skim"; $db_dir = "skim";
$icon_size = 64; $icon_size = 64;
@@ -27,6 +27,7 @@ div.flexfill { width: <?=$icon_size+($pad*3);?>px; height: 1px; }
div.size { color: grey; margin-top: 3px; } div.size { color: grey; margin-top: 3px; }
img.thumb { padding: 6px; border: 1px solid gainsboro; } img.thumb { padding: 6px; border: 1px solid gainsboro; }
img.item { float: left; margin-right: 10px; width: 32px; height: 32px; }
img { margin-bottom: 8px; } img { margin-bottom: 8px; }
</style> </style>
@@ -194,13 +195,39 @@ if ($db_file) {
// File view // File view
$skim_version = $dbo->query("SELECT version FROM _skim")->fetch()['version'];
$spotlight_status = $dbo->query("SELECT mdutil FROM _skim")->fetch()['mdutil'];
echo "<table><tr>"; echo "<table><tr>";
echo "<td valign='top'>"; echo "<td valign='top'>";
$row_a = $dbo->query("SELECT * FROM files WHERE (pid='".$pid."')")->fetchAll()[0]; $row_a = $dbo->query("SELECT rowid, * FROM files WHERE (pid='".$pid."')")->fetchAll()[0];
$row_b = $dbo->query("SELECT * FROM mdls WHERE (pid='".$pid."')")->fetchAll()[0];
$row_c = $dbx->query("SELECT * FROM exiftool WHERE (fid='".$row_a['fid']."')")->fetchAll()[0]; if (!strpos($spotlight_status,"disabled")) {
$row_d = $dbx->query("SELECT * FROM mediainfo WHERE (fid='".$row_a['fid']."')")->fetchAll()[0];
$row_b = $dbo->query("SELECT * FROM mdls WHERE (rowid='".$row_a['rowid']."')")->fetchAll()[0];
}
if (version_compare($skim_version,"0.7.7b") > -1) {
// 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']."')")->fetchAll()[0];
}
if (isset($row_a['has_mediainfo'])) {
$row_d = $dbx->query("SELECT * FROM mediainfo WHERE (rowid='".$row_a['has_mediainfo']."')")->fetchAll()[0];
}
} else {
// fetch exif and mediainfo by slower fid
$row_c = $dbx->query("SELECT * FROM exiftool WHERE (fid='".$row_a['fid']."')")->fetchAll()[0];
$row_d = $dbx->query("SELECT * FROM mediainfo WHERE (fid='".$row_a['fid']."')")->fetchAll()[0];
}
if ($row_a['thumb_filename']) { if ($row_a['thumb_filename']) {
$width = $row_a['thumb_width']; $width = $row_a['thumb_width'];
@@ -323,22 +350,34 @@ if ($db_file) {
// DB List // DB List
$icons['Disk image'] = "/icons/dmg.png";
$icons['Folder'] = "/icons/directory.png";
$icons['External disk'] = "/icons/firewire.png";
$icons['Startup disk'] = "/icons/internal.png";
$bundles = glob($db_dir."/*.bundle"); $bundles = glob($db_dir."/*.bundle");
foreach ($bundles as $bundle) { foreach ($bundles as $bundle) {
echo "<h2>".pathinfo($bundle)['filename']."</h2>"; echo "<div id='bundle'>";
$dbs = glob($bundle."/*.sqlite3"); $dbs = array_reverse(glob($bundle."/*.sqlite3"));
foreach ($dbs as $db_file) { array_shift($dbs);
if (!strpos($db_file,"pool")) { if ($dbs[0]) {
echo "<a href='?db=".$db_file."'>".pathinfo($db_file)['filename']."</a>&nbsp;"; $dbo = new PDO("sqlite:".$dbs[0]);
$dbo = new PDO("sqlite:".$db_file); $type = $dbo->query("SELECT type FROM _skim")->fetch()['type'];
echo $dbo->query("SELECT type FROM _skim")->fetch()['type'].", "; echo "<img class='item' src='".$icons[$type]."'>";
echo $dbo->query("SELECT passed_total FROM _skim")->fetch()['passed_total']." files, ";
echo $dbo->query("SELECT status FROM _skim")->fetch()['status'];
$spotlight_status = $dbo->query("SELECT mdutil FROM _skim")->fetch()['mdutil'];
if (strpos($spotlight_status,"disabled")) { echo " (no spotlight)"; }
echo "<br>";
}
} }
echo "<h2>".pathinfo($bundle)['filename']."</h2>";
foreach ($dbs as $db_file) {
$dbo = new PDO("sqlite:".$db_file);
echo "<div>";
echo "<a href='?db=".$db_file."'>".pathinfo($db_file)['filename']."</a>&nbsp;";
echo $dbo->query("SELECT version FROM _skim")->fetch()['version'].", ";
echo $dbo->query("SELECT passed_total FROM _skim")->fetch()['passed_total']." files, ";
echo $dbo->query("SELECT status FROM _skim")->fetch()['status'];
$spotlight_status = $dbo->query("SELECT mdutil FROM _skim")->fetch()['mdutil'];
if (strpos($spotlight_status,"disabled")) { echo " (no spotlight)"; }
echo "</div>";
}
echo "</div>";
} }
} }