diff --git a/api/config/settings/common.py b/api/config/settings/common.py index 3f7cc7503..6a2299bb4 100644 --- a/api/config/settings/common.py +++ b/api/config/settings/common.py @@ -54,6 +54,7 @@ THIRD_PARTY_APPS = ( 'rest_auth.registration', 'mptt', 'dynamic_preferences', + 'django_filters', ) # Apps specific for this project go here. @@ -298,7 +299,7 @@ REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': ( 'rest_framework.permissions.IsAuthenticated', ), - 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', + 'DEFAULT_PAGINATION_CLASS': 'funkwhale_api.common.pagination.FunkwhalePagination', 'PAGE_SIZE': 25, 'DEFAULT_AUTHENTICATION_CLASSES': ( @@ -309,6 +310,7 @@ REST_FRAMEWORK = { ), 'DEFAULT_FILTER_BACKENDS': ( 'rest_framework.filters.OrderingFilter', + 'django_filters.rest_framework.DjangoFilterBackend', ) } diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py index 0168bc25a..d961973d3 100644 --- a/api/funkwhale_api/__init__.py +++ b/api/funkwhale_api/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version__ = '0.2.2' +__version__ = '0.2.3' __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')]) diff --git a/api/funkwhale_api/common/pagination.py b/api/funkwhale_api/common/pagination.py new file mode 100644 index 000000000..224c470dc --- /dev/null +++ b/api/funkwhale_api/common/pagination.py @@ -0,0 +1,6 @@ +from rest_framework.pagination import PageNumberPagination + + +class FunkwhalePagination(PageNumberPagination): + page_size_query_param = 'page_size' + max_page_size = 25 diff --git a/api/funkwhale_api/music/fake_data.py b/api/funkwhale_api/music/fake_data.py new file mode 100644 index 000000000..ef5eaf4be --- /dev/null +++ b/api/funkwhale_api/music/fake_data.py @@ -0,0 +1,22 @@ +""" +Populates the database with fake data +""" +import random + +from funkwhale_api.music import models +from funkwhale_api.music.tests import factories + + +def create_data(count=25): + artists = factories.ArtistFactory.create_batch(size=count) + for artist in artists: + print('Creating data for', artist) + albums = factories.AlbumFactory.create_batch( + artist=artist, size=random.randint(1, 5)) + for album in albums: + factories.TrackFileFactory.create_batch( + track__album=album, size=random.randint(3, 18)) + + +if __name__ == '__main__': + main() diff --git a/api/funkwhale_api/music/filters.py b/api/funkwhale_api/music/filters.py new file mode 100644 index 000000000..ba3fa453d --- /dev/null +++ b/api/funkwhale_api/music/filters.py @@ -0,0 +1,12 @@ +import django_filters + +from . import models + + +class ArtistFilter(django_filters.FilterSet): + + class Meta: + model = models.Artist + fields = { + 'name': ['exact', 'iexact', 'startswith'] + } diff --git a/api/funkwhale_api/music/tests/factories.py b/api/funkwhale_api/music/tests/factories.py index d4ec04810..ea680b3bd 100644 --- a/api/funkwhale_api/music/tests/factories.py +++ b/api/funkwhale_api/music/tests/factories.py @@ -5,7 +5,7 @@ SAMPLES_PATH = os.path.dirname(os.path.abspath(__file__)) class ArtistFactory(factory.django.DjangoModelFactory): - name = factory.Sequence(lambda n: 'artist-{0}'.format(n)) + name = factory.Faker('name') mbid = factory.Faker('uuid4') class Meta: @@ -13,7 +13,7 @@ class ArtistFactory(factory.django.DjangoModelFactory): class AlbumFactory(factory.django.DjangoModelFactory): - title = factory.Sequence(lambda n: 'album-{0}'.format(n)) + title = factory.Faker('sentence', nb_words=3) mbid = factory.Faker('uuid4') release_date = factory.Faker('date') cover = factory.django.ImageField() @@ -24,7 +24,7 @@ class AlbumFactory(factory.django.DjangoModelFactory): class TrackFactory(factory.django.DjangoModelFactory): - title = factory.Sequence(lambda n: 'track-{0}'.format(n)) + title = factory.Faker('sentence', nb_words=3) mbid = factory.Faker('uuid4') album = factory.SubFactory(AlbumFactory) artist = factory.SelfAttribute('album.artist') diff --git a/api/funkwhale_api/music/tests/test_api.py b/api/funkwhale_api/music/tests/test_api.py index 21a567084..b7c25424f 100644 --- a/api/funkwhale_api/music/tests/test_api.py +++ b/api/funkwhale_api/music/tests/test_api.py @@ -182,6 +182,21 @@ class TestAPI(TMPDirTestCaseMixin, TestCase): self.assertJSONEqual(expected, json.loads(response.content.decode('utf-8'))) + def test_can_search_artist_by_name_start(self): + artist1 = factories.ArtistFactory(name='alpha') + artist2 = factories.ArtistFactory(name='beta') + results = { + 'next': None, + 'previous': None, + 'count': 1, + 'results': [serializers.ArtistSerializerNested(artist1).data] + } + expected = json.dumps(results) + url = self.reverse('api:v1:artists-list') + response = self.client.get(url, {'name__startswith': 'a'}) + + self.assertJSONEqual(expected, json.loads(response.content.decode('utf-8'))) + def test_can_search_tracks(self): artist1 = models.Artist.objects.create(name='Test1') artist2 = models.Artist.objects.create(name='Test2') diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py index 983192552..d149b5d1b 100644 --- a/api/funkwhale_api/music/views.py +++ b/api/funkwhale_api/music/views.py @@ -21,8 +21,10 @@ from taggit.models import Tag from . import models from . import serializers from . import importers +from . import filters from . import utils + class SearchMixin(object): search_fields = [] @@ -52,7 +54,8 @@ class ArtistViewSet(SearchMixin, viewsets.ReadOnlyModelViewSet): serializer_class = serializers.ArtistSerializerNested permission_classes = [ConditionalAuthentication] search_fields = ['name'] - ordering_fields = ('creation_date',) + ordering_fields = ('creation_date', 'name') + filter_class = filters.ArtistFilter class AlbumViewSet(SearchMixin, viewsets.ReadOnlyModelViewSet): diff --git a/api/requirements/base.txt b/api/requirements/base.txt index e7bc870cf..3a11afadf 100644 --- a/api/requirements/base.txt +++ b/api/requirements/base.txt @@ -45,6 +45,7 @@ django-taggit==0.22.1 persisting-theory==0.2.1 django-versatileimagefield==1.7.1 django-cachalot==1.5.0 +django-filter==1.1 django-rest-auth==0.9.1 beautifulsoup4==4.6.0 Markdown==2.6.8 diff --git a/front/package.json b/front/package.json index 55e773fba..bad90430f 100644 --- a/front/package.json +++ b/front/package.json @@ -16,9 +16,10 @@ "dependencies": { "dateformat": "^2.0.0", "js-logger": "^1.3.0", + "lodash": "^4.17.4", "semantic-ui-css": "^2.2.10", "vue": "^2.3.3", - "vue-global-events": "^1.0.2", + "vue-lazyload": "^1.1.4", "vue-resource": "^1.3.4", "vue-router": "^2.3.1", "vuedraggable": "^2.14.1" diff --git a/front/src/components/Pagination.vue b/front/src/components/Pagination.vue new file mode 100644 index 000000000..3ac7c59af --- /dev/null +++ b/front/src/components/Pagination.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue index 0ce16a75f..68927a37b 100644 --- a/front/src/components/Sidebar.vue +++ b/front/src/components/Sidebar.vue @@ -94,7 +94,7 @@ + + + diff --git a/front/src/components/library/Home.vue b/front/src/components/library/Home.vue index 651f7cb63..624da62c5 100644 --- a/front/src/components/library/Home.vue +++ b/front/src/components/library/Home.vue @@ -8,7 +8,7 @@

