Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-08-02 06:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

If provider is slow but responsive, don't get locked up.

Browse source
This commit is contained in:
SergeantPanda 2025-07-08 17:10:55 -05:00
parent d6605e7119
commit 2284d47f9f
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/proxy/config.py
View file

@ -58,7 +58,7 @@ class TSConfig(BaseConfig):
CHUNK_BATCH_SIZE = 5 # How many chunks to fetch in one batch
KEEPALIVE_INTERVAL = 0.5 # Seconds between keepalive packets when at buffer head
# Chunk read timeout
CHUNK_TIMEOUT = 10 # Seconds to wait for each chunk read
CHUNK_TIMEOUT = 5 # Seconds to wait for each chunk read
# Streaming settings
TARGET_BITRATE = 8000000 # Target bitrate (8 Mbps)

10
apps/proxy/ts_proxy/stream_manager.py
View file

@ -236,7 +236,7 @@ class StreamManager:
gevent.sleep(0.1) # REPLACE time.sleep(0.1)
continue
# Connection retry loop for current URL
while self.running and self.retry_count < self.max_retries and not url_failed:
while self.running and self.retry_count < self.max_retries and not url_failed and not self.needs_stream_switch:
logger.info(f"Connection attempt {self.retry_count + 1}/{self.max_retries} for URL: {self.url}")
@ -260,6 +260,10 @@ class StreamManager:
# This indicates we had a stable connection for a while before failing
connection_duration = time.time() - connection_start_time
stable_connection_threshold = 30 # 30 seconds threshold
if self.needs_stream_switch:
logger.info(f"Stream needs to switch after {connection_duration:.1f} seconds")
break # Exit to switch streams
if connection_duration > stable_connection_threshold:
logger.info(f"Stream was stable for {connection_duration:.1f} seconds, resetting switch attempts counter")
stream_switch_attempts = 0
@ -810,7 +814,7 @@ class StreamManager:
try:
if self.transcode:
# Handle transcoded stream data
while self.running and self.connected and not self.stop_requested:
while self.running and self.connected and not self.stop_requested and not self.needs_stream_switch:
if self.fetch_chunk():
self.last_data_time = time.time()
else:
@ -823,7 +827,7 @@ class StreamManager:
try:
for chunk in self.current_response.iter_content(chunk_size=self.chunk_size):
# Check if we've been asked to stop
if self.stop_requested or self.url_switching:
if self.stop_requested or self.url_switching or self.needs_stream_switch:
break
if chunk: