Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-01-23 18:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Return the hour before current time too.

Browse source
This commit is contained in:
SergeantPanda 2025-04-08 18:14:10 -05:00
parent 553c552751
commit f367fbd217
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
apps/epg/api_views.py
View file

@ -67,27 +67,28 @@ class ProgramViewSet(viewsets.ModelViewSet):
# 3) EPG Grid View
# ─────────────────────────────
class EPGGridAPIView(APIView):
"""Returns all programs airing in the next 24 hours including currently running ones"""
"""Returns all programs airing in the next 24 hours including currently running ones and recent ones"""
@swagger_auto_schema(
operation_description="Retrieve currently running and upcoming EPG programs for the next 24 hours",
operation_description="Retrieve programs from the previous hour, currently running and upcoming for the next 24 hours",
responses={200: ProgramDataSerializer(many=True)}
)
def get(self, request, format=None):
# Use current time instead of midnight
now = timezone.now()
one_hour_ago = now - timedelta(hours=1)
twenty_four_hours_later = now + timedelta(hours=24)
logger.debug(f"EPGGridAPIView: Querying programs between {now} and {twenty_four_hours_later}.")
logger.debug(f"EPGGridAPIView: Querying programs between {one_hour_ago} and {twenty_four_hours_later}.")
# Use select_related to prefetch EPGData and include currently running programs
# Use select_related to prefetch EPGData and include programs from the last hour
programs = ProgramData.objects.select_related('epg').filter(
# Programs that end after now (currently running or future)
end_time__gt=now,
# AND either start before the end time window OR end before the end time window
# Programs that end after one hour ago (includes recently ended programs)
end_time__gt=one_hour_ago,
# AND start before the end time window
start_time__lt=twenty_four_hours_later
)
count = programs.count()
logger.debug(f"EPGGridAPIView: Found {count} program(s), including currently running shows.")
logger.debug(f"EPGGridAPIView: Found {count} program(s), including recently ended, currently running, and upcoming shows.")
serializer = ProgramDataSerializer(programs, many=True)
return Response({'data': serializer.data}, status=status.HTTP_200_OK)