Merge branch 'master' of github.com:emoncms/postprocess

Author: trystanlea-maker

.devcontainer/dev-compose.yaml

@@ -0,0 +1,12 @@
+services:
+  devcontainer:
+    image: alexjunk/emoncms
+    volumes:
+      - data:/data
+      - ../:/opt/emoncms/modules/postprocess
+    ports:
+      - 8088:80
+      - 8883:1883
+    restart: always
+volumes:
+  data:

.devcontainer/devcontainer.json

@@ -0,0 +1,14 @@
+{
+  "name": "postprocess_dev",
+  "dockerComposeFile": "dev-compose.yaml",
+  "workspaceFolder": "/opt/emoncms/modules/postprocess",
+  "shutdownAction": "stopCompose",
+  "service": "devcontainer",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "devsense.phptools-vscode"
+      ]
+    }
+  }
+}

common.php

@@ -128,7 +128,7 @@ function createmeta($dir, $id, $meta)
 }
 
 //compute meta datas of different feeds intended for a preprocessing
-function compute_meta()
+function compute_meta(): stdClass
 {
     $numargs = func_num_args();
     $arg_list = func_get_args();
@@ -163,13 +163,13 @@ function compute_meta()
 1 -> operator
 2 -> value or feed number
 */
-function ftoa($b)
+function ftoa($b): array
 {
     $c = [];
     //print_r($b);
-    if (sizeof($b) == 4) {
+    if (sizeof(value: $b) == 4) {
         $c[0] = "feed";
-        $c[2] = intval(substr($b[3], 1));
+        $c[2] = intval(value: substr(string: $b[3], offset: 1));
     } else {
         $c[0] = "value";
         $c[2] = $b[2];
@@ -191,34 +191,34 @@ function ftoa($b)
 2 -> value or feed number
 feeds_meta : array of metas such as produced by getmeta
 */
-function bfo($elements, $feeds_meta, $feeds_dat, $time)
+function bfo($elements, $feeds_meta, $feeds_dat, $time): float|int
 {
     $s = [];
     foreach ($elements as $element) {
         $values = [];
         foreach ($element as $e) {
             $value = NAN;
             if ($e[0] == "feed") {
-                $pos = floor(($time - $feeds_meta[$e[2]]->start_time) / $feeds_meta[$e[2]]->interval);
+                $pos = floor(num: ($time - $feeds_meta[$e[2]]->start_time) / $feeds_meta[$e[2]]->interval);
                 if ($pos >= 0 && $pos < $feeds_meta[$e[2]]->npoints) {
-                    fseek($feeds_dat[$e[2]], $pos * 4);
+                    fseek(stream: $feeds_dat[$e[2]], offset: $pos * 4);
                     $tmp = unpack("f", fread($feeds_dat[$e[2]], 4));
                     $value = $tmp[1];
                 }
             }
             if ($e[0] == "value") $value = $e[2];
-            if (!is_nan($value) && $value != 0) {
+            if (!is_nan(num: $value) && $value != 0) {
                 if ($e[1] == "/") $value = 1 / $value;
                 if ($e[1] == "-") $value = -$value;
             }
             $values[] = $value;
         }
-        if (!in_array(NAN, $values)) {
-            $s[] = array_product($values);
+        if (!in_array(needle: NAN, haystack: $values)) {
+            $s[] = array_product(array: $values);
         } else $s[] = NAN;
     }
-    if (!in_array(NAN, $s)) {
-        $sum = array_sum($s);
+    if (!in_array(needle: NAN, haystack: $s)) {
+        $sum = array_sum(array: $s);
     } else $sum = NAN;
 
     return $sum;

postprocess-module/postprocess_model.php

@@ -305,6 +305,9 @@ public function validate_params($userid,$params) {
     }
 
     public function check_service_runner() {
+        if (file_exists("/.dockerenv")) {
+            return true;
+        }
         $service_running = false;
         @exec("systemctl show service-runner | grep State", $output);
         foreach ($output as $line) {

postprocess.sh

@@ -1,3 +1,7 @@
 #!/bin/bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-sudo php $DIR/postprocess_run.php
+if [ -f "/.dockerenv" ]; then
+    php $DIR/postprocess_run.php
+else
+    sudo php $DIR/postprocess_run.php
+fi