Merge branch 'dev' into 'master'

Author: b3rs3rk

gpustat.plg

@@ -2,7 +2,7 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "gpustat">
 <!ENTITY author    "b3rs3rk">
-<!ENTITY version   "2022.02.22">
+<!ENTITY version   "2022.11.23">
 <!ENTITY launch    "Settings/GPUStatSettings">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/b3rs3rk/&name;-unraid/master">
 <!ENTITY pluginURL "&gitURL;/&name;.plg">
@@ -48,6 +48,13 @@
 -->
 
 <CHANGES>
+###2022-11-23
+- Add parent process checking for app detection
+- #40 Add Frigate app detection
+- #41 Add FileFlows app detection
+- #42 Add ErsatzTV app detection
+- #44 Attempt to fix Intel monitoring issues in 6.11
+
 ###2022-02-22
 - #35 Fix jellyfin app detection looking for the wrong image path
 

pkg/gpustat-2022.11.23-x86_64.md5

@@ -0,0 +1 @@
+1a78d73533f5864f7f6ee2bc376ffd6f  gpustat-2022.11.23-x86_64.txz

pkg/gpustat-2022.11.23-x86_64.txz

@@ -31,8 +31,8 @@ Icon="gpustat.png"
     $gpu_nv = $gpu_intel = $gpu_amd = $gpu_unknown = false;
 
     $apps = [
-        'plex', 'jellyfin', 'handbrake', 'emby', 'tdarr', 'unmanic', 'dizquetv',
-        'deepstack', 'nsfminer', 'shinobipro', 'foldinghome',
+        'plex', 'jellyfin', 'handbrake', 'emby', 'tdarr', 'unmanic', 'dizquetv', 'ersatztv',
+        'fileflows', 'frigate', 'deepstack', 'nsfminer', 'shinobipro', 'foldinghome',
     ];
 
     switch ($gpustat_cfg['VENDOR']) {

src/gpustat/usr/local/emhttp/plugins/gpustat/gpustatus.page

@@ -47,7 +47,7 @@
     $gpustat_cfg['inventory'] = true;
     // Settings page looks for $gpustat_data specifically -- inventory all supported GPU types
     $gpustat_data = (new Nvidia($gpustat_cfg))->getInventory();
-    $gpustat_data += (new Intel($gpustat_cfg))->getInventory();
+    $gpustat_data[] = (new Intel($gpustat_cfg))->getInventory();
     $gpustat_data += (new AMD($gpustat_cfg))->getInventory();
 
 } else {

src/gpustat/usr/local/emhttp/plugins/gpustat/gpustatus.php

@@ -38,9 +38,9 @@ class Intel extends Main
     const INVENTORY_UTILITY = 'lspci';
     const INVENTORY_PARAM = "| grep VGA";
     const INVENTORY_REGEX =
-        '/VGA.+\:\s+Intel\s+Corporation\s+(?P<model>.*)\s+(Family|Integrated|Graphics|Controller|Series|\()/iU';
+        '/VGA.+:\s+Intel\s+Corporation\s+(?P<model>.*)\s+(\[|Family|Integrated|Graphics|Controller|Series|\()/iU';
     const STATISTICS_PARAM = '-J -s 250';
-    const STATISTICS_WRAPPER = 'timeout -k .500 .400';
+    const STATISTICS_WRAPPER = 'timeout -k .500 .600';
 
     /**
      * Intel constructor.
@@ -59,7 +59,7 @@ public function __construct(array $settings = [])
      */
     public function getInventory(): array
     {
-        $result = $inventory = [];
+        $result = [];
 
         if ($this->cmdexists) {
             $this->checkCommand(self::INVENTORY_UTILITY, false);
@@ -70,7 +70,7 @@ public function getInventory(): array
                 }
                 if (!empty($this->inventory)) {
                     // Only one iGPU per system, so mark it ID 99 and pad other results
-                    $inventory[0] = [
+                    $inventory = [
                         'id' => 99,
                         'model' => $this->inventory[0]['model'],
                         'guid' => '0000-00-000-000000',

src/gpustat/usr/local/emhttp/plugins/gpustat/images/ersatztv.png

@@ -102,7 +102,7 @@ public function __construct(array $settings = [])
      * @param string $utility
      * @param bool $error
      */
-    protected function checkCommand(string $utility, $error = true)
+    protected function checkCommand(string $utility, bool $error = true)
     {
         $this->cmdexists = false;
         // Check if vendor utility is available
@@ -125,7 +125,7 @@ protected function checkCommand(string $utility, $error = true)
      * @param string $argument
      * @param bool $escape
      */
-    protected function runCommand(string $command, string $argument = '', $escape = true)
+    protected function runCommand(string $command, string $argument = '', bool $escape = true)
     {
         if ($escape) {
             $this->stdout = shell_exec(sprintf("%s %s", $command, escapeshellarg($argument)));
@@ -146,7 +146,26 @@ protected function getFullCommand(int $pid): string
         $file = sprintf('/proc/%0d/cmdline', $pid);
 
         if (file_exists($file)) {
-            $command = trim(file_get_contents($file), "\0");
+            $command = trim(@file_get_contents($file), "\0");
+        }
+
+        return $command;
+    }
+
+    /**
+     * Retrieves the full command of a parent process with arguments for a given process ID
+     *
+     * @param int $pid
+     * @return string
+     */
+    protected function getParentCommand(int $pid): string
+    {
+        $command = '';
+        $pid_command = sprintf("ps j %0d | awk 'NR>1' | cut -d ' ' -f 1", $pid);
+
+        $ppid = (int)trim(shell_exec($pid_command));
+        if ($ppid > 0) {
+            $command = $this->getFullCommand($ppid);
         }
 
         return $command;
@@ -216,7 +235,7 @@ protected static function convertCelsius(int $temp = 0): float
     {
         $fahrenheit = $temp*(9/5)+32;
 
-        return round($fahrenheit, -1, PHP_ROUND_HALF_UP);
+        return round($fahrenheit, -1);
     }
 
     /**
@@ -229,9 +248,9 @@ protected static function convertCelsius(int $temp = 0): float
     protected static function roundFloat(float $number, int $precision = 0): float
     {
         if ($precision > 0) {
-            $result = number_format(round($number, $precision, PHP_ROUND_HALF_UP), $precision, '.','');
+            $result = number_format(round($number, $precision), $precision, '.','');
         } else {
-            $result = round($number, $precision, PHP_ROUND_HALF_UP);
+            $result = round($number, $precision);
         }
 
         return $result;