show when ws not connected
[dweather.git] / loop.pl
diff --git a/loop.pl b/loop.pl
index 71464fd208d81390b2fa588a348855c484adaf83..2e9549120f84faee71707dd079360d97d9bd9e59 100755 (executable)
--- a/loop.pl
+++ b/loop.pl
@@ -13,6 +13,8 @@ use JSON;
 use Debug;
 use SMGLog;
 use Math::Round qw(nearest);
+use File::Copy;
+use Data::Random qw(rand_chars);
 
 use constant pi => 3.14159265358979; 
 
@@ -143,6 +145,8 @@ dbg '***';
 dbg "*** starting $0";
 dbg '***';
 
+read_ld();
+       
 our $dlog = SMGLog->new("day");
 dbg "before next tick";
 Mojo::IOLoop->next_tick(sub { loop() });       
@@ -153,6 +157,9 @@ dbg "after app start";
 write_ld();
 close $dataf if $dataf;
 
+# move all the files along one 
+cycle_loop_data_files();
+
 dbg '***';
 dbg "*** ending $0";
 dbg '***';
@@ -163,12 +170,6 @@ exit 0;
        
 sub loop
 {
-
-       open $dataf, "+>>", $datafn or die "cannot open $datafn $!";
-       $dataf->autoflush(1);
-       
-       read_ld();
-       
        dbg "last_min: " . scalar gmtime($ld->{last_min});
        dbg "last_hour: " . scalar gmtime($ld->{last_hour});
        
@@ -375,6 +376,8 @@ sub process
                if ($dayno > $ld->{last_day}) {
                        $ld->{Temp_Out_Max} = $ld->{Temp_Out_Min} = $temp;
                        $ld->{last_day} = $dayno;
+                       write_ld();
+                       cycle_loop_data_files();
                }
                $ld->{Temp_Out_Max} = $temp if $temp > $ld->{Temp_Out_Max};
                $ld->{Temp_Out_Min} = $temp if $temp < $ld->{Temp_Out_Min};
@@ -416,6 +419,7 @@ sub process
                        @{$ld->{wind_hour}} = ();
                        @{$ld->{wind_min}} = ();
 
+                       output_str($s, 1) if $s;
                        write_ld();
                        
                } elsif ($ts >= $ld->{last_min} + 60) {
@@ -443,6 +447,7 @@ sub process
                        $ld->{last_min} = int($ts/60)*60;
                        @{$ld->{wind_min}} = ();
                        
+                       output_str($s, 1) if $s;
                        write_ld();
 
                } else {
@@ -453,8 +458,8 @@ sub process
                        else {
                                dbg "loop rec not changed" if isdbg 'chan';
                        }
+                       output_str($s, 0) if $s;
                }
