Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-01-23 10:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Better method to keep track of next stream to use.

Browse source
This commit is contained in:
SergeantPanda 2025-03-28 09:04:04 -05:00
parent 2f995b16fd
commit cbf4fa33d6
1 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

35
apps/proxy/ts_proxy/views.py
View file

@ -346,6 +346,9 @@ def next_stream(request, channel_id):
try:
logger.info(f"Request to switch to next stream for channel {channel_id} received")
# Check if the channel exists
channel = get_stream_object(channel_id)
# First check if channel is active in Redis
current_stream_id = None
profile_id = None
@ -369,18 +372,38 @@ def next_stream(request, channel_id):
# Channel is not running
return JsonResponse({'error': 'No current stream found for channel'}, status=404)
# Get alternate streams excluding the current one
alternate_streams = get_alternate_streams(channel_id, current_stream_id)
# Get all streams for this channel in their defined order
streams = list(channel.streams.all().order_by('channelstream__order'))
if not alternate_streams:
if len(streams) <= 1:
return JsonResponse({
'error': 'No alternate streams available for this channel',
'current_stream_id': current_stream_id
}, status=404)
# Pick the next stream from alternatives
next_stream = alternate_streams[0] # Get the first alternative
next_stream_id = next_stream['stream_id']
# Find the current stream's position in the list
current_index = None
for i, stream in enumerate(streams):
if stream.id == current_stream_id:
current_index = i
break
if current_index is None:
logger.warning(f"Current stream ID {current_stream_id} not found in channel's streams list")
# Fall back to the first stream that's not the current one
next_stream = next((s for s in streams if s.id != current_stream_id), None)
if not next_stream:
return JsonResponse({
'error': 'Could not find current stream in channel list',
'current_stream_id': current_stream_id
}, status=404)
else:
# Get the next stream in the rotation (with wrap-around)
next_index = (current_index + 1) % len(streams)
next_stream = streams[next_index]
next_stream_id = next_stream.id
logger.info(f"Rotating to next stream ID {next_stream_id} for channel {channel_id}")
# Get full stream info including URL for the next stream
stream_info = get_stream_info_for_switch(channel_id, next_stream_id)