| {{ request.title }} |
- {# #}
- {# {% if request.filename %}#}
- {# {{ request.filename }}#}
- {# {% else %}#}
- {# {% trans "Automatic" %}#}
- {# {% endif %}#}
- {# | #}
- {{ request.created_date}} |
{{ request.update_date }} |
{{ request.get_type_display }} |
- {{ request.get_status_display }} {% if request.status == "PR" %}{{ request.progress }}/7 {% endif %} |
+ {{ request.get_status_display }} {% if request.status == "PR" %}{{ request.progress }}/7 {% endif %} {% if request.status == "SC" %} {{ request.scheduled_at }} {% endif %} |
{% if request.file %}
{{ request.file|filename }}
@@ -84,18 +84,27 @@
{% endblock %}
\ No newline at end of file
diff --git a/pdf/templatetags/types.py b/pdf/templatetags/types.py
index 0865c90..573242b 100644
--- a/pdf/templatetags/types.py
+++ b/pdf/templatetags/types.py
@@ -11,7 +11,7 @@
@register.filter(is_safe=True)
def get_status_color(status):
"""Converts status to color"""
- if status == str(Status.QUEUED):
+ if status == str(Status.QUEUED) or status == str(Status.SCHEDULED):
return "yellow"
if status == str(Status.IN_PROGRESS):
return "blue"
diff --git a/pdf/utils.py b/pdf/utils.py
index 91a9e20..ab54226 100644
--- a/pdf/utils.py
+++ b/pdf/utils.py
@@ -1,35 +1,18 @@
"""Utility functions"""
-import logging
-import re
-from time import time
+from datetime import timedelta
+from django.utils import timezone
-from django.conf import settings
from django.db import transaction
from django.utils import translation
from django.utils.translation import gettext
+from pdf.generate import schedule_generation
from pdf.models.request import PDFRequest, RequestType, Status, PDFSong
-class ProgressFilter(logging.Filter):
- """Filters Weasyprint progress messages, highly dependent on implementation!"""
- STEP_NUMBER = re.compile(r"(?<=Step\s)\d")
-
- def __init__(self, request):
- super().__init__()
- self.request = request
-
- def filter(self, record):
- step = self.STEP_NUMBER.search(record.getMessage()).group(0)
- if self.request.progress != step:
- self.request.progress = step
- self.request.save()
- return True
-
-
def request_pdf_regeneration(category, update: bool = False):
"""Requests automatic PDF regeneration if none is pending"""
- objects = PDFRequest.objects.filter(type=RequestType.EVENT, status=Status.QUEUED, category=category)
+ objects = PDFRequest.objects.filter(type=RequestType.EVENT, status=Status.SCHEDULED, category=category)
if not objects.exists():
generate_new_pdf_request(category)
elif not update:
@@ -37,7 +20,7 @@ def request_pdf_regeneration(category, update: bool = False):
def regenerate_pdf_request(request, category):
- """Regenerates the PDF request with newest info"""
+ """Regenerates the PDF request with the newest info"""
with transaction.atomic():
PDFSong.objects.filter(request=request).delete()
PDFSong.objects.bulk_create([
@@ -50,10 +33,12 @@ def regenerate_pdf_request(request, category):
def generate_new_pdf_request(category):
- """Returns PDFRequest for basic"""
+ """Returns PDFRequest for a category"""
with transaction.atomic():
+ scheduled_times = PDFRequest.objects.filter(status=Status.SCHEDULED, type=RequestType.EVENT).values_list(
+ 'scheduled_at', flat=True)
request = PDFRequest(type=RequestType.EVENT,
- status=Status.QUEUED,
+ status=Status.SCHEDULED,
category=category)
request.copy_options(category)
request.filename = request.filename or get_filename(category)
@@ -64,32 +49,34 @@ def generate_new_pdf_request(category):
song_number=song_number + 1)
for song_number, song in enumerate(category.song_set.filter(archived=False).all())
])
+
+ time = generate_unique_time(scheduled_times, timedelta(minutes=30))
+
+ schedule_generation(request, time)
+ request.scheduled_at = time
+ request.save()
+
return request
+def generate_unique_time(times, delta: timedelta):
+ """Generate unique time, so jobs will not clash on scheduler"""
+ time = timezone.now() + delta
+ for _ in range(len(times) + 1):
+
+ valid = True
+ for existing_time in times:
+ if not existing_time:
+ continue
+ if time - existing_time < delta:
+ valid = False
+
+ if valid:
+ return time
+ time = time + delta
+ raise AttributeError("Unable to assign unique generation time")
def get_filename(category):
"""Returns filename for category based on its locale"""
with translation.override(category.locale):
text = gettext('songbook')
return f"{text}-{category.name}"
-
-
-def get_name(category):
- """Returns filename for category based on its locale"""
- with translation.override(category.locale):
- return gettext(settings.SITE_NAME)
-
-
-class Timer:
- """Context manager for measuring time"""
- def __init__(self):
- self.duration = 0
- self.start = 0
- self.end = 0
-
- def __enter__(self):
- self.start = time()
-
- def __exit__(self, exit_type, value, traceback):
- self.end = time()
- self.duration = self.end - self.start
diff --git a/pdf/views.py b/pdf/views.py
index cf33e00..0a8939a 100644
--- a/pdf/views.py
+++ b/pdf/views.py
@@ -42,8 +42,9 @@ def get(self, request, pk):
return redirect("pdf:list")
obj.status = Status.QUEUED
obj.save()
+ generate_pdf_job.delay(obj)
- messages.success(request, _("Request %(id)s was marked for regeneration") % {"id": obj.id})
+ messages.success(request, _("Request %(id)s was scheduled for regeneration") % {"id": obj.id})
return redirect("pdf:list")
|