-               output_str($s) if $s;
                $ld->{last_h} = \%h;
                ++$loop_count;
        } else {
@@ -479,9 +484,11 @@ sub genstr
 sub output_str
 {
        my $s = shift;
+       my $logit = shift;
+       
        dbg $s;
 #      say $s;
-       $dlog->writenow($s);
+       $dlog->writenow($s) if $logit;
        foreach my $ws (keys $WS) {
                my $tx = $WS->{$ws};
                if ($tx) {
@@ -618,7 +625,10 @@ sub calc_rain
 
 sub read_ld
 {
-       return unless $dataf;
+       unless ($dataf) {
+               open $dataf, "+>>", $datafn or die "cannot open $datafn $!";
+               $dataf->autoflush(1);
+       }
 
        seek $dataf, 0, 0;
        my $s = <$dataf>;
@@ -645,8 +655,11 @@ sub read_ld
 
 sub write_ld
 {
-       return unless $dataf;
-       
+       unless ($dataf) {
+               open $dataf, "+>>", $datafn or die "cannot open $datafn $!";
+               $dataf->autoflush(1);
+       }
+
        seek $dataf, 0, 0;
        truncate $dataf, 0;
        $ld->{ts} = time;
@@ -655,6 +668,16 @@ sub write_ld
        print $dataf "$s\n";
 }
 
+sub cycle_loop_data_files
+{
+       close $dataf if $dataf;
+       
+       rename "$datafn.oooo", "$datafn.ooooo";
+       rename "$datafn.ooo", "$datafn.oooo";
+       rename "$datafn.oo", "$datafn.ooo";
+       rename "$datafn.o", "$datafn.oo";
+       copy $datafn, "$datafn.o";
+}
 
 __DATA__
  
@@ -662,21 +685,34 @@ __DATA__
 % my $url = url_for 'weather';
 <!DOCTYPE html>
 <html>
-  <head><title>DWeather</title></head>
+  <head>
+    <title>DWeather</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
+
+  </head>
   <body>
-       <h1>DWeather</h1>
+    <center><h1>High View Weather</h1></center>
+
 
     <script>
        var ws;
 
-       function process(key,value) {
+    function process(key,value) {
                var d = document.getElementById(key);
                if (d !== null) {
                        d.innerHTML = value;
                }
        }
-
-    function traverse(o) {
+               
+       function traverse(o) {
                console.log(o);
                for (var i in o) {
                        process(i, o[i]);  
@@ -685,51 +721,77 @@ __DATA__
                        }
                }
        }
-
-
-    ws = new WebSocket('<%= $url->to_abs %>');
-    document.body.innerHTML += 'ws connecting to: <%= $url->to_abs %> type_of: ' + typeof(ws) + '<br>';
-    if (typeof(ws) === 'object') {
-               ws.onmessage = function (event) {
-                       var js = JSON.parse(event.data);
-                       if (js !== null && typeof(js) === 'object') {
-                               traverse(js);
+               
+       window.onload = function() {
+
+               ws = new WebSocket('<%= $url->to_abs %>');
+
+               if (typeof(ws) === 'object') {
+                       ws.onmessage = function (event) {
+                               var js = JSON.parse(event.data);
+                               if (js !== null && typeof(js) === 'object') {
+                                       traverse(js);
+                               }
+                       };
+                       ws.onopen = function (event) {
+                               document.getElementById("wsconnect").innerHTML = 'ws connected to: <%= $url->to_abs %>';
+                               ws.send('WebSocket support works! ♥');
+                       };
+                       ws.onclose = function(event) {
+                               document.getElementById("wsconnect").innerHTML = 'ws disconnected, refresh to restart';
                        }
-               };
-               ws.onopen = function (event) {
-                       ws.send('WebSocket support works! ♥');
-               };
-       } else {
-               document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
-       }
+               } else {
+                       document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
+               }
+       } 
     </script>
 
+<div id="container">
+<div id="start-template">
 <br><br>
-<table border=1 width=80%>
+<table border=1 width=80% align="center">
+<tr>
 <th>Time:<td><span id="tm"> </span>
+<th>Sunrise:<td><span id="Sunrise"> </span>
+<th>Sunset:<td><span id="Sunset"> </span>
+<th>Console Volts:<td><span id="Batt_Console"> </span>
+<th>TX Battery OK:<td><span id="Batt_TX_OK"> </span>
+
 <tr>
 <th>Pressure:<td><span id="Pressure"> </span>
+<th>Trend:<td><span id="Pressure_Trend_txt"> </span>
+
 <tr>
 <th>Temperature in:<td> <span id="Temp_In"> </span> 
 <th>Humidity:<td> <span id="Humidity_In"> </span>
+
 <tr>
 <th>Temperature out:<td> <span id="Temp_Out"> </span> 
 <th>Min:<td> <span id="Temp_Out_Min"> </span> 
 <th>Max:<td> <span id="Temp_Out_Max"> </span> 
 <th>Humidity:<td> <span id="Humidity_Out"> </span> 
 <th>Dew Point:<td> <span id="Dew_Point"> </span> 
+
 <tr>
 <th>Wind Direction:<td> <span id="Dir"> </span> 
-<th>Minute:<td> <span id="Dir_1m">  </span> 
+<th>Minute Avg:<td> <span id="Dir_1m">  </span> 
 <th>Speed:<td> <span id="Wind"> </span> 
-<th>Minute:<td> <span id="Wind_1m">  </span>
+<th>Minute Avg:<td> <span id="Wind_1m">  </span>
+
 <tr>
-<th>Rain Hour:<td> <span id="Rain_1h"> </span>
+<th>Rain 30mins:<td> <span id="Rain_1h"> </span>
 <th>Day:<td> <span id="Rain_Day"> </span>
 <th>24hrs:<td> <span id="Rain_24h"> </span>
 <th>Month:<td> <span id="Rain_Month"> </span>
 <th>Year:<td> <span id="Rain_Year"> </span>
 </table>
-  </body>
+<br>
+<div id="wsconnect" align="center"> </div>
+</div>
+</div>
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Latest compiled and minified JavaScript -->
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+</body>
 </html>