ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make export work and fix links to jquery.js

This commit is contained in:
Isaac Connor 2018-07-12 14:07:03 -04:00
parent 95e4341d28
commit 43cee7c383
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
web/skins/classic/includes/export_functions.php
View File

@ -26,7 +26,7 @@ function exportHeader($title) {
<title><?php echo $title ?></title> <title><?php echo $title ?></title>
<style type="text/css"> <style type="text/css">
<!-- <!--
<?php include(ZM_SKIN_PATH.'/css/'.ZM_SKIN_NAME.'/export.css'); ?> <?php include(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/css/'.ZM_SKIN_NAME.'/export.css'); ?>
ul.tabs { ul.tabs {
margin: 0; margin: 0;
@ -69,8 +69,8 @@ html ul.tabs li.active, html ul.tabs li.active a:hover {
} }
--> -->
</style> </style>
<script type="text/javascript" src="jquery.js"></script> <script type="text/javascript" src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>jquery.js"></script>
<script type="text/javascript" src="video.js"></script> <!--<script type="text/javascript" src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>video.js"></script>-->
<script type="text/javascript"> <script type="text/javascript">
/*==========[tab code]==========*/ /*==========[tab code]==========*/
@ -246,11 +246,12 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {
// videojs zoomrotate only when direct recording // videojs zoomrotate only when direct recording
$Zoom = 1; $Zoom = 1;
$Rotation = 0; $Rotation = 0;
$Monitor = $event->Monitor();
if ( $Monitor->VideoWriter() == '2' ) { if ( $Monitor->VideoWriter() == '2' ) {
# Passthrough # Passthrough
$Rotation = $Event->Orientation(); $Rotation = $event->Orientation();
if ( in_array($Event->Orientation(),array('90','270')) ) if ( in_array($event->Orientation(),array('90','270')) )
$Zoom = $Event->Height()/$Event->Width(); $Zoom = $event->Height()/$event->Width();
} }
?> ?>
<div id="videoFeed"> <div id="videoFeed">
@ -258,7 +259,7 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {
width="<?php echo $event->Width() ?>" width="<?php echo $event->Width() ?>"
height="<?php echo $event->Height() ?>" height="<?php echo $event->Height() ?>"
data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'> data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'>
<source src="<?php echo $Event->getStreamSrc(array('mode'=>'mpeg','format'=>'h264')); ?>" type="video/mp4"> <source src="<?php echo $event->getStreamSrc(array('mode'=>'mpeg','format'=>'h264')); ?>" type="video/mp4">
<track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default> <track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default>
Your browser does not support the video tag. Your browser does not support the video tag.
</video> </video>
@ -597,7 +598,7 @@ function exportEventImagesMaster($eids) {
// TODO: Should use find to make this 1 db query // TODO: Should use find to make this 1 db query
foreach ($eids as $eid) { foreach ($eids as $eid) {
//get monitor id and event id //get monitor id and event id
$event = new Event( $eid ); $event = new Event($eid);
$eventMonitorId[$eid] = $event->MonitorId(); $eventMonitorId[$eid] = $event->MonitorId();
$eventPath[$eid] = $event->Relative_Path(); $eventPath[$eid] = $event->Relative_Path();
} }
@ -606,7 +607,7 @@ function exportEventImagesMaster($eids) {
$monitorNames = array(); $monitorNames = array();
//* //*
if(!empty($monitors)) { if ( !empty($monitors) ) {
$tmp = dbFetchAll('SELECT Id,Name FROM Monitors WHERE Id IN ('.implode(',', $monitors).') '); $tmp = dbFetchAll('SELECT Id,Name FROM Monitors WHERE Id IN ('.implode(',', $monitors).') ');
foreach ( $tmp as $row ) { $monitorNames[$row['Id']] = $row['Name']; } foreach ( $tmp as $row ) { $monitorNames[$row['Id']] = $row['Name']; }
} }
@ -787,8 +788,8 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
// create an image slider // create an image slider
if ( !empty($myfilelist) ) { if ( !empty($myfilelist) ) {
$file = 'zmEventImages.html'; $file = $event->Id().'/zmEventImages.html';
if ( !($fp = fopen($event->Id().'/'.$file, 'w')) ) if ( !($fp = fopen($file, 'w')) )
Fatal("Can't open event images export file '$file'"); Fatal("Can't open event images export file '$file'");
fwrite($fp, exportEventImages($event, $exportDetail, $exportFrames, $myfilelist)); fwrite($fp, exportEventImages($event, $exportDetail, $exportFrames, $myfilelist));
fclose($fp); fclose($fp);
@ -843,16 +844,18 @@ function exportEvents(
Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'"); Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'");
} }
} }
$export_dir = ZM_DIR_EXPORTS.'/zmExport'.$connkey; $export_dir = ZM_DIR_EXPORTS.'/zmExport_'.$connkey;
# Ensure that we are going to be able to do this. # Ensure that we are going to be able to do this.
if ( ! file_exists($export_dir) ) { if ( ! file_exists($export_dir) ) {
if ( ! mkdir($export_dir) ) { if ( ! mkdir($export_dir) ) {
Fatal("Can't create exports dir at '$export_dir'"); Fatal("Can't create exports dir at '$export_dir'");
} else { } else {
Logger::Debug("Successfully created '$export_dir'"); Logger::Debug("Successfully created dir '$export_dir'");
} }
} }
if ( !chdir($export_dir) )
Fatal("Can't chdir to $export_dir");
$export_root = 'zmExport'; $export_root = 'zmExport';
$export_listFile = 'zmFileList.txt'; $export_listFile = 'zmFileList.txt';
@ -864,24 +867,31 @@ function exportEvents(
} }
foreach ( $eids as $eid ) { foreach ( $eids as $eid ) {
$event = new Event($eid); $event = new Event($eid);
if ( !mkdir($export_dir.'/'.$event->Id()) )
Error("Can't mkdir $export_dir/".$event->Id());
$exportFileList = array_merge($exportFileList, exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc)); $exportFileList = array_merge($exportFileList, exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc));
exec("cp -as ".$event->Path()." $export_dir/"); foreach ( $exportFileList as $file ) {
exec('cp -as '.$event->Path().'/../'.$file." $export_dir/$file");
}
} }
if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') )
Error("Failed linking jquery.js");
if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
Error("Failed linking video.js");
// create an master image // create an master image
if ( $exportImages ) { if ( $exportImages ) {
if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') )
Error("Failed linking jquery.js");
//if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
//Error("Failed linking video.js");
$html_eventMaster_file = 'zmEventImagesMaster_'.date('Ymd_His'). '.html'; $html_eventMaster_file = 'zmEventImagesMaster_'.date('Ymd_His'). '.html';
$html_eventMaster_path = $export_dir.'/'.$html_eventMaster_file; $html_eventMaster_path = $export_dir.'/'.$html_eventMaster_file;
if ( !($fp = fopen($html_eventMaster_path, 'w')) ) if ( ($fp = fopen($html_eventMaster_path, 'w')) ) {
Fatal("Can't open event images export file '$html_eventMaster_path'"); fwrite($fp, exportEventImagesMaster($eids));
fwrite($fp, exportEventImagesMaster($eids)); fclose($fp);
fclose($fp); $exportFileList[] = $html_eventMaster_file;
$exportFileList[] = $html_eventMaster_file; } else {
Error("Can't open event images export file '$html_eventMaster_path'");
}
} }
$listFile = $export_dir.'/'.$export_listFile; $listFile = $export_dir.'/'.$export_listFile;
@ -897,29 +907,34 @@ function exportEvents(
$archive = ''; $archive = '';
if ( $exportFormat == 'tar' ) { if ( $exportFormat == 'tar' ) {
$archive = ZM_DIR_EXPORTS.'/'.$export_root.'_'.$connkey.'.tar.gz'; $archive = ZM_DIR_EXPORTS.'/'.$export_root.($connkey?'_'.$connkey:'').'.tar.gz';
@unlink($archive); @unlink($archive);
chdir(ZM_DIR_EXPORTS); chdir(ZM_DIR_EXPORTS);
$command = 'nice -10 tar --create --gzip --dereference --file='.escapeshellarg($archive).' zmExport' . $connkey; $command = 'nice -10 tar --create --gzip --dereference --file='.escapeshellarg($archive).' zmExport_'.$connkey.'/';
#$command = 'nice -10 tar --create --gzip --file='.escapeshellarg($archive).' --files-from='.escapeshellarg($listFile); #$command = 'nice -10 tar --create --gzip --file='.escapeshellarg($archive).' --files-from='.escapeshellarg($listFile);
if ( $exportStructure == 'flat' ) { if ( $exportStructure == 'flat' ) {
//strip file paths if we //strip file paths if we
$command .= " --xform='s#^.+/##x'"; $command .= " --xform='s#^.+/##x'";
} }
} elseif ( $exportFormat == 'zip' ) { } elseif ( $exportFormat == 'zip' ) {
$archive = $export_dir.'/'.$export_root.'.zip'; $archive = ZM_DIR_EXPORTS.'/'.$export_root.($connkey?'_'.$connkey:'').'.zip';
@unlink($archive); @unlink($archive);
if ( $exportStructure == 'flat' ) { if ( $exportStructure == 'flat' ) {
$command = 'cat '.escapeshellarg($listFile).' | nice -10 zip -q -j '.escapeshellarg($archive).' -@'; $command = 'nice -10 zip -q -j '.escapeshellarg($archive).' ' . $export_dir;
#$command = 'cat '.escapeshellarg($listFile).' | nice -10 zip -q -j '.escapeshellarg($archive).' -@';
} else { } else {
$command = 'cat '.escapeshellarg($listFile).' | nice -10 zip -q '.escapeshellarg($archive).' -@'; $command = 'nice -10 zip -q '.escapeshellarg($archive).' ' . $export_dir;
#$command = 'cat '.escapeshellarg($listFile).' | nice -10 zip -q '.escapeshellarg($archive).' -@';
} }
} else {
Error("No exportFormat specified.");
return false;
} // if $exportFormat } // if $exportFormat
exec($command, $output, $status); exec($command, $output, $status);
if ( $status ) { if ( $status ) {
Error("Command '$command' returned with status $status"); Error("Command '$command' returned with status $status");
if ( $output[0] ) if ( isset($output[0]) )
Error("First line of output is '".$output[0]."'"); Error("First line of output is '".$output[0]."'");
return false; return false;
} }