Now with a graph!!
[dweather.git] / loop.pl
diff --git a/loop.pl b/loop.pl
index 71464fd208d81390b2fa588a348855c484adaf83..b0e430055b5cebe676ea338e091255938619502a 100755 (executable)
--- a/loop.pl
+++ b/loop.pl
@@ -13,6 +13,9 @@ use JSON;
 use Debug;
 use SMGLog;
 use Math::Round qw(nearest);
+use File::Copy;
+use Data::Random qw(rand_chars);
+use IO::File;
 
 use constant pi => 3.14159265358979; 
 
@@ -105,6 +108,12 @@ websocket '/weather' => sub {
   # send historical data
   $c->send($ld->{lasthour_h}) if exists $ld->{lasthour_h};
   $c->send($ld->{lastmin_h}) if exists $ld->{lastmin_h};
+
+  # send the last 24 hour's worth of data to the graph
+  my $lg = SMGLog->new('day');
+  my $tnow = time;
+  my $dayno = int($tnow/86400);
+  send_history($c, $lg, $tnow, $_) for ($dayno-1, $dayno);  
   
   # disable timeout
   $c->inactivity_timeout(3615);
@@ -125,7 +134,7 @@ websocket '/weather' => sub {
   $c->on(finish => sub {
     my ($c, $code, $reason) = @_;
     app->log->debug("WebSocket closed with status $code.");
-       dbg 'webwocket closed with status $code' if isdbg 'chan';
+       dbg "websocket closed with status $code" if isdbg 'chan';
        delete $WS->{$tx};
   });
 };
@@ -143,6 +152,8 @@ dbg '***';
 dbg "*** starting $0";
 dbg '***';
 
+read_ld();
+       
 our $dlog = SMGLog->new("day");
 dbg "before next tick";
 Mojo::IOLoop->next_tick(sub { loop() });       
@@ -151,7 +162,12 @@ app->start;
 dbg "after app start";
 
 write_ld();
-close $dataf if $dataf;
+$dataf->close if $dataf;
+undef $dataf;
+
+
+# move all the files along one 
+cycle_loop_data_files();
 
 dbg '***';
 dbg "*** ending $0";
@@ -163,12 +179,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});
        
@@ -374,10 +384,21 @@ sub process
                my $dayno = int($ts/86400);
                if ($dayno > $ld->{last_day}) {
                        $ld->{Temp_Out_Max} = $ld->{Temp_Out_Min} = $temp;
+                       $ld->{Temp_Out_Max_T} = $ld->{Temp_Out_Min_T} = clocktime($ts, 0);
                        $ld->{last_day} = $dayno;
+                       write_ld();
+                       cycle_loop_data_files();
+               }
+               if ($temp > $ld->{Temp_Out_Max}) {
+                       $ld->{Temp_Out_Max} = $temp;
+                       $ld->{Temp_Out_Max_T} = clocktime($ts, 0);
+                       write_ld();
+               }
+               if ($temp < $ld->{Temp_Out_Min}) {
+                       $ld->{Temp_Out_Min} = $temp;
+                       $ld->{Temp_Out_Min_T} = clocktime($ts, 0);
+                       write_ld();
                }
-               $ld->{Temp_Out_Max} = $temp if $temp > $ld->{Temp_Out_Max};
-               $ld->{Temp_Out_Min} = $temp if $temp < $ld->{Temp_Out_Min};
 
                if ($ts >= $ld->{last_hour} + 1800) {
                        $h{Pressure_Trend}    = unpack("C", substr $blk,3,1);
@@ -392,6 +413,9 @@ sub process
                        $h{Sunset}  =~ s/(\d{2})(\d{2})/$1:$2/;
                        $h{Temp_Out_Max} = $ld->{Temp_Out_Max};
                        $h{Temp_Out_Min} = $ld->{Temp_Out_Min};
+                       $h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T};
+                       $h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T};
+                       
 
                        if ($loop_count) {      # i.e not the first
                                my $a = wind_average(scalar @{$ld->{wind_hour}} ? @{$ld->{wind_hour}} : {w => $h{Wind}, d => $h{Dir}});
@@ -416,6 +440,7 @@ sub process
                        @{$ld->{wind_hour}} = ();
                        @{$ld->{wind_min}} = ();
 
+                       output_str($s, 1) if $s;
                        write_ld();
                        
                } elsif ($ts >= $ld->{last_min} + 60) {
@@ -435,6 +460,8 @@ sub process
 
                        $h{Temp_Out_Max} = $ld->{Temp_Out_Max};
                        $h{Temp_Out_Min} = $ld->{Temp_Out_Min};
+                       $h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T};
+                       $h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T};
 
                        $last_min_h = {%h};
                        $s = genstr($ts, 'm', \%h);
