Merge branch 'master' of github.com:swp-berlin/webmonitor into production

Author: o-zander

swp/converters.py

@@ -0,0 +1,15 @@
+from django.urls.converters import StringConverter
+from django.utils.dateparse import parse_date
+
+
+class DateConverter(StringConverter):
+    regex = '[0-9]{1,4}-[0-9]{2}-[0-9]{2}'
+
+    def to_python(self, value: str):
+        return parse_date(value)
+
+    def to_url(self, value):
+        if isinstance(value, str):
+            value = parse_date(value)
+
+        return value.isoformat()

swp/site.py

@@ -1,8 +1,37 @@
+from django.conf import settings
 from django.contrib import admin
+from django.core.exceptions import PermissionDenied
+from django.urls import path
 from django.utils.translation import gettext_lazy as _
 
+from swp.views.spooling import SpoolingView
+
 
 class AdminSite(admin.AdminSite):
     site_title = site_header = _('SWP Administration')
     index_title = _('Overview')
     enable_nav_sidebar = False
+
+    def get_urls(self):
+        return [
+            path('spooling/', self.admin_view(self.spooling_view), name='spooling'),
+            path('spooling/<state>/<date:date>/<path:filename>', self.admin_view(self.spooling_view), name='spooling'),
+            *admin.AdminSite.get_urls(self),
+        ]
+
+    def spooling_view(self, request, **kwargs):
+        if not request.user.is_superuser:
+            raise PermissionDenied
+
+        directory = settings.EMBEDDING_SPOOLING_DIR
+
+        if kwargs:
+            return SpoolingView.file_response(directory, **kwargs)
+
+        view = SpoolingView.as_view(
+            site=self,
+            directory=directory,
+            extra_context=self.each_context(request),
+        )
+
+        return view(request)

swp/templates/admin/spooling.html

@@ -0,0 +1,21 @@
+{% extends 'admin/base_site.html' %}
+
+{% block content %}
+	{% for state, dates in files.items %}
+		{% if dates %}
+            <h3>{{ state }}</h3>
+            <ul>
+                {% for date, files in dates.items %}
+                    <h4>{{ date }}</h4>
+                    <ul>
+                        {% for publication_url, download_url, filename in files %}
+                            <li>
+                                <a href="{{ download_url }}">{{ filename }}</a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% endfor %}
+            </ul>
+		{% endif %}
+	{% endfor %}
+{% endblock %}

swp/urls.py

@@ -1,12 +1,14 @@
 from django.conf import settings
 from django.contrib import admin
-from django.urls import include, path
+from django.urls import include, path, register_converter
 
-from swp.views import *
 from swp.api import default_router as v1
+from swp.converters import DateConverter
+from swp.views import *
 
-react = SWPView.as_view()
+register_converter(DateConverter, 'date')
 
+react = SWPView.as_view()
 
 urlpatterns = [
     path('', react, name='index'),

swp/utils/spooling.py

@@ -26,9 +26,13 @@
 }
 
 
+def get_date(value: datetime.date):
+    return value.strftime(DATE_FMT)
+
+
 def get_filepath(directory: Path, state: State, publication: Publication, extension: Extension = 'pdf'):
     created = localtime(publication.created)
-    date = created.strftime(DATE_FMT)
+    date = get_date(created)
     timestamp = get_timestamp(created)
 
     return directory / state / date / f'{timestamp}-{publication.id}.{extension}'

swp/views/spooling.py

@@ -0,0 +1,61 @@
+import datetime
+
+from collections import defaultdict
+from pathlib import Path
+from typing import List
+
+from django.contrib.admin.sites import AdminSite
+from django.http import Http404, FileResponse
+from django.shortcuts import resolve_url
+from django.views.generic import TemplateView
+
+from swp.models import Publication
+from swp.utils.admin import admin_url
+from swp.utils.spooling import iter_files, State, get_date
+
+SPOOLING_STATES: List[State] = [
+    'error',
+    'todo',
+    'lost',
+    'done',
+]
+
+
+class SpoolingView(TemplateView):
+    template_name = 'admin/spooling.html'
+
+    site: AdminSite = None
+    directory: Path = None
+
+    def get_context_data(self, **kwargs):
+        kwargs['title'] = 'Spooling'
+        kwargs['files'] = {state: self.get_state_info(state) for state in SPOOLING_STATES}
+
+        return TemplateView.get_context_data(self, **kwargs)
+
+    def get_state_info(self, state: State):
+        dates = defaultdict(list)
+
+        for publication_id, filepath in iter_files(self.directory, state):
+            filename = filepath.name
+            date = filepath.parent.name
+
+            publication_url = admin_url(Publication, 'change', publication_id, site=self.site)
+            download_url = resolve_url('admin:spooling', state=state, date=date, filename=filename)
+
+            info = publication_url, download_url, filename
+
+            dates[date].append(info)
+
+        return dict(dates)
+
+    @staticmethod
+    def file_response(directory: Path, state: State, date: datetime.date, filename: str):
+        filepath = directory / state / get_date(date) / filename
+
+        try:
+            fp = open(filepath, 'rb')
+        except FileNotFoundError as error:
+            raise Http404 from error
+
+        return FileResponse(fp, filename=filename)