diff --git a/vrobbler/apps/music/views.py b/vrobbler/apps/music/views.py index 4b971c0..eb6fd53 100644 --- a/vrobbler/apps/music/views.py +++ b/vrobbler/apps/music/views.py @@ -8,6 +8,7 @@ from scrobbles.stats import get_scrobble_count_qs class TrackListView(generic.ListView): model = Track + paginate_by = 200 def get_queryset(self): return get_scrobble_count_qs(user=self.request.user).order_by( @@ -30,10 +31,18 @@ class TrackDetailView(generic.DetailView): class ArtistListView(generic.ListView): model = Artist + paginate_by = 100 def get_queryset(self): return super().get_queryset().order_by("name") + def get_context_data(self, *, object_list=None, **kwargs): + context_data = super().get_context_data( + object_list=object_list, **kwargs + ) + context_data['view'] = self.request.GET.get('view') + return context_data + class ArtistDetailView(generic.DetailView): model = Artist @@ -49,6 +58,17 @@ class ArtistDetailView(generic.DetailView): class AlbumListView(generic.ListView): model = Album + paginate_by = 50 + + def get_queryset(self): + return super().get_queryset().order_by("name") + + def get_context_data(self, *, object_list=None, **kwargs): + context_data = super().get_context_data( + object_list=object_list, **kwargs + ) + context_data['view'] = self.request.GET.get('view') + return context_data class AlbumDetailView(generic.DetailView): diff --git a/vrobbler/apps/scrobbles/templatetags/__init__.py b/vrobbler/apps/scrobbles/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vrobbler/apps/scrobbles/templatetags/urlreplace.py b/vrobbler/apps/scrobbles/templatetags/urlreplace.py new file mode 100644 index 0000000..36cb652 --- /dev/null +++ b/vrobbler/apps/scrobbles/templatetags/urlreplace.py @@ -0,0 +1,10 @@ +from django import template + +register = template.Library() + + +@register.simple_tag(takes_context=True) +def urlreplace(context, **kwargs): + query = context['request'].GET.copy() + query.update(kwargs) + return query.urlencode() diff --git a/vrobbler/templates/base.html b/vrobbler/templates/base.html index 7a9b537..3e23444 100644 --- a/vrobbler/templates/base.html +++ b/vrobbler/templates/base.html @@ -212,6 +212,7 @@ Dashboard + {% if user.is_authenticated %}
  • @@ -230,6 +231,12 @@ Artists
    • +
  • + + + Albums + +
  • @@ -242,7 +249,6 @@ TV Shows
    • - {% if user.is_authenticated %}
  • @@ -261,13 +267,13 @@ {% for scrobble in now_playing_list %}
    {% if scrobble.media_obj.album.cover_image %} -
    +
    {% endif %} - {{scrobble.media_obj.title}}
    - {% if scrobble.media_obj.subtitle %}{{scrobble.media_obj.subtitle}}
    {% endif %} - {{scrobble.timestamp|naturaltime}}
    - from {{scrobble.source}}     +     {{scrobble.media_obj.title}}
    + {% if scrobble.media_obj.subtitle %} + {{scrobble.media_obj.subtitle}}
    + {% endif %} + {{scrobble.timestamp|naturaltime}}
    from {{scrobble.source}}
    diff --git a/vrobbler/templates/music/album_list.html b/vrobbler/templates/music/album_list.html index a186b41..842751f 100644 --- a/vrobbler/templates/music/album_list.html +++ b/vrobbler/templates/music/album_list.html @@ -1,11 +1,82 @@ {% extends "base_list.html" %} +{% load urlreplace %} {% block title %}Albums{% endblock %} {% block lists %} -{% for album in object_list %} -
    -
    -
    -{% endfor %} + +
    +

    + + {% if view == 'grid' %} + View as List + {% else %} + View as Grid + {% endif %} + +

    +

    + + {% if page_obj.has_previous %} + prev + {% endif %} + + Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }} + + {% if page_obj.has_next %} + next + {% endif %} + +

    +
    + + {% if view == 'grid' %} +
    + {% for album in object_list %} + {% if album.cover_image %} +
    +
    +
    + {% endif %} + {% endfor %} +
    + {% else %} +
    +
    + + + + + + + + + + {% for album in object_list %} + + + + + + {% endfor %} + +
    AlbumArtistScrobbles
    {{album}}{{album.artist}}{{album.scrobbles.count}}
    +
    +
    + {% endif %} + + +
    {% endblock %} diff --git a/vrobbler/templates/music/artist_detail.html b/vrobbler/templates/music/artist_detail.html index d80855a..bbc117f 100644 --- a/vrobbler/templates/music/artist_detail.html +++ b/vrobbler/templates/music/artist_detail.html @@ -4,12 +4,11 @@ {% block title %}{{object.name}}{% endblock %} {% block lists %} -
    {% if object.thumbnail %} -

    - +

    +

    {% else %} {% if object.album_set.first.cover_image %} @@ -18,6 +17,11 @@

    {% endif %} {% endif %} +
    +

    {{artist.biography|safe|linebreaks|truncatewords:160}}

    +
    +

    Musicbrainz

    +

    {{artist.scrobbles.count}} scrobbles

    diff --git a/vrobbler/templates/music/artist_list.html b/vrobbler/templates/music/artist_list.html index d21abb6..816298d 100644 --- a/vrobbler/templates/music/artist_list.html +++ b/vrobbler/templates/music/artist_list.html @@ -1,9 +1,45 @@ {% extends "base_list.html" %} +{% load urlreplace %} {% block title %}Artists{% endblock %} {% block lists %}
    +

    + + {% if view == 'grid' %} + View as List + {% else %} + View as Grid + {% endif %} + +

    +

    + + {% if page_obj.has_previous %} + prev + {% endif %} + + Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }} + + {% if page_obj.has_next %} + next + {% endif %} + +

    +
    + + {% if view == 'grid' %} +
    + {% for artist in object_list %} + {% if artist.thumbnail %} +
    +
    +
    + {% endif %} + {% endfor %} +
    + {% else %}
    @@ -26,5 +62,20 @@
    + {% endif %} + +
    {% endblock %} diff --git a/vrobbler/templates/music/track_list.html b/vrobbler/templates/music/track_list.html index 1592e0f..5eaa06d 100644 --- a/vrobbler/templates/music/track_list.html +++ b/vrobbler/templates/music/track_list.html @@ -3,10 +3,57 @@ {% block title %}Tracks{% endblock %} {% block lists %} -

    All time

    -{% for track in object_list %} - -{% endfor %} +
    +

    + + {% if page_obj.has_previous %} + previous + {% endif %} + + Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }} + + {% if page_obj.has_next %} + next + {% endif %} + +

    +
    + +
    +
    + + + + + + + + + + {% for track in object_list %} + + + + + + {% endfor %} + +
    TrackArtistScrobbles
    {{track}}{{track.artist}}{{track.scrobble_set.count}}
    +
    +
    + + +
    {% endblock %}