Fix scrobble counts on webpage list view

vrobbler/apps/webpages/models.py

@@ -57,6 +57,12 @@ class WebPage(ScrobblableMixin):
     def subtitle(self):
         return self.domain
 
+    def scrobbles(self, user):
+        Scrobble = apps.get_model("scrobbles", "Scrobble")
+        return Scrobble.objects.filter(user=user, webpage=self).order_by(
+            "-timestamp"
+        )
+
     def _update_data_from_web(self, force=True):
         headers = {
             "headers": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:51.0) Gecko/20100101 Firefox/51.0"

vrobbler/apps/webpages/views.py

@@ -1,3 +1,4 @@
+from django.db.models import Count
 from django.views import generic
 from webpages.models import WebPage
 
@@ -6,7 +7,21 @@ class WebPageListView(generic.ListView):
     model = WebPage
     paginate_by = 20
 
+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .annotate(scrobble_count=Count("scrobble"))
+            .order_by("-scrobble_count")
+        )
+
 
 class WebPageDetailView(generic.DetailView):
     model = WebPage
     slug_field = "uuid"
+
+    def get_context_data(self, **kwargs):
+        user = self.request.user
+        context_data = super().get_context_data(**kwargs)
+        context_data["scrobbles"] = self.object.scrobbles(user)
+        return context_data

vrobbler/templates/webpages/webpage_list.html

@@ -0,0 +1,70 @@
+{% extends "base_list.html" %}
+{% load urlreplace %}
+
+{% block title %}Webpages{% endblock %}
+
+{% block lists %}
+<div class="row">
+    <p class="pagination">
+        <span class="page-links">
+            {% if page_obj.has_previous %}
+                <a href="?{% urlreplace page=page_obj.previous_page_number %}">prev</a>
+            {% endif %}
+                <span class="page-current">
+                    Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}
+                </span>
+            {% if page_obj.has_next %}
+                <a href="?{% urlreplace page=page_obj.next_page_number %}">next</a>
+            {% endif %}
+        </span>
+    </p>
+    <hr />
+
+    {% if view == 'grid' %}
+    <div>
+        {% for webpage in object_list %}
+        {% if webpage.thumbnail %}
+        <dl style="width: 130px; float: left; margin-right:10px;">
+            <dd><img src="{{webpage.primary_image_url}}" width=120 height=120 /></dd>
+        </dl>
+        {% endif %}
+        {% endfor %}
+    </div>
+    {% else %}
+    <div class="col-md">
+        <div class="table-responsive">
+            <table class="table table-striped table-sm">
+            <thead>
+                <tr>
+                    <th scope="col">Scrobbles</th>
+                    <th scope="col">Webpage</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for webpage in object_list %}
+                <tr>
+                    <td>{{webpage.scrobble_count}}</td>
+                    <td><a href="{{webpage.get_absolute_url}}">{{webpage}}</a></td>
+                </tr>
+                {% endfor %}
+            </tbody>
+            </table>
+        </div>
+    </div>
+    {% endif %}
+
+    <div class="pagination" style="margin-bottom:50px;">
+        <span class="page-links">
+            {% if page_obj.has_previous %}
+                <a href="?{% urlreplace page=page_obj.previous_page_number %}">prev</a>
+            {% endif %}
+                <span class="page-current">
+                    Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}
+                </span>
+            {% if page_obj.has_next %}
+                <a href="?{% urlreplace page=page_obj.next_page_number %}">next</a>
+            {% endif %}
+        </span>
+    </div>
+</div>
+{% endblock %}