Merge branch 'dev' into master

b3rs3rk · Feb 22, 2022 · d45272f · d45272f
2 parents f86d84f + 3edcda0
commit d45272f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/gpustat.plg b/gpustat.plg
@@ -48,6 +48,9 @@
 -->
 
 <CHANGES>
+###2022-02-22
+- #35 Fix jellyfin app detection looking for the wrong image path
+
 ###2022-02-20
 - PR #30 Add Shinobi Pro app detection for Nvidia (thanks @corgan2222!)
 - PR #30 Add nsfminer app detection for Nvidia (thanks @corgan2222!)

diff --git a/src/gpustat/usr/local/emhttp/plugins/gpustat/gpustatus.page b/src/gpustat/usr/local/emhttp/plugins/gpustat/gpustatus.page
@@ -31,7 +31,7 @@ Icon="gpustat.png"
     $gpu_nv = $gpu_intel = $gpu_amd = $gpu_unknown = false;
 
     $apps = [
-        'plex', 'jelly', 'handbrake', 'emby', 'tdarr', 'unmanic', 'dizquetv',
+        'plex', 'jellyfin', 'handbrake', 'emby', 'tdarr', 'unmanic', 'dizquetv',
         'deepstack', 'nsfminer', 'shinobipro', 'foldinghome',
     ];
 

diff --git a/src/gpustat/usr/local/emhttp/plugins/gpustat/lib/Nvidia.php b/src/gpustat/usr/local/emhttp/plugins/gpustat/lib/Nvidia.php
@@ -40,7 +40,7 @@ class Nvidia extends Main
     const STATISTICS_PARAM = '-q -x -g %s 2>&1';
     const SUPPORTED_APPS = [ // Order here is important because some apps use the same binaries -- order should be more specific to less
         'plex'        => ['Plex Transcoder'],
-        'jelly'       => ['jellyfin-ffmpeg'],
+        'jellyfin'       => ['jellyfin-ffmpeg'],
         'handbrake'   => ['/usr/bin/HandBrakeCLI'],
         'emby'        => ['emby'],
         'tdarr'       => ['ffmpeg', 'HandbrakeCLI'],