Latest artists

-
+
diff --git a/front/src/components/library/Library.vue b/front/src/components/library/Library.vue index 56b750a4a..da9ac19b3 100644 --- a/front/src/components/library/Library.vue +++ b/front/src/components/library/Library.vue @@ -2,8 +2,11 @@
Browse - Import - Import batches + Artists +
+ Import + Import batches +
diff --git a/front/src/components/library/Track.vue b/front/src/components/library/Track.vue index 3c627c13c..36a76e822 100644 --- a/front/src/components/library/Track.vue +++ b/front/src/components/library/Track.vue @@ -12,10 +12,10 @@ {{ track.title }}
From album - + {{ track.album.title }} - by + by {{ track.artist.name }}
diff --git a/front/src/components/utils/global-events.vue b/front/src/components/utils/global-events.vue new file mode 100644 index 000000000..2905e3a7d --- /dev/null +++ b/front/src/components/utils/global-events.vue @@ -0,0 +1,52 @@ + diff --git a/front/src/main.js b/front/src/main.js index 4ffbdb2f7..a214c3881 100644 --- a/front/src/main.js +++ b/front/src/main.js @@ -10,6 +10,7 @@ import App from './App' import router from './router' import VueResource from 'vue-resource' import auth from './auth' +import VueLazyload from 'vue-lazyload' window.$ = window.jQuery = require('jquery') @@ -19,6 +20,7 @@ window.$ = window.jQuery = require('jquery') require('semantic-ui-css/semantic.js') Vue.use(VueResource) +Vue.use(VueLazyload) Vue.config.productionTip = false Vue.http.interceptors.push(function (request, next) { diff --git a/front/src/router/index.js b/front/src/router/index.js index b3d90731f..e546172b5 100644 --- a/front/src/router/index.js +++ b/front/src/router/index.js @@ -7,6 +7,7 @@ import Logout from '@/components/auth/Logout' import Library from '@/components/library/Library' import LibraryHome from '@/components/library/Home' import LibraryArtist from '@/components/library/Artist' +import LibraryArtists from '@/components/library/Artists' import LibraryAlbum from '@/components/library/Album' import LibraryTrack from '@/components/library/Track' import LibraryImport from '@/components/library/import/Main' @@ -51,9 +52,10 @@ export default new Router({ component: Library, children: [ { path: '', component: LibraryHome }, - { path: 'artist/:id', name: 'library.artist', component: LibraryArtist, props: true }, - { path: 'album/:id', name: 'library.album', component: LibraryAlbum, props: true }, - { path: 'track/:id', name: 'library.track', component: LibraryTrack, props: true }, + { path: 'artists/', name: 'library.artists.browse', component: LibraryArtists }, + { path: 'artists/:id', name: 'library.artists.detail', component: LibraryArtist, props: true }, + { path: 'albums/:id', name: 'library.albums.detail', component: LibraryAlbum, props: true }, + { path: 'tracks/:id', name: 'library.tracks.detail', component: LibraryTrack, props: true }, { path: 'import/launch', name: 'library.import.launch',