@@ -443,6 +470,7 @@ sub process
                        $ld->{last_min} = int($ts/60)*60;
                        @{$ld->{wind_min}} = ();
                        
+                       output_str($s, 1) if $s;
                        write_ld();
 
                } else {
@@ -453,8 +481,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 {
@@ -470,18 +498,32 @@ sub genstr
        my $h = shift;
        
        my $j =  $json->encode($h);
-       my ($sec,$min,$hr) = (gmtime $ts)[0,1,2];
-       my $tm = sprintf "%02d:%02d:%02d", $hr, $min, $sec;
-       
+       my $tm = clocktime($ts, $let eq 'r' ? 1 : 0);
        return qq|{"tm":"$tm","t":$ts,"$let":$j}|;
 }
 
+sub clocktime
+{
+       my $ts = shift;
+       my $secsreq = shift;
+       my ($sec,$min,$hr) = (gmtime $ts)[0,1,2];
+       my $s;
+       if ($secsreq) {
+               $s = sprintf "%02d:%02d:%02d", $hr, $min, $sec;
+       } else {
+               $s = sprintf "%02d:%02d", $hr, $min;
+       }
+       return $s;
+}
+
 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) {
@@ -500,7 +542,7 @@ sub gen_hash_diff
        my $count;
 
        while (my ($k, $v) = each %$now) {
-               if ($last->{$k} ne $now->{$k}) {
+               if (!exists $last->{$k} || $last->{$k} ne $now->{$k}) {
                        $o{$k} = $v;
                        ++$count;
                }
@@ -618,7 +660,10 @@ sub calc_rain
 
 sub read_ld
 {
-       return unless $dataf;
+       unless ($dataf) {
+               $dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!";
+               $dataf->autoflush(1);
+       }
 
        seek $dataf, 0, 0;
        my $s = <$dataf>;
@@ -645,8 +690,11 @@ sub read_ld
 
 sub write_ld
 {
-       return unless $dataf;
-       
+       unless ($dataf) {
+               $dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!";
+               $dataf->autoflush(1);
+       }
+
        seek $dataf, 0, 0;
        truncate $dataf, 0;
        $ld->{ts} = time;
@@ -655,81 +703,33 @@ sub write_ld
        print $dataf "$s\n";
 }
 
+sub cycle_loop_data_files
+{
+       $dataf->close if $dataf;
+       undef $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__
-@@ index.html.ep
-% my $url = url_for 'weather';
-<!DOCTYPE html>
-<html>
-  <head><title>DWeather</title></head>
-  <body>
-       <h1>DWeather</h1>
-
-    <script>
-       var ws;
-
-       function process(key,value) {
-               var d = document.getElementById(key);
-               if (d !== null) {
-                       d.innerHTML = value;
-               }
-       }
-
-    function traverse(o) {
-               console.log(o);
-               for (var i in o) {
-                       process(i, o[i]);  
-                       if (o[i] !== null && typeof(o[i])=="object") {
-                               traverse(o[i]);
+sub send_history
+{
+       my $c = shift;
+       my $lg = shift;
+       my $tnow = shift;
+       my $dayno = shift;
+       if ($lg->open($dayno, 'r+')) {
+               while (my $l = $lg->read) {
+                       next unless $l =~ /,"h":/;
+                       my ($t) = $l =~ /"t":(\d+)/;
+                       if ($t && $t >= $tnow-86400) {
+                               $c->send($l);
+#                              dbg "sending: $l";
                        }
                }
+               $lg->close;
        }
-
-
-    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);
-                       }
-               };
-               ws.onopen = function (event) {
-                       ws.send('WebSocket support works! ♥');
-               };
-       } else {
-               document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
-       }
-    </script>
-
-<br><br>
-<table border=1 width=80%>
-<th>Time:<td><span id="tm"> </span>
-<tr>
-<th>Pressure:<td><span id="Pressure"> </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>Speed:<td> <span id="Wind"> </span> 
-<th>Minute:<td> <span id="Wind_1m">  </span>
-<tr>
-<th>Rain Hour:<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>
-</html>
+}