Fix Streamlink processing

cabernetwork · Mar 2, 2023 · 78c0af0 · 78c0af0
1 parent 1e6ecf5
commit 78c0af0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/lib/common/utils.py b/lib/common/utils.py
@@ -36,7 +36,7 @@
 
 import lib.common.exceptions as exceptions
 
-VERSION = '0.9.9.9'
+VERSION = '0.9.9.10'
 CABERNET_URL = 'https://github.com/cabernetwork/cabernet'
 CABERNET_NAMESPACE = 'Cabernet'
 DEFAULT_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:92.0) Gecko/20100101 Firefox/92.0'

diff --git a/lib/streams/streamlink_proxy.py b/lib/streams/streamlink_proxy.py
@@ -70,6 +70,8 @@ def stream(self, _channel_dict, _write_buffer):
             self.logger.warning('Unknown Channel {}'.format(_channel_dict['uid']))
             return
         self.streamlink_proc = self.open_streamlink_proc(channel_uri)
+        if not self.streamlink_proc:
+            return
         time.sleep(0.01)
         self.last_refresh = time.time()
         self.block_prev_time = self.last_refresh
@@ -196,18 +198,21 @@ def open_streamlink_proc(self, _channel_uri):
             self.config['paths']['streamlink_path'],
             '--stdout',
             '--quiet',
-            '--hds-segment-threads', '2',
             '--ffmpeg-fout', 'mpegts',
             '--hls-segment-attempts', '2',
             '--hls-segment-timeout', '5',
             uri,
             '720,best'
         ]
         streamlink_command.extend(str_array)
-        streamlink_process = subprocess.Popen(
-            streamlink_command,
-            stdout=subprocess.PIPE,
-            bufsize=-1)
+        try:
+            streamlink_process = subprocess.Popen(
+                streamlink_command,
+                stdout=subprocess.PIPE,
+                bufsize=-1)
+        except:
+            self.logger.error('Streamlink Binary Not Found: {}'.format(self.config['paths']['streamlink_path']))
+            return        
         self.stream_queue = StreamQueue(188, streamlink_process, self.channel_dict['uid'])
         time.sleep(0.1)
         return streamlink_process