fix

fix

Author: prgmitchell

checks/network.py

@@ -103,16 +103,25 @@ def checkStreamDelay(lines):
 
 
 def checkServiceRecommendations(lines):
+    maxBitrate = None
     for i, line in enumerate(lines):
-        if "User is ignoring service bitrate limits. Max Video Bitrate:" in line:
-            maxVideoBitrateMatch = re.search(r'Max Video Bitrate: (\d+|None)', line)
-            if not maxVideoBitrateMatch or maxVideoBitrateMatch.group(1) == 'None':
-                continue
-            maxVideoBitrate = int(maxVideoBitrateMatch.group(1))
+        if "User is ignoring service bitrate limits." in line:
             for j in range(i + 1, len(lines)):
-                if "bitrate:" in lines[j]:
-                    currentBitrate = int(re.search(r'bitrate:\s+(\d+)', lines[j]).group(1))
-                    if currentBitrate > maxVideoBitrate:
-                        return [LEVEL_WARNING, "Max Video Bitrate Limit Exceeded", "Current bitrate " + str(currentBitrate) + "kbps exceeds max video bitrate limit " + str(maxVideoBitrate) + "kbps. This may result in the streaming service not displaying the video from your stream or rejecting it entirely."]
+                if "video bitrate:" in lines[j]:
+                    maxBitrateMatch = re.search(r'video bitrate:\s+(\d+)', lines[j])
+                    if maxBitrateMatch:
+                        maxBitrate = int(maxBitrateMatch.group(1))
                     break
+            break
+
+    if maxBitrate is not None:
+        for i, line in enumerate(lines):
+            if "bitrate:" in line and "video bitrate:" not in line:
+                currentBitrateMatch = re.search(r'bitrate:\s+(\d+)', line)
+                if currentBitrateMatch:
+                    currentBitrate = int(currentBitrateMatch.group(1))
+                    if currentBitrate > maxBitrate:
+                        return [LEVEL_WARNING, "Max Video Bitrate Limit Exceeded",
+                                f"Current bitrate {currentBitrate}kbps exceeds max video bitrate limit {maxBitrate}kbps. "
+                                "This may result in the streaming service not displaying the video from your stream or rejecting it entirely."]
     return None