compression of old log files #45, template enchancements

bin/crontab/daily.sh

@@ -12,5 +12,11 @@ $baseDir/bin/gen-static-page.sh 1>/dev/null 2>&1
 
 
 # generate heatmap for dump1090
-$baseDir/bin/dump1090-draw_heatmap.sh 1>/dev/null 2>&1
+# $baseDir/bin/dump1090-draw_heatmap.sh 1>/dev/null 2>&1
 
+
+
+# compress and rotate old log files
+find $recordingDir/logs/*.txt -mtime +7 -exec bzip2 {} \;
+mkdir -p $recordingDir/logs/old/
+mv $recordingDir/logs/*.bz2 $recordingDir/logs/old/

bin/crontab/weekly.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# tasks to perform daily
+
+scriptDir="$(dirname "$(realpath "$0")")"
+source $scriptDir/basedir_conf.py > /dev/null
+source $baseDir/_listvars.sh > /dev/null
+
+# generate home page from template
+$baseDir/genpasstable.py 1>/dev/null 2>&1
+$baseDir/bin/gen-static-page.sh 1>/dev/null 2>&1
+
+
+
+
+# update Keplers
+$baseDir/bin/update-keps.sh 1>$recordingDir/logs/keps-update.txt 2>&1
+

bin/gen-static-page.sh

@@ -18,7 +18,7 @@ source $baseDir/_listvars.sh
 
 
 noaaDir=$recordingDir/noaa/
-dirList="$wwwDir/noaa_dirlist.html"
+dirList="$wwwDir/noaa_dirlist.tmp"
 htmlTemplate="$wwwDir/index.tpl"
 htmlOutput="$wwwDir/index.html"
 htmlOutputTable="$wwwDir/table.html"
@@ -32,6 +32,13 @@ echo "" > $dirList
 # ---- NOAA list all dates and times  -------------------------------------------------#
 
 echo "<h2>NOAA recordings</h2>" >> $dirList
+echo "<h4>Recent pass</h4>" >> $dirList
+echo "<img src='$(cat $wwwDir/noaa-last-recording.tmp)-therm+map.th.jpg' alt='recent recording' class='img-thumbnail' />" >> $dirList
+echo "<img src='$(cat $wwwDir/noaa-last-recording.tmp)-MCIR-precip+map.th.jpg' alt='recent recording' class='img-thumbnail' />" >> $dirList
+echo "<img src='$(cat $wwwDir/noaa-last-recording.tmp)-HVC+map.th.jpg' alt='recent recording' class='img-thumbnail' />" >> $dirList
+
+
+echo "<h4>Archive</h4>" >> $dirList
 echo "<ul>" >> $dirList
 for y in $(ls $noaaDir/img/ | sort -rn)
 do
@@ -74,9 +81,9 @@ echo "<ul><li>(All) <a href='$wwwRootPath/recordings/logs/'>Logs</a></li></ul>"
 
 # ---- dump1090  -------------------------------------------------#
 
-echo "<h2>dump1090 heatmap</h2>" >> $dirList
-echo "<img src='$wwwRootPath/recordings/dump1090/heatmap-osm.jpg' alt='dump1090 heatmap' class="img-thumbnail" />" >> $dirList
-echo "<img src='$wwwRootPath/recordings/dump1090/heatmap-osm2.jpg' alt='dump1090 heatmap' class="img-thumbnail" />" >> $dirList
+#echo "<h2>dump1090 heatmap</h2>" >> $dirList
+#echo "<img src='$wwwRootPath/recordings/dump1090/heatmap-osm.jpg' alt='dump1090 heatmap' class="img-thumbnail" />" >> $dirList
+#echo "<img src='$wwwRootPath/recordings/dump1090/heatmap-osm2.jpg' alt='dump1090 heatmap' class="img-thumbnail" />" >> $dirList
 
 
 
@@ -89,7 +96,7 @@ source $htmlTemplate > $htmlOutput
 # ----- PASS LIST ---- #
 
 
-htmlTitle="Pass list"
+htmlTitle="Pass table"
 htmlBody=$(cat $htmlNextPassList)
 htmlBody="<p><img src='nextpass.png' alt='pass table plot' /></p>"$htmlBody
 

modules/noaa/noaa_gallery.sh

@@ -48,6 +48,10 @@ varPeak=$(sed '6q;d' $logFile)
 varFreq=$(sed '7q;d' $logFile)
 
 dateTime=$(date -d @$varStart +"%Y-%m-%d")
+dateTimeDir=$(date -d @$varStart +"%Y/%m/%d")  # directory format of date, eg. 2018/11/22/
+wwwPath=$wwwRootPath/recordings/noaa/img/$dateTimeDir
+
+echo $wwwPath/$fileNameCore > $wwwDir/noaa-last-recording.tmp
 
 cd $imgdir
 
@@ -61,11 +65,12 @@ do
     sizeof=$(du -sh "$obrazek" | cut -f 1)
     # generate thumbnail
     thumbnail=$(makethumb "$obrazek")
-    echo "<a data-fancybox='gallery' data-caption='$varSat | $varDate | $enchancement ($sizeof)' href='$obrazek'><img src='$thumbnail' alt='$enchancement' title='$enchancement | $sizeof' class="img-thumbnail" /></a> " >> $outHtml
+    echo "<a data-fancybox='gallery' data-caption='$varSat | $varDate | $enchancement ($sizeof)' href='$wwwPath/$obrazek'><img src='$wwwPath/$thumbnail' alt='$enchancement' title='$enchancement | $sizeof' class='img-thumbnail' /></a> " >> $outHtml
 done
 
 thumbnail=$(makethumb "$fileNameCore-spectrogram.jpg")
-echo "<a data-fancybox='gallery' data-caption='spectrogram'  href='$fileNameCore-spectrogram.jpg'><img src='$thumbnail' alt='spectrogram' class="img-thumbnail" /></a>" >> $outHtml
+echo "<a data-fancybox='gallery' data-caption='spectrogram' href='$wwwPath/$fileNameCore-spectrogram.jpg'><img src='$wwwPath/$thumbnail' alt='spectrogram' class='img-thumbnail' /></a>" >> $outHtml
+
 
 
 # ----consolidate data from the given day ------------------------------------#

var/www/index.tpl

@@ -7,7 +7,7 @@ cat <<EOF
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="autowx2 atomated satellite receiving station">
-    <meta name="author" content="">
+    <meta name="author" content="filipsPL@github">
 
     <title>autowx2 atomated satellite receiving station :: $htmlTitle</title>
 
@@ -27,7 +27,7 @@ cat <<EOF
     <!-- Navigation -->
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
       <div class="container">
-        <a class="navbar-brand" href="#">
+        <a class="navbar-brand" href="$wwwRootPath">
           autowx2 | automatic receiving station
         </a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
@@ -36,11 +36,11 @@ cat <<EOF
         <div class="collapse navbar-collapse" id="navbarResponsive">
           <ul class="navbar-nav ml-auto">
             <li class="nav-item active">
-              <a class="nav-link" href="$wwwRootPath/">Home
+              <a class="nav-link" href="$wwwRootPath">Home
                 <span class="sr-only">(current)</span>
               </a>
             </li>
-            <a class="nav-link" href="$wwwRootPath/table.html">Capture plan
+            <a class="nav-link" href="$wwwRootPath/table.html">Pass table
             </a>
           </li>
             <li class="nav-item">