Skip to content
Snippets Groups Projects
Commit 372e663e authored by Konrad Mohrfeldt's avatar Konrad Mohrfeldt :koala:
Browse files

refactor: don’t overwrite queryset with filter options

We might need that queryset unbothered by already set filters later on
;)
parent 5725a345
No related branches found
No related tags found
1 merge request!57Incorporate feedback for virtual timeslots
...@@ -745,13 +745,15 @@ def generate_program_entries( ...@@ -745,13 +745,15 @@ def generate_program_entries(
start = timezone.now() start = timezone.now()
if end is None: if end is None:
end = start + timedelta(days=1) end = start + timedelta(days=1)
queryset = queryset.order_by("start")
# Find all timeslots that # Find all timeslots that
# * have started before the specified start value but end after it # * have started before the specified start value but end after it
# * or end after the specified end value but start before it # * or end after the specified end value but start before it
queryset = queryset.filter(end__gt=start, start__lt=end).order_by("start") timeslots = queryset.filter(end__gt=start, start__lt=end)
if not include_virtual: if not include_virtual:
yield from (create_timeslot_entry(timeslot) for timeslot in queryset) yield from (create_timeslot_entry(timeslot) for timeslot in timeslots)
return return
# Program entries that are not based on scheduled timeslots are generated using the fallback # Program entries that are not based on scheduled timeslots are generated using the fallback
...@@ -760,7 +762,7 @@ def generate_program_entries( ...@@ -760,7 +762,7 @@ def generate_program_entries(
entry_start = start entry_start = start
timeslot: TimeSlot timeslot: TimeSlot
for timeslot in queryset: for timeslot in timeslots:
if timeslot.start > entry_start: if timeslot.start > entry_start:
yield create_entry(entry_start, timeslot.start, fallback_show) yield create_entry(entry_start, timeslot.start, fallback_show)
yield create_timeslot_entry(timeslot) yield create_timeslot_entry(timeslot)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment