From fc48e16e6519184596cffe79b597181e2d2666d3 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 21 May 2018 18:45:31 +0200
Subject: [PATCH 01/57] Fix #218: Ensure inactive users cannot get auth tokens

---
 api/tests/subsonic/test_authentication.py | 19 +++++++++
 api/tests/users/test_views.py             | 48 ++++++++++++++---------
 changes/changelog.d/218.bugfix            |  2 +
 3 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 changes/changelog.d/218.bugfix

diff --git a/api/tests/subsonic/test_authentication.py b/api/tests/subsonic/test_authentication.py
index 724513523..656f8c44d 100644
--- a/api/tests/subsonic/test_authentication.py
+++ b/api/tests/subsonic/test_authentication.py
@@ -1,4 +1,7 @@
 import binascii
+import pytest
+
+from rest_framework import exceptions
 
 from funkwhale_api.subsonic import authentication
 
@@ -54,3 +57,19 @@ def test_auth_with_password_cleartext(api_request, factories):
     u, _ = authenticator.authenticate(request)
 
     assert user == u
+
+
+def test_auth_with_inactive_users(api_request, factories):
+    salt = 'salt'
+    user = factories['users.User'](is_active=False)
+    user.subsonic_api_token = 'password'
+    user.save()
+    token = authentication.get_token(salt, 'password')
+    request = api_request.get('/', {
+        'u': user.username,
+        'p': 'password',
+    })
+
+    authenticator = authentication.SubsonicAuthentication()
+    with pytest.raises(exceptions.AuthenticationFailed):
+        authenticator.authenticate(request)
diff --git a/api/tests/users/test_views.py b/api/tests/users/test_views.py
index 1bbf8b9a2..6418889ce 100644
--- a/api/tests/users/test_views.py
+++ b/api/tests/users/test_views.py
@@ -7,7 +7,7 @@ from django.urls import reverse
 from funkwhale_api.users.models import User
 
 
-def test_can_create_user_via_api(preferences, client, db):
+def test_can_create_user_via_api(preferences, api_client, db):
     url = reverse('rest_register')
     data = {
         'username': 'test1',
@@ -16,14 +16,14 @@ def test_can_create_user_via_api(preferences, client, db):
         'password2': 'testtest',
     }
     preferences['users__registration_enabled'] = True
-    response = client.post(url, data)
+    response = api_client.post(url, data)
     assert response.status_code == 201
 
     u = User.objects.get(email='test1@test.com')
     assert u.username == 'test1'
 
 
-def test_can_restrict_usernames(settings, preferences, db, client):
+def test_can_restrict_usernames(settings, preferences, db, api_client):
     url = reverse('rest_register')
     preferences['users__registration_enabled'] = True
     settings.USERNAME_BLACKLIST = ['funkwhale']
@@ -34,13 +34,13 @@ def test_can_restrict_usernames(settings, preferences, db, client):
         'password2': 'testtest',
     }
 
-    response = client.post(url, data)
+    response = api_client.post(url, data)
 
     assert response.status_code == 400
     assert 'username' in response.data
 
 
-def test_can_disable_registration_view(preferences, client, db):
+def test_can_disable_registration_view(preferences, api_client, db):
     url = reverse('rest_register')
     data = {
         'username': 'test1',
@@ -49,7 +49,7 @@ def test_can_disable_registration_view(preferences, client, db):
         'password2': 'testtest',
     }
     preferences['users__registration_enabled'] = False
-    response = client.post(url, data)
+    response = api_client.post(url, data)
     assert response.status_code == 403
 
 
@@ -73,7 +73,7 @@ def test_can_fetch_data_from_api(api_client, factories):
     assert response.data['permissions'] == user.get_permissions()
 
 
-def test_can_get_token_via_api(client, factories):
+def test_can_get_token_via_api(api_client, factories):
     user = factories['users.User']()
     url = reverse('api:v1:token')
     payload = {
@@ -81,12 +81,24 @@ def test_can_get_token_via_api(client, factories):
         'password': 'test'
     }
 
-    response = client.post(url, payload)
+    response = api_client.post(url, payload)
     assert response.status_code == 200
-    assert '"token":' in response.content.decode('utf-8')
+    assert 'token' in response.data
 
 
-def test_can_refresh_token_via_api(client, factories):
+def test_can_get_token_via_api_inactive(api_client, factories):
+    user = factories['users.User'](is_active=False)
+    url = reverse('api:v1:token')
+    payload = {
+        'username': user.username,
+        'password': 'test'
+    }
+
+    response = api_client.post(url, payload)
+    assert response.status_code == 400
+
+
+def test_can_refresh_token_via_api(api_client, factories, mocker):
     # first, we get a token
     user = factories['users.User']()
     url = reverse('api:v1:token')
@@ -95,21 +107,19 @@ def test_can_refresh_token_via_api(client, factories):
         'password': 'test'
     }
 
-    response = client.post(url, payload)
+    response = api_client.post(url, payload)
     assert response.status_code == 200
 
-    token = json.loads(response.content.decode('utf-8'))['token']
+    token = response.data['token']
     url = reverse('api:v1:token_refresh')
-    response = client.post(url,{'token': token})
+    response = api_client.post(url, {'token': token})
 
     assert response.status_code == 200
-    assert '"token":' in response.content.decode('utf-8')
-    # a different token should be returned
-    assert token in response.content.decode('utf-8')
+    assert 'token' in response.data
 
 
-def test_changing_password_updates_secret_key(logged_in_client):
-    user = logged_in_client.user
+def test_changing_password_updates_secret_key(logged_in_api_client):
+    user = logged_in_api_client.user
     password = user.password
     secret_key = user.secret_key
     payload = {
@@ -119,7 +129,7 @@ def test_changing_password_updates_secret_key(logged_in_client):
     }
     url = reverse('change_password')
 
-    response = logged_in_client.post(url, payload)
+    response = logged_in_api_client.post(url, payload)
 
     user.refresh_from_db()
 
diff --git a/changes/changelog.d/218.bugfix b/changes/changelog.d/218.bugfix
new file mode 100644
index 000000000..f754d7ca4
--- /dev/null
+++ b/changes/changelog.d/218.bugfix
@@ -0,0 +1,2 @@
+Ensure inactive users cannot get auth tokens (#218)
+This was already the case bug we missed some checks

From f91ec0c8104bfabc77ed9eeec3744680fb52db6f Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 21 May 2018 18:46:39 +0200
Subject: [PATCH 02/57] Upgraded to django-allauth 0.36

---
 api/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/requirements/base.txt b/api/requirements/base.txt
index ac0586566..d88483de4 100644
--- a/api/requirements/base.txt
+++ b/api/requirements/base.txt
@@ -10,7 +10,7 @@ Pillow>=4.3,<4.4
 
 # For user registration, either via email or social
 # Well-built with regular release cycles!
-django-allauth>=0.34,<0.35
+django-allauth>=0.36,<0.37
 
 
 # Python-PostgreSQL Database Adapter

From ae00cccf1462b3a00befdb05d3aeb10eb68fb434 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 21 May 2018 19:04:28 +0200
Subject: [PATCH 03/57] Fix #207: Consistent constraints/checks for URL size

---
 .../migrations/0006_auto_20180521_1702.py     | 28 ++++++++
 api/funkwhale_api/federation/models.py        |  6 +-
 api/funkwhale_api/federation/serializers.py   | 70 +++++++++----------
 changes/changelog.d/207.bugfix                |  1 +
 4 files changed, 67 insertions(+), 38 deletions(-)
 create mode 100644 api/funkwhale_api/federation/migrations/0006_auto_20180521_1702.py
 create mode 100644 changes/changelog.d/207.bugfix

diff --git a/api/funkwhale_api/federation/migrations/0006_auto_20180521_1702.py b/api/funkwhale_api/federation/migrations/0006_auto_20180521_1702.py
new file mode 100644
index 000000000..7dcf85670
--- /dev/null
+++ b/api/funkwhale_api/federation/migrations/0006_auto_20180521_1702.py
@@ -0,0 +1,28 @@
+# Generated by Django 2.0.4 on 2018-05-21 17:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('federation', '0005_auto_20180413_1723'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='library',
+            name='url',
+            field=models.URLField(max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='librarytrack',
+            name='audio_url',
+            field=models.URLField(max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='librarytrack',
+            name='url',
+            field=models.URLField(max_length=500, unique=True),
+        ),
+    ]
diff --git a/api/funkwhale_api/federation/models.py b/api/funkwhale_api/federation/models.py
index 69d0ea925..8b4f28475 100644
--- a/api/funkwhale_api/federation/models.py
+++ b/api/funkwhale_api/federation/models.py
@@ -139,7 +139,7 @@ class Library(models.Model):
         on_delete=models.CASCADE,
         related_name='library')
     uuid = models.UUIDField(default=uuid.uuid4)
-    url = models.URLField()
+    url = models.URLField(max_length=500)
 
     # use this flag to disable federation with a library
     federation_enabled = models.BooleanField()
@@ -166,8 +166,8 @@ def get_file_path(instance, filename):
 
 
 class LibraryTrack(models.Model):
-    url = models.URLField(unique=True)
-    audio_url = models.URLField()
+    url = models.URLField(unique=True, max_length=500)
+    audio_url = models.URLField(max_length=500)
     audio_mimetype = models.CharField(max_length=200)
     audio_file = models.FileField(
         upload_to=get_file_path,
diff --git a/api/funkwhale_api/federation/serializers.py b/api/funkwhale_api/federation/serializers.py
index 8d3dd6379..51561e222 100644
--- a/api/funkwhale_api/federation/serializers.py
+++ b/api/funkwhale_api/federation/serializers.py
@@ -26,16 +26,16 @@ logger = logging.getLogger(__name__)
 
 
 class ActorSerializer(serializers.Serializer):
-    id = serializers.URLField()
-    outbox = serializers.URLField()
-    inbox = serializers.URLField()
+    id = serializers.URLField(max_length=500)
+    outbox = serializers.URLField(max_length=500)
+    inbox = serializers.URLField(max_length=500)
     type = serializers.ChoiceField(choices=models.TYPE_CHOICES)
     preferredUsername = serializers.CharField()
     manuallyApprovesFollowers = serializers.NullBooleanField(required=False)
     name = serializers.CharField(required=False, max_length=200)
     summary = serializers.CharField(max_length=None, required=False)
-    followers = serializers.URLField(required=False, allow_null=True)
-    following = serializers.URLField(required=False, allow_null=True)
+    followers = serializers.URLField(max_length=500, required=False, allow_null=True)
+    following = serializers.URLField(max_length=500, required=False, allow_null=True)
     publicKey = serializers.JSONField(required=False)
 
     def to_representation(self, instance):
@@ -224,7 +224,7 @@ class APILibraryFollowUpdateSerializer(serializers.Serializer):
 
 
 class APILibraryCreateSerializer(serializers.ModelSerializer):
-    actor = serializers.URLField()
+    actor = serializers.URLField(max_length=500)
     federation_enabled = serializers.BooleanField()
     uuid = serializers.UUIDField(read_only=True)
 
@@ -315,9 +315,9 @@ class APILibraryTrackSerializer(serializers.ModelSerializer):
 
 
 class FollowSerializer(serializers.Serializer):
-    id = serializers.URLField()
-    object = serializers.URLField()
-    actor = serializers.URLField()
+    id = serializers.URLField(max_length=500)
+    object = serializers.URLField(max_length=500)
+    actor = serializers.URLField(max_length=500)
     type = serializers.ChoiceField(choices=['Follow'])
 
     def validate_object(self, v):
@@ -374,8 +374,8 @@ class APIFollowSerializer(serializers.ModelSerializer):
 
 
 class AcceptFollowSerializer(serializers.Serializer):
-    id = serializers.URLField()
-    actor = serializers.URLField()
+    id = serializers.URLField(max_length=500)
+    actor = serializers.URLField(max_length=500)
     object = FollowSerializer()
     type = serializers.ChoiceField(choices=['Accept'])
 
@@ -417,8 +417,8 @@ class AcceptFollowSerializer(serializers.Serializer):
 
 
 class UndoFollowSerializer(serializers.Serializer):
-    id = serializers.URLField()
-    actor = serializers.URLField()
+    id = serializers.URLField(max_length=500)
+    actor = serializers.URLField(max_length=500)
     object = FollowSerializer()
     type = serializers.ChoiceField(choices=['Undo'])
 
@@ -459,9 +459,9 @@ class UndoFollowSerializer(serializers.Serializer):
 
 class ActorWebfingerSerializer(serializers.Serializer):
     subject = serializers.CharField()
-    aliases = serializers.ListField(child=serializers.URLField())
+    aliases = serializers.ListField(child=serializers.URLField(max_length=500))
     links = serializers.ListField()
-    actor_url = serializers.URLField(required=False)
+    actor_url = serializers.URLField(max_length=500, required=False)
 
     def validate(self, validated_data):
         validated_data['actor_url'] = None
@@ -496,8 +496,8 @@ class ActorWebfingerSerializer(serializers.Serializer):
 
 
 class ActivitySerializer(serializers.Serializer):
-    actor = serializers.URLField()
-    id = serializers.URLField(required=False)
+    actor = serializers.URLField(max_length=500)
+    id = serializers.URLField(max_length=500, required=False)
     type = serializers.ChoiceField(
         choices=[(c, c) for c in activity.ACTIVITY_TYPES])
     object = serializers.JSONField()
@@ -539,8 +539,8 @@ class ActivitySerializer(serializers.Serializer):
 
 
 class ObjectSerializer(serializers.Serializer):
-    id = serializers.URLField()
-    url = serializers.URLField(required=False, allow_null=True)
+    id = serializers.URLField(max_length=500)
+    url = serializers.URLField(max_length=500, required=False, allow_null=True)
     type = serializers.ChoiceField(
         choices=[(c, c) for c in activity.OBJECT_TYPES])
     content = serializers.CharField(
@@ -554,16 +554,16 @@ class ObjectSerializer(serializers.Serializer):
     updated = serializers.DateTimeField(
         required=False, allow_null=True)
     to = serializers.ListField(
-        child=serializers.URLField(),
+        child=serializers.URLField(max_length=500),
         required=False, allow_null=True)
     cc = serializers.ListField(
-        child=serializers.URLField(),
+        child=serializers.URLField(max_length=500),
         required=False, allow_null=True)
     bto = serializers.ListField(
-        child=serializers.URLField(),
+        child=serializers.URLField(max_length=500),
         required=False, allow_null=True)
     bcc = serializers.ListField(
-        child=serializers.URLField(),
+        child=serializers.URLField(max_length=500),
         required=False, allow_null=True)
 
 OBJECT_SERIALIZERS = {
@@ -575,10 +575,10 @@ OBJECT_SERIALIZERS = {
 class PaginatedCollectionSerializer(serializers.Serializer):
     type = serializers.ChoiceField(choices=['Collection'])
     totalItems = serializers.IntegerField(min_value=0)
-    actor = serializers.URLField()
-    id = serializers.URLField()
-    first = serializers.URLField()
-    last = serializers.URLField()
+    actor = serializers.URLField(max_length=500)
+    id = serializers.URLField(max_length=500)
+    first = serializers.URLField(max_length=500)
+    last = serializers.URLField(max_length=500)
 
     def to_representation(self, conf):
         paginator = Paginator(
@@ -607,13 +607,13 @@ class CollectionPageSerializer(serializers.Serializer):
     type = serializers.ChoiceField(choices=['CollectionPage'])
     totalItems = serializers.IntegerField(min_value=0)
     items = serializers.ListField()
-    actor = serializers.URLField()
-    id = serializers.URLField()
-    first = serializers.URLField()
-    last = serializers.URLField()
-    next = serializers.URLField(required=False)
-    prev = serializers.URLField(required=False)
-    partOf = serializers.URLField()
+    actor = serializers.URLField(max_length=500)
+    id = serializers.URLField(max_length=500)
+    first = serializers.URLField(max_length=500)
+    last = serializers.URLField(max_length=500)
+    next = serializers.URLField(max_length=500, required=False)
+    prev = serializers.URLField(max_length=500, required=False)
+    partOf = serializers.URLField(max_length=500)
 
     def validate_items(self, v):
         item_serializer = self.context.get('item_serializer')
@@ -698,7 +698,7 @@ class AudioMetadataSerializer(serializers.Serializer):
 
 class AudioSerializer(serializers.Serializer):
     type = serializers.CharField()
-    id = serializers.URLField()
+    id = serializers.URLField(max_length=500)
     url = serializers.JSONField()
     published = serializers.DateTimeField()
     updated = serializers.DateTimeField(required=False)
diff --git a/changes/changelog.d/207.bugfix b/changes/changelog.d/207.bugfix
new file mode 100644
index 000000000..edab45cdf
--- /dev/null
+++ b/changes/changelog.d/207.bugfix
@@ -0,0 +1 @@
+Consistent constraints/checks for URL size (#207)

From 7b71463ef8e9e88c8c8ee26277d8c3eb13cea02a Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 21 May 2018 19:55:06 +0200
Subject: [PATCH 04/57] Removed acoustid support, as the integration was buggy
 and error-prone (#106)

---
 api/funkwhale_api/music/tasks.py              | 15 +++---
 .../management/commands/import_files.py       | 10 +---
 api/tests/music/test_tasks.py                 | 48 +++++--------------
 api/tests/test_import_audio_file.py           | 24 ----------
 changes/changelog.d/acoustid.misc             |  1 +
 docs/importing-music.rst                      | 10 ++--
 front/src/views/admin/Settings.vue            |  3 +-
 7 files changed, 27 insertions(+), 84 deletions(-)
 create mode 100644 changes/changelog.d/acoustid.misc

diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py
index 34345e47b..e5426904a 100644
--- a/api/funkwhale_api/music/tasks.py
+++ b/api/funkwhale_api/music/tasks.py
@@ -9,7 +9,7 @@ from funkwhale_api.federation import models as federation_models
 from funkwhale_api.federation import serializers as federation_serializers
 from funkwhale_api.taskapp import celery
 from funkwhale_api.providers.acoustid import get_acoustid_client
-from funkwhale_api.providers.audiofile.tasks import import_track_data_from_path
+from funkwhale_api.providers.audiofile import tasks as audiofile_tasks
 
 from django.conf import settings
 from . import models
@@ -73,13 +73,15 @@ def import_track_from_remote(library_track):
         library_track.title, artist=artist, album=album)[0]
 
 
-def _do_import(import_job, replace=False, use_acoustid=True):
+def _do_import(import_job, replace=False, use_acoustid=False):
     from_file = bool(import_job.audio_file)
     mbid = import_job.mbid
     acoustid_track_id = None
     duration = None
     track = None
-    use_acoustid = use_acoustid and preferences.get('providers_acoustid__api_key')
+    # use_acoustid = use_acoustid and preferences.get('providers_acoustid__api_key')
+    # Acoustid is not reliable, we disable it for now.
+    use_acoustid = False
     if not mbid and use_acoustid and from_file:
         # we try to deduce mbid from acoustid
         client = get_acoustid_client()
@@ -91,11 +93,12 @@ def _do_import(import_job, replace=False, use_acoustid=True):
     if mbid:
         track, _ = models.Track.get_or_create_from_api(mbid=mbid)
     elif import_job.audio_file:
-        track = import_track_data_from_path(import_job.audio_file.path)
+        track = audiofile_tasks.import_track_data_from_path(
+            import_job.audio_file.path)
     elif import_job.library_track:
         track = import_track_from_remote(import_job.library_track)
     elif import_job.source.startswith('file://'):
-        track = import_track_data_from_path(
+        track = audiofile_tasks.import_track_data_from_path(
             import_job.source.replace('file://', '', 1))
     else:
         raise ValueError(
@@ -151,7 +154,7 @@ def _do_import(import_job, replace=False, use_acoustid=True):
     models.ImportJob.objects.filter(
         status__in=['pending', 'errored']),
     'import_job')
-def import_job_run(self, import_job, replace=False, use_acoustid=True):
+def import_job_run(self, import_job, replace=False, use_acoustid=False):
     def mark_errored():
         import_job.status = 'errored'
         import_job.save(update_fields=['status'])
diff --git a/api/funkwhale_api/providers/audiofile/management/commands/import_files.py b/api/funkwhale_api/providers/audiofile/management/commands/import_files.py
index a2757c692..70ff90ffa 100644
--- a/api/funkwhale_api/providers/audiofile/management/commands/import_files.py
+++ b/api/funkwhale_api/providers/audiofile/management/commands/import_files.py
@@ -54,13 +54,6 @@ class Command(BaseCommand):
                 'import and not much disk space available.'
             )
         )
-        parser.add_argument(
-            '--no-acoustid',
-            action='store_true',
-            dest='no_acoustid',
-            default=False,
-            help='Use this flag to completely bypass acoustid completely',
-        )
         parser.add_argument(
             '--noinput', '--no-input', action='store_false', dest='interactive',
             help="Do NOT prompt the user for input of any kind.",
@@ -118,7 +111,6 @@ class Command(BaseCommand):
             len(filtered['new'])))
 
         self.stdout.write('Selected options: {}'.format(', '.join([
-            'no acoustid' if options['no_acoustid'] else 'use acoustid',
             'in place' if options['in_place'] else 'copy music files',
         ])))
         if len(filtered['new']) == 0:
@@ -201,4 +193,4 @@ class Command(BaseCommand):
             job.save()
         import_handler(
             import_job_id=job.pk,
-            use_acoustid=not options['no_acoustid'])
+            use_acoustid=False)
diff --git a/api/tests/music/test_tasks.py b/api/tests/music/test_tasks.py
index c5839432b..26cb9453e 100644
--- a/api/tests/music/test_tasks.py
+++ b/api/tests/music/test_tasks.py
@@ -105,7 +105,7 @@ def test_run_import_skipping_accoustid(factories, mocker):
 def test__do_import_skipping_accoustid(factories, mocker):
     t = factories['music.Track']()
     m = mocker.patch(
-        'funkwhale_api.music.tasks.import_track_data_from_path',
+        'funkwhale_api.providers.audiofile.tasks.import_track_data_from_path',
         return_value=t)
     path = os.path.join(DATA_DIR, 'test.ogg')
     job = factories['music.FileImportJob'](
@@ -121,7 +121,7 @@ def test__do_import_skipping_accoustid_if_no_key(
     preferences['providers_acoustid__api_key'] = ''
     t = factories['music.Track']()
     m = mocker.patch(
-        'funkwhale_api.music.tasks.import_track_data_from_path',
+        'funkwhale_api.providers.audiofile.tasks.import_track_data_from_path',
         return_value=t)
     path = os.path.join(DATA_DIR, 'test.ogg')
     job = factories['music.FileImportJob'](
@@ -132,32 +132,14 @@ def test__do_import_skipping_accoustid_if_no_key(
     m.assert_called_once_with(p)
 
 
-def test_import_job_can_be_skipped(
-        artists, albums, tracks, factories, mocker, preferences):
-    preferences['providers_acoustid__api_key'] = 'test'
+def test_import_job_skip_if_already_exists(
+        artists, albums, tracks, factories, mocker):
     path = os.path.join(DATA_DIR, 'test.ogg')
     mbid = '9968a9d6-8d92-4051-8f76-674e157b6eed'
     track_file = factories['music.TrackFile'](track__mbid=mbid)
-    acoustid_payload = {
-        'results': [
-            {'id': 'e475bf79-c1ce-4441-bed7-1e33f226c0a2',
-             'recordings': [
-                {
-                 'duration': 268,
-                 'id': mbid}],
-            'score': 0.860825}],
-        'status': 'ok'
-    }
     mocker.patch(
-        'funkwhale_api.musicbrainz.api.artists.get',
-        return_value=artists['get']['adhesive_wombat'])
-    mocker.patch(
-        'funkwhale_api.musicbrainz.api.releases.get',
-        return_value=albums['get']['marsupial'])
-    mocker.patch(
-        'funkwhale_api.musicbrainz.api.recordings.search',
-        return_value=tracks['search']['8bitadventures'])
-    mocker.patch('acoustid.match', return_value=acoustid_payload)
+        'funkwhale_api.providers.audiofile.tasks.import_track_data_from_path',
+        return_value=track_file.track)
 
     job = factories['music.FileImportJob'](audio_file__path=path)
     f = job.audio_file
@@ -171,29 +153,23 @@ def test_import_job_can_be_skipped(
 
 
 def test_import_job_can_be_errored(factories, mocker, preferences):
-    preferences['providers_acoustid__api_key'] = 'test'
     path = os.path.join(DATA_DIR, 'test.ogg')
     mbid = '9968a9d6-8d92-4051-8f76-674e157b6eed'
     track_file = factories['music.TrackFile'](track__mbid=mbid)
-    acoustid_payload = {
-        'results': [
-            {'id': 'e475bf79-c1ce-4441-bed7-1e33f226c0a2',
-             'recordings': [
-                {
-                 'duration': 268,
-                 'id': mbid}],
-            'score': 0.860825}],
-        'status': 'ok'
-    }
+
     class MyException(Exception):
         pass
-    mocker.patch('acoustid.match', side_effect=MyException())
+
+    mocker.patch(
+        'funkwhale_api.music.tasks._do_import',
+        side_effect=MyException())
 
     job = factories['music.FileImportJob'](
         audio_file__path=path, track_file=None)
 
     with pytest.raises(MyException):
         tasks.import_job_run(import_job_id=job.pk)
+
     job.refresh_from_db()
 
     assert job.track_file is None
diff --git a/api/tests/test_import_audio_file.py b/api/tests/test_import_audio_file.py
index 8217ffa0b..de8186075 100644
--- a/api/tests/test_import_audio_file.py
+++ b/api/tests/test_import_audio_file.py
@@ -1,5 +1,4 @@
 import pytest
-import acoustid
 import datetime
 import os
 import uuid
@@ -17,8 +16,6 @@ DATA_DIR = os.path.join(
 
 
 def test_can_create_track_from_file_metadata(db, mocker):
-    mocker.patch(
-        'acoustid.match', side_effect=acoustid.WebServiceError('test'))
     metadata = {
         'artist': ['Test artist'],
         'album': ['Test album'],
@@ -94,24 +91,6 @@ def test_import_files_creates_a_batch_and_job(factories, mocker):
         assert job.audio_file.read() == f.read()
 
     assert job.source == 'file://' + path
-    m.assert_called_once_with(
-        import_job_id=job.pk,
-        use_acoustid=True)
-
-
-def test_import_files_skip_acoustid(factories, mocker):
-    m = mocker.patch('funkwhale_api.music.tasks.import_job_run')
-    user = factories['users.User'](username='me')
-    path = os.path.join(DATA_DIR, 'dummy_file.ogg')
-    call_command(
-        'import_files',
-        path,
-        username='me',
-        async=False,
-        no_acoustid=True,
-        interactive=False)
-    batch = user.imports.latest('id')
-    job = batch.jobs.first()
     m.assert_called_once_with(
         import_job_id=job.pk,
         use_acoustid=False)
@@ -128,7 +107,6 @@ def test_import_files_skip_if_path_already_imported(factories, mocker):
         path,
         username='me',
         async=False,
-        no_acoustid=True,
         interactive=False)
     assert user.imports.count() == 0
 
@@ -142,7 +120,6 @@ def test_import_files_works_with_utf8_file_name(factories, mocker):
         path,
         username='me',
         async=False,
-        no_acoustid=True,
         interactive=False)
     batch = user.imports.latest('id')
     job = batch.jobs.first()
@@ -162,7 +139,6 @@ def test_import_files_in_place(factories, mocker, settings):
         username='me',
         async=False,
         in_place=True,
-        no_acoustid=True,
         interactive=False)
     batch = user.imports.latest('id')
     job = batch.jobs.first()
diff --git a/changes/changelog.d/acoustid.misc b/changes/changelog.d/acoustid.misc
new file mode 100644
index 000000000..7fc34febe
--- /dev/null
+++ b/changes/changelog.d/acoustid.misc
@@ -0,0 +1 @@
+Removed acoustid support, as the integration was buggy and error-prone (#106)
diff --git a/docs/importing-music.rst b/docs/importing-music.rst
index 97dd13854..4d256604b 100644
--- a/docs/importing-music.rst
+++ b/docs/importing-music.rst
@@ -6,7 +6,8 @@ From music directory on the server
 
 You can import music files in funkwhale assuming they are located on the server
 and readable by the funkwhale application. Your music files should contain at
-least an ``artist``, ``album`` and ``title`` tags.
+least an ``artist``, ``album`` and ``title`` tags, but we recommend you tag
+it extensively using a proper tool, such as Beets or Musicbrainz Picard.
 
 You can import those tracks as follows, assuming they are located in
 ``/srv/funkwhale/data/music``:
@@ -32,11 +33,6 @@ get details::
     For the best results, we recommand tagging your music collection through
     `Picard <http://picard.musicbrainz.org/>`_ in order to have the best quality metadata.
 
-.. note::
-
-    Autotagging using acoustid is experimental now and can yield unexpected
-    result. You can disable acoustid by passing the --no-acoustid flag.
-
 .. note::
 
     This command is idempotent, meaning you can run it multiple times on the same
@@ -44,7 +40,7 @@ get details::
 
 .. note::
 
-    At the moment, only OGG/Vorbis and MP3 files with ID3 tags are supported
+    At the moment, only Flac, OGG/Vorbis and MP3 files with ID3 tags are supported
 
 
 .. _in-place-import:
diff --git a/front/src/views/admin/Settings.vue b/front/src/views/admin/Settings.vue
index 7174ab516..81eb97aa6 100644
--- a/front/src/views/admin/Settings.vue
+++ b/front/src/views/admin/Settings.vue
@@ -93,8 +93,7 @@ export default {
           label: this.$t('Imports'),
           id: 'imports',
           settings: [
-            'providers_youtube__api_key',
-            'providers_acoustid__api_key'
+            'providers_youtube__api_key'
           ]
         },
         {

From ca104d64504c07614e72415b9cffb016378d6431 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 21 May 2018 20:34:03 +0200
Subject: [PATCH 05/57] Increased max body size in dev

---
 docker/nginx/conf.dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev
index ab6714e60..673edd1a4 100644
--- a/docker/nginx/conf.dev
+++ b/docker/nginx/conf.dev
@@ -36,7 +36,7 @@ http {
     server {
         listen 6001;
         charset     utf-8;
-        client_max_body_size 20M;
+        client_max_body_size 30M;
         include /etc/nginx/funkwhale_proxy.conf;
         location /_protected/media {
             internal;

From 0c1a2b76c16be40171a65d57f9712393b7052275 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 21 May 2018 20:38:49 +0200
Subject: [PATCH 06/57] Fix #106 and #213: better web uploader, that supports
 Flac files

---
 changes/changelog.d/106.bugfix                |  1 +
 changes/changelog.d/213.bugfix                |  9 +++++++
 .../components/library/import/FileUpload.vue  | 14 +++++++---
 front/src/components/library/import/Main.vue  | 26 +++++++++++++++++--
 4 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 changes/changelog.d/106.bugfix
 create mode 100644 changes/changelog.d/213.bugfix

diff --git a/changes/changelog.d/106.bugfix b/changes/changelog.d/106.bugfix
new file mode 100644
index 000000000..ff0f61609
--- /dev/null
+++ b/changes/changelog.d/106.bugfix
@@ -0,0 +1 @@
+File-upload importer should now work properly, assuming files are tagged (#106)
diff --git a/changes/changelog.d/213.bugfix b/changes/changelog.d/213.bugfix
new file mode 100644
index 000000000..d6ff593b9
--- /dev/null
+++ b/changes/changelog.d/213.bugfix
@@ -0,0 +1,9 @@
+File-upload import now supports Flac files (#213)
+
+Flac files imports via upload
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You have nothing to do to benefit from this, however, since Flac files
+tend to be a lot bigger than other files, you may want to increase the
+``client_max_body_size`` value in your Nginx configuration if you plan
+to upload flac files.
diff --git a/front/src/components/library/import/FileUpload.vue b/front/src/components/library/import/FileUpload.vue
index 9a4b820e3..7aa8adac0 100644
--- a/front/src/components/library/import/FileUpload.vue
+++ b/front/src/components/library/import/FileUpload.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
     <div v-if="batch" class="ui container">
+      <div class="ui message">
+        {{ $t('Ensure your music files are properly tagged before uploading them.') }}
+        <a href="http://picard.musicbrainz.org/" target='_blank'>{{ $t('We recommend using Picard for that purpose.') }}</a>
+      </div>
       <file-upload-widget
         :class="['ui', 'icon', 'left', 'floated', 'button']"
         :post-action="uploadUrl"
@@ -8,7 +12,7 @@
         :size="1024 * 1024 * 30"
         :data="uploadData"
         :drop="true"
-        extensions="ogg,mp3"
+        extensions="ogg,mp3,flac"
         accept="audio/*"
         v-model="files"
         name="audio_file"
@@ -21,7 +25,7 @@
     </file-upload-widget>
       <button
         :class="['ui', 'right', 'floated', 'icon', {disabled: files.length === 0}, 'button']"
-        v-if="!$refs.upload || !$refs.upload.active" @click.prevent="$refs.upload.active = true">
+        v-if="!$refs.upload || !$refs.upload.active" @click.prevent="startUpload()">
         <i class="play icon" aria-hidden="true"></i>
         <i18next path="Start Upload"/>
       </button>
@@ -88,7 +92,7 @@ export default {
     inputFilter (newFile, oldFile, prevent) {
       if (newFile && !oldFile) {
         let extension = newFile.name.split('.').pop()
-        if (['ogg', 'mp3'].indexOf(extension) < 0) {
+        if (['ogg', 'mp3', 'flac'].indexOf(extension) < 0) {
           prevent()
         }
       }
@@ -114,6 +118,10 @@ export default {
       }, (response) => {
         logger.default.error('error while launching creating batch')
       })
+    },
+    startUpload () {
+      this.$emit('batch-created', this.batch)
+      this.$refs.upload.active = true
     }
   },
   computed: {
diff --git a/front/src/components/library/import/Main.vue b/front/src/components/library/import/Main.vue
index de17e2afa..eac1239a8 100644
--- a/front/src/components/library/import/Main.vue
+++ b/front/src/components/library/import/Main.vue
@@ -24,16 +24,25 @@
       <div class="ui hidden divider"></div>
       <div class="ui centered buttons">
         <button @click="currentStep -= 1" :disabled="currentStep === 0" class="ui icon button"><i class="left arrow icon"></i><i18next path="Previous step"/></button>
-        <button @click="currentStep += 1" v-if="currentStep < 2" class="ui icon button"><i18next path="Next step"/><i class="right arrow icon"></i></button>
+        <button @click="nextStep()" v-if="currentStep < 2" class="ui icon button"><i18next path="Next step"/><i class="right arrow icon"></i></button>
         <button
           @click="$refs.import.launchImport()"
-          v-if="currentStep === 2"
+          v-if="currentStep === 2 && currentSource != 'upload'"
           :class="['ui', 'positive', 'icon', {'loading': isImporting}, 'button']"
           :disabled="isImporting || importData.count === 0"
           >
             <i18next path="Import {%0%} tracks">{{ importData.count }}</i18next>
             <i class="check icon"></i>
           </button>
+        <button
+          v-else-if="currentStep === 2 && currentSource === 'upload'"
+          @click="$router.push({name: 'library.import.batches.detail', params: {id: importBatch.id}})"
+          :class="['ui', 'positive', 'icon', {'disabled': !importBatch}, 'button']"
+          :disabled="!importBatch"
+          >
+            {{ $t('Finish import' )}}
+            <i class="check icon"></i>
+          </button>
       </div>
       <div class="ui hidden divider"></div>
       <div class="ui attached segment">
@@ -100,6 +109,7 @@
         <div v-if="currentStep === 2">
           <file-upload
             ref="import"
+            @batch-created="updateBatch"
             v-if="currentSource == 'upload'"
             ></file-upload>
 
@@ -165,6 +175,7 @@ export default {
       currentSource: this.source,
       metadata: {},
       isImporting: false,
+      importBatch: null,
       importData: {
         tracks: []
       },
@@ -214,11 +225,22 @@ export default {
     updateId (newValue) {
       this.currentId = newValue
     },
+    updateBatch (batch) {
+      this.importBatch = batch
+    },
     fetchRequest (id) {
       let self = this
       axios.get(`requests/import-requests/${id}`).then((response) => {
         self.currentRequest = response.data
       })
+    },
+    nextStep () {
+      if (this.currentStep === 0 && this.currentSource === 'upload') {
+        // we skip metadata directly
+        this.currentStep += 2
+      } else {
+        this.currentStep += 1
+      }
     }
   },
   computed: {

From 857fab526d383e6f355f7dad287fd07187a9c91e Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 22 May 2018 21:10:48 +0200
Subject: [PATCH 07/57] See #224: less clutered music API, better serializers

---
 api/funkwhale_api/favorites/serializers.py |   2 -
 api/funkwhale_api/history/serializers.py   |   1 -
 api/funkwhale_api/history/views.py         |   1 -
 api/funkwhale_api/music/models.py          |   6 +
 api/funkwhale_api/music/serializers.py     | 160 ++++++++++++++-------
 api/funkwhale_api/music/views.py           |  41 ++----
 api/funkwhale_api/playlists/serializers.py |   4 +-
 api/funkwhale_api/radios/serializers.py    |   4 +-
 api/funkwhale_api/radios/views.py          |   6 +-
 api/tests/conftest.py                      |  15 ++
 api/tests/music/test_api.py                |  35 -----
 api/tests/music/test_serializers.py        | 121 ++++++++++++++++
 api/tests/music/test_views.py              |  60 ++++++++
 api/tests/radios/test_api.py               |   4 +-
 14 files changed, 328 insertions(+), 132 deletions(-)
 create mode 100644 api/tests/music/test_serializers.py

diff --git a/api/funkwhale_api/favorites/serializers.py b/api/funkwhale_api/favorites/serializers.py
index 276b0f6bd..bb4538b2d 100644
--- a/api/funkwhale_api/favorites/serializers.py
+++ b/api/funkwhale_api/favorites/serializers.py
@@ -3,7 +3,6 @@ from django.conf import settings
 from rest_framework import serializers
 
 from funkwhale_api.activity import serializers as activity_serializers
-from funkwhale_api.music.serializers import TrackSerializerNested
 from funkwhale_api.music.serializers import TrackActivitySerializer
 from funkwhale_api.users.serializers import UserActivitySerializer
 
@@ -35,7 +34,6 @@ class TrackFavoriteActivitySerializer(activity_serializers.ModelSerializer):
 
 
 class UserTrackFavoriteSerializer(serializers.ModelSerializer):
-    # track = TrackSerializerNested(read_only=True)
     class Meta:
         model = models.TrackFavorite
         fields = ('id', 'track', 'creation_date')
diff --git a/api/funkwhale_api/history/serializers.py b/api/funkwhale_api/history/serializers.py
index f7333f243..572787ae0 100644
--- a/api/funkwhale_api/history/serializers.py
+++ b/api/funkwhale_api/history/serializers.py
@@ -1,7 +1,6 @@
 from rest_framework import serializers
 
 from funkwhale_api.activity import serializers as activity_serializers
-from funkwhale_api.music.serializers import TrackSerializerNested
 from funkwhale_api.music.serializers import TrackActivitySerializer
 from funkwhale_api.users.serializers import UserActivitySerializer
 
diff --git a/api/funkwhale_api/history/views.py b/api/funkwhale_api/history/views.py
index bea96a418..3da8b2a38 100644
--- a/api/funkwhale_api/history/views.py
+++ b/api/funkwhale_api/history/views.py
@@ -6,7 +6,6 @@ from rest_framework.decorators import detail_route
 
 from funkwhale_api.activity import record
 from funkwhale_api.common.permissions import ConditionalAuthentication
-from funkwhale_api.music.serializers import TrackSerializerNested
 
 from . import models
 from . import serializers
diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py
index 1259cc3c1..51ccec905 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -80,6 +80,12 @@ class ArtistQuerySet(models.QuerySet):
     def with_albums_count(self):
         return self.annotate(_albums_count=models.Count('albums'))
 
+    def with_albums(self):
+        return self.prefetch_related(
+            models.Prefetch(
+                'albums', queryset=Album.objects.with_tracks_count())
+        )
+
 
 class Artist(APIModelMixin):
     name = models.CharField(max_length=255)
diff --git a/api/funkwhale_api/music/serializers.py b/api/funkwhale_api/music/serializers.py
index d9d48496e..042646927 100644
--- a/api/funkwhale_api/music/serializers.py
+++ b/api/funkwhale_api/music/serializers.py
@@ -13,24 +13,38 @@ from . import models
 from . import tasks
 
 
-class TagSerializer(serializers.ModelSerializer):
+class ArtistAlbumSerializer(serializers.ModelSerializer):
+    tracks_count = serializers.SerializerMethodField()
+
     class Meta:
-        model = Tag
-        fields = ('id', 'name', 'slug')
+        model = models.Album
+        fields = (
+            'id',
+            'mbid',
+            'title',
+            'artist',
+            'release_date',
+            'cover',
+            'creation_date',
+            'tracks_count',
+        )
+
+    def get_tracks_count(self, o):
+        return o._tracks_count
 
 
-class SimpleArtistSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = models.Artist
-        fields = ('id', 'mbid', 'name', 'creation_date')
-
-
-class ArtistSerializer(serializers.ModelSerializer):
-    tags = TagSerializer(many=True, read_only=True)
+class ArtistWithAlbumsSerializer(serializers.ModelSerializer):
+    albums = ArtistAlbumSerializer(many=True, read_only=True)
 
     class Meta:
         model = models.Artist
-        fields = ('id', 'mbid', 'name', 'tags', 'creation_date')
+        fields = (
+            'id',
+            'mbid',
+            'name',
+            'creation_date',
+            'albums',
+        )
 
 
 class TrackFileSerializer(serializers.ModelSerializer):
@@ -62,71 +76,107 @@ class TrackFileSerializer(serializers.ModelSerializer):
         return url
 
 
-class SimpleAlbumSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = models.Album
-        fields = ('id', 'mbid', 'title', 'release_date', 'cover')
-
-
-class AlbumSerializer(serializers.ModelSerializer):
-    tags = TagSerializer(many=True, read_only=True)
-    class Meta:
-        model = models.Album
-        fields = ('id', 'mbid', 'title', 'cover', 'release_date', 'tags')
-
-
-class LyricsMixin(serializers.ModelSerializer):
-    lyrics = serializers.SerializerMethodField()
-
-    def get_lyrics(self, obj):
-        return obj.get_lyrics_url()
-
-
-class TrackSerializer(LyricsMixin):
+class AlbumTrackSerializer(serializers.ModelSerializer):
     files = TrackFileSerializer(many=True, read_only=True)
-    tags = TagSerializer(many=True, read_only=True)
+
     class Meta:
         model = models.Track
         fields = (
             'id',
             'mbid',
             'title',
+            'album',
             'artist',
+            'creation_date',
             'files',
-            'tags',
             'position',
-            'lyrics')
+        )
 
 
-class TrackSerializerNested(LyricsMixin):
-    artist = ArtistSerializer()
-    files = TrackFileSerializer(many=True, read_only=True)
-    album = SimpleAlbumSerializer(read_only=True)
-    tags = TagSerializer(many=True, read_only=True)
-
+class ArtistSimpleSerializer(serializers.ModelSerializer):
     class Meta:
-        model = models.Track
-        fields = ('id', 'mbid', 'title', 'artist', 'files', 'album', 'tags', 'lyrics')
+        model = models.Artist
+        fields = (
+            'id',
+            'mbid',
+            'name',
+            'creation_date',
+        )
 
 
-class AlbumSerializerNested(serializers.ModelSerializer):
-    tracks = TrackSerializer(many=True, read_only=True)
-    artist = SimpleArtistSerializer()
-    tags = TagSerializer(many=True, read_only=True)
+class AlbumSerializer(serializers.ModelSerializer):
+    tracks = serializers.SerializerMethodField()
+    artist = ArtistSimpleSerializer(read_only=True)
 
     class Meta:
         model = models.Album
-        fields = ('id', 'mbid', 'title', 'cover', 'artist', 'release_date', 'tracks', 'tags')
+        fields = (
+            'id',
+            'mbid',
+            'title',
+            'artist',
+            'tracks',
+            'release_date',
+            'cover',
+            'creation_date',
+        )
+
+    def get_tracks(self, o):
+        ordered_tracks = sorted(o.tracks.all(), key=lambda v: v.position)
+        return AlbumTrackSerializer(ordered_tracks, many=True).data
 
 
-class ArtistSerializerNested(serializers.ModelSerializer):
-    albums = AlbumSerializerNested(many=True, read_only=True)
-    tags = TagSerializer(many=True, read_only=True)
+class TrackAlbumSerializer(serializers.ModelSerializer):
+    artist = ArtistSimpleSerializer(read_only=True)
 
     class Meta:
-        model = models.Artist
-        fields = ('id', 'mbid', 'name', 'albums', 'tags')
+        model = models.Album
+        fields = (
+            'id',
+            'mbid',
+            'title',
+            'artist',
+            'release_date',
+            'cover',
+            'creation_date',
+        )
+
+
+class TrackSerializer(serializers.ModelSerializer):
+    files = TrackFileSerializer(many=True, read_only=True)
+    artist = ArtistSimpleSerializer(read_only=True)
+    album = TrackAlbumSerializer(read_only=True)
+    lyrics = serializers.SerializerMethodField()
+
+    class Meta:
+        model = models.Track
+        fields = (
+            'id',
+            'mbid',
+            'title',
+            'album',
+            'artist',
+            'creation_date',
+            'files',
+            'position',
+            'lyrics',
+        )
+
+    def get_lyrics(self, obj):
+        return obj.get_lyrics_url()
+
+
+class TagSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Tag
+        fields = ('id', 'name', 'slug')
+
+
+class SimpleAlbumSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = models.Album
+        fields = ('id', 'mbid', 'title', 'release_date', 'cover')
 
 
 class LyricsSerializer(serializers.ModelSerializer):
diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index e71d3555e..3a03a9227 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -68,13 +68,8 @@ class TagViewSetMixin(object):
 
 
 class ArtistViewSet(SearchMixin, viewsets.ReadOnlyModelViewSet):
-    queryset = (
-        models.Artist.objects.all()
-                             .prefetch_related(
-                                'albums__tracks__files',
-                                'albums__tracks__artist',
-                                'albums__tracks__tags'))
-    serializer_class = serializers.ArtistSerializerNested
+    queryset = models.Artist.objects.with_albums()
+    serializer_class = serializers.ArtistWithAlbumsSerializer
     permission_classes = [ConditionalAuthentication]
     search_fields = ['name__unaccent']
     filter_class = filters.ArtistFilter
@@ -88,7 +83,7 @@ class AlbumViewSet(SearchMixin, viewsets.ReadOnlyModelViewSet):
                             .select_related()
                             .prefetch_related('tracks__tags',
                                               'tracks__files'))
-    serializer_class = serializers.AlbumSerializerNested
+    serializer_class = serializers.AlbumSerializer
     permission_classes = [ConditionalAuthentication]
     search_fields = ['title__unaccent']
     ordering_fields = ('creation_date',)
@@ -166,7 +161,7 @@ class TrackViewSet(
     A simple ViewSet for viewing and editing accounts.
     """
     queryset = (models.Track.objects.all().for_nested_serialization())
-    serializer_class = serializers.TrackSerializerNested
+    serializer_class = serializers.TrackSerializer
     permission_classes = [ConditionalAuthentication]
     search_fields = ['title', 'artist__name']
     ordering_fields = (
@@ -370,10 +365,10 @@ class Search(views.APIView):
     def get(self, request, *args, **kwargs):
         query = request.GET['query']
         results = {
-            'tags': serializers.TagSerializer(self.get_tags(query), many=True).data,
-            'artists': serializers.ArtistSerializerNested(self.get_artists(query), many=True).data,
-            'tracks': serializers.TrackSerializerNested(self.get_tracks(query), many=True).data,
-            'albums': serializers.AlbumSerializerNested(self.get_albums(query), many=True).data,
+            # 'tags': serializers.TagSerializer(self.get_tags(query), many=True).data,
+            'artists': serializers.ArtistWithAlbumsSerializer(self.get_artists(query), many=True).data,
+            'tracks': serializers.TrackSerializer(self.get_tracks(query), many=True).data,
+            'albums': serializers.AlbumSerializer(self.get_albums(query), many=True).data,
         }
         return Response(results, status=200)
 
@@ -387,14 +382,10 @@ class Search(views.APIView):
         return (
             models.Track.objects.all()
                         .filter(query_obj)
-                        .select_related('album__artist')
-                        .prefetch_related(
-                            'tags',
-                            'artist__albums__tracks__tags',
-                            'files')
+                        .select_related('artist', 'album__artist')
+                        .prefetch_related('files')
         )[:self.max_results]
 
-
     def get_albums(self, query):
         search_fields = [
             'mbid',
@@ -406,27 +397,19 @@ class Search(views.APIView):
                         .filter(query_obj)
                         .select_related()
                         .prefetch_related(
-                            'tracks__tags',
                             'tracks__files',
-                            )
+                        )
         )[:self.max_results]
 
-
     def get_artists(self, query):
         search_fields = ['mbid', 'name__unaccent']
         query_obj = utils.get_query(query, search_fields)
         return (
             models.Artist.objects.all()
                          .filter(query_obj)
-                         .select_related()
-                         .prefetch_related(
-                             'albums__tracks__tags',
-                             'albums__tracks__files',
-                             )
-
+                         .with_albums()
         )[:self.max_results]
 
-
     def get_tags(self, query):
         search_fields = ['slug', 'name__unaccent']
         query_obj = utils.get_query(query, search_fields)
diff --git a/api/funkwhale_api/playlists/serializers.py b/api/funkwhale_api/playlists/serializers.py
index fcb2a412d..3f01fd689 100644
--- a/api/funkwhale_api/playlists/serializers.py
+++ b/api/funkwhale_api/playlists/serializers.py
@@ -5,13 +5,13 @@ from taggit.models import Tag
 
 from funkwhale_api.common import preferences
 from funkwhale_api.music.models import Track
-from funkwhale_api.music.serializers import TrackSerializerNested
+from funkwhale_api.music.serializers import TrackSerializer
 from funkwhale_api.users.serializers import UserBasicSerializer
 from . import models
 
 
 class PlaylistTrackSerializer(serializers.ModelSerializer):
-    track = TrackSerializerNested()
+    track = TrackSerializer()
 
     class Meta:
         model = models.PlaylistTrack
diff --git a/api/funkwhale_api/radios/serializers.py b/api/funkwhale_api/radios/serializers.py
index 195b382c9..8c59f8715 100644
--- a/api/funkwhale_api/radios/serializers.py
+++ b/api/funkwhale_api/radios/serializers.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from funkwhale_api.music.serializers import TrackSerializerNested
+from funkwhale_api.music.serializers import TrackSerializer
 from funkwhale_api.users.serializers import UserBasicSerializer
 
 from . import filters
@@ -46,7 +46,7 @@ class RadioSessionTrackSerializerCreate(serializers.ModelSerializer):
 
 
 class RadioSessionTrackSerializer(serializers.ModelSerializer):
-    track = TrackSerializerNested()
+    track = TrackSerializer()
 
     class Meta:
         model = models.RadioSessionTrack
diff --git a/api/funkwhale_api/radios/views.py b/api/funkwhale_api/radios/views.py
index 37c07c5e4..ca510b82c 100644
--- a/api/funkwhale_api/radios/views.py
+++ b/api/funkwhale_api/radios/views.py
@@ -7,7 +7,7 @@ from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.decorators import detail_route, list_route
 
-from funkwhale_api.music.serializers import TrackSerializerNested
+from funkwhale_api.music.serializers import TrackSerializer
 from funkwhale_api.common.permissions import ConditionalAuthentication
 
 from . import models
@@ -49,7 +49,7 @@ class RadioViewSet(
 
         page = self.paginate_queryset(tracks)
         if page is not None:
-            serializer = TrackSerializerNested(page, many=True)
+            serializer = TrackSerializer(page, many=True)
             return self.get_paginated_response(serializer.data)
 
     @list_route(methods=['get'])
@@ -72,7 +72,7 @@ class RadioViewSet(
             results = filters.test(f)
             if results['candidates']['sample']:
                 qs = results['candidates']['sample'].for_nested_serialization()
-                results['candidates']['sample'] = TrackSerializerNested(
+                results['candidates']['sample'] = TrackSerializer(
                     qs, many=True).data
             data['filters'].append(results)
 
diff --git a/api/tests/conftest.py b/api/tests/conftest.py
index b7a7d071a..d6b1c0204 100644
--- a/api/tests/conftest.py
+++ b/api/tests/conftest.py
@@ -1,3 +1,4 @@
+import datetime
 import factory
 import pytest
 import requests_mock
@@ -10,6 +11,7 @@ from django.test import client
 
 from dynamic_preferences.registries import global_preferences_registry
 
+from rest_framework import fields as rest_fields
 from rest_framework.test import APIClient
 from rest_framework.test import APIRequestFactory
 
@@ -233,3 +235,16 @@ def assert_user_permission():
         assert HasUserPermission in view.permission_classes
         assert set(view.required_permissions) == set(permissions)
     return inner
+
+
+@pytest.fixture
+def to_api_date():
+    def inner(value):
+        if isinstance(value, datetime.datetime):
+            f = rest_fields.DateTimeField()
+            return f.to_representation(value)
+        if isinstance(value, datetime.date):
+            f = rest_fields.DateField()
+            return f.to_representation(value)
+        raise ValueError('Invalid value: {}'.format(value))
+    return inner
diff --git a/api/tests/music/test_api.py b/api/tests/music/test_api.py
index 53ee29f3e..7aa20e626 100644
--- a/api/tests/music/test_api.py
+++ b/api/tests/music/test_api.py
@@ -223,41 +223,6 @@ def test_user_can_create_import_job_with_file(
         import_job_id=job.pk)
 
 
-def test_can_search_artist(factories, logged_in_client):
-    artist1 = factories['music.Artist']()
-    artist2 = factories['music.Artist']()
-    expected = [serializers.ArtistSerializerNested(artist1).data]
-    url = reverse('api:v1:artists-search')
-    response = logged_in_client.get(url, {'query': artist1.name})
-    assert response.data == expected
-
-
-def test_can_search_artist_by_name_start(factories, logged_in_client):
-    artist1 = factories['music.Artist'](name='alpha')
-    artist2 = factories['music.Artist'](name='beta')
-    expected = {
-        'next': None,
-        'previous': None,
-        'count': 1,
-        'results': [serializers.ArtistSerializerNested(artist1).data]
-    }
-    url = reverse('api:v1:artists-list')
-    response = logged_in_client.get(url, {'name__startswith': 'a'})
-
-    assert expected == response.data
-
-
-def test_can_search_tracks(factories, logged_in_client):
-    track1 = factories['music.Track'](title="test track 1")
-    track2 = factories['music.Track']()
-    query = 'test track 1'
-    expected = [serializers.TrackSerializerNested(track1).data]
-    url = reverse('api:v1:tracks-search')
-    response = logged_in_client.get(url, {'query': query})
-
-    assert expected == response.data
-
-
 @pytest.mark.parametrize('route,method', [
     ('api:v1:tags-list', 'get'),
     ('api:v1:tracks-list', 'get'),
diff --git a/api/tests/music/test_serializers.py b/api/tests/music/test_serializers.py
new file mode 100644
index 000000000..fa22cecee
--- /dev/null
+++ b/api/tests/music/test_serializers.py
@@ -0,0 +1,121 @@
+from funkwhale_api.music import serializers
+
+
+def test_artist_album_serializer(factories, to_api_date):
+    track = factories['music.Track']()
+    album = track.album
+    album = album.__class__.objects.with_tracks_count().get(pk=album.pk)
+    expected = {
+        'id': album.id,
+        'mbid': str(album.mbid),
+        'title': album.title,
+        'artist': album.artist.id,
+        'creation_date': to_api_date(album.creation_date),
+        'tracks_count': 1,
+        'cover': album.cover.url,
+        'release_date': to_api_date(album.release_date),
+    }
+    serializer = serializers.ArtistAlbumSerializer(album)
+
+    assert serializer.data == expected
+
+
+def test_artist_with_albums_serializer(factories, to_api_date):
+    track = factories['music.Track']()
+    artist = track.artist
+    artist = artist.__class__.objects.with_albums().get(pk=artist.pk)
+    album = list(artist.albums.all())[0]
+
+    expected = {
+        'id': artist.id,
+        'mbid': str(artist.mbid),
+        'name': artist.name,
+        'creation_date': to_api_date(artist.creation_date),
+        'albums': [
+            serializers.ArtistAlbumSerializer(album).data
+        ]
+    }
+    serializer = serializers.ArtistWithAlbumsSerializer(artist)
+    assert serializer.data == expected
+
+
+def test_album_track_serializer(factories, to_api_date):
+    tf = factories['music.TrackFile']()
+    track = tf.track
+
+    expected = {
+        'id': track.id,
+        'artist': track.artist.id,
+        'album': track.album.id,
+        'mbid': str(track.mbid),
+        'title': track.title,
+        'position': track.position,
+        'creation_date': to_api_date(track.creation_date),
+        'files': [
+            serializers.TrackFileSerializer(tf).data
+        ]
+    }
+    serializer = serializers.AlbumTrackSerializer(track)
+    assert serializer.data == expected
+
+
+def test_track_file_serializer(factories, to_api_date):
+    tf = factories['music.TrackFile']()
+
+    expected = {
+        'id': tf.id,
+        'path': tf.path,
+        'source': tf.source,
+        'filename': tf.filename,
+        'mimetype': tf.mimetype,
+        'track': tf.track.pk,
+        'duration': tf.duration,
+        'mimetype': tf.mimetype,
+        'bitrate': tf.bitrate,
+        'size': tf.size,
+    }
+    serializer = serializers.TrackFileSerializer(tf)
+    assert serializer.data == expected
+
+
+def test_album_serializer(factories, to_api_date):
+    track1 = factories['music.Track'](position=2)
+    track2 = factories['music.Track'](position=1, album=track1.album)
+    album = track1.album
+    expected = {
+        'id': album.id,
+        'mbid': str(album.mbid),
+        'title': album.title,
+        'artist': serializers.ArtistSimpleSerializer(album.artist).data,
+        'creation_date': to_api_date(album.creation_date),
+        'cover': album.cover.url,
+        'release_date': to_api_date(album.release_date),
+        'tracks': serializers.AlbumTrackSerializer(
+            [track2, track1],
+            many=True
+        ).data
+    }
+    serializer = serializers.AlbumSerializer(album)
+
+    assert serializer.data == expected
+
+
+def test_track_serializer(factories, to_api_date):
+    tf = factories['music.TrackFile']()
+    track = tf.track
+
+    expected = {
+        'id': track.id,
+        'artist': serializers.ArtistSimpleSerializer(track.artist).data,
+        'album': serializers.TrackAlbumSerializer(track.album).data,
+        'mbid': str(track.mbid),
+        'title': track.title,
+        'position': track.position,
+        'creation_date': to_api_date(track.creation_date),
+        'lyrics': track.get_lyrics_url(),
+        'files': [
+            serializers.TrackFileSerializer(tf).data
+        ]
+    }
+    serializer = serializers.TrackSerializer(track)
+    assert serializer.data == expected
diff --git a/api/tests/music/test_views.py b/api/tests/music/test_views.py
index 030fc3a73..38366442f 100644
--- a/api/tests/music/test_views.py
+++ b/api/tests/music/test_views.py
@@ -4,6 +4,7 @@ import pytest
 from django.urls import reverse
 from django.utils import timezone
 
+from funkwhale_api.music import serializers
 from funkwhale_api.music import views
 from funkwhale_api.federation import actors
 
@@ -16,6 +17,65 @@ def test_permissions(assert_user_permission, view, permissions):
     assert_user_permission(view, permissions)
 
 
+def test_artist_list_serializer(api_request, factories, logged_in_api_client):
+    track = factories['music.Track']()
+    artist = track.artist
+    request = api_request.get('/')
+    qs = artist.__class__.objects.with_albums()
+    serializer = serializers.ArtistWithAlbumsSerializer(
+        qs, many=True, context={'request': request})
+    expected = {
+        'count': 1,
+        'next': None,
+        'previous': None,
+        'results': serializer.data
+    }
+    url = reverse('api:v1:artists-list')
+    response = logged_in_api_client.get(url)
+
+    assert response.status_code == 200
+    assert response.data == expected
+
+
+def test_album_list_serializer(api_request, factories, logged_in_api_client):
+    track = factories['music.Track']()
+    album = track.album
+    request = api_request.get('/')
+    qs = album.__class__.objects.all()
+    serializer = serializers.AlbumSerializer(
+        qs, many=True, context={'request': request})
+    expected = {
+        'count': 1,
+        'next': None,
+        'previous': None,
+        'results': serializer.data
+    }
+    url = reverse('api:v1:albums-list')
+    response = logged_in_api_client.get(url)
+
+    assert response.status_code == 200
+    assert response.data == expected
+
+
+def test_track_list_serializer(api_request, factories, logged_in_api_client):
+    track = factories['music.Track']()
+    request = api_request.get('/')
+    qs = track.__class__.objects.all()
+    serializer = serializers.TrackSerializer(
+        qs, many=True, context={'request': request})
+    expected = {
+        'count': 1,
+        'next': None,
+        'previous': None,
+        'results': serializer.data
+    }
+    url = reverse('api:v1:tracks-list')
+    response = logged_in_api_client.get(url)
+
+    assert response.status_code == 200
+    assert response.data == expected
+
+
 @pytest.mark.parametrize('param,expected', [
     ('true', 'full'),
     ('false', 'empty'),
diff --git a/api/tests/radios/test_api.py b/api/tests/radios/test_api.py
index 25c099014..66bf6052d 100644
--- a/api/tests/radios/test_api.py
+++ b/api/tests/radios/test_api.py
@@ -3,7 +3,7 @@ import pytest
 
 from django.urls import reverse
 
-from funkwhale_api.music.serializers import TrackSerializerNested
+from funkwhale_api.music.serializers import TrackSerializer
 from funkwhale_api.radios import filters
 from funkwhale_api.radios import serializers
 
@@ -43,7 +43,7 @@ def test_can_validate_config(logged_in_client, factories):
 
     expected = {
         'count': candidates.count(),
-        'sample': TrackSerializerNested(candidates, many=True).data
+        'sample': TrackSerializer(candidates, many=True).data
     }
     assert payload['filters'][0]['candidates'] == expected
     assert payload['filters'][0]['errors'] == []

From a8baf8fa67ba28c50f4c0542bc3612a6256d1a4b Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 22 May 2018 22:22:53 +0200
Subject: [PATCH 08/57] See #224: updated front-end with new music API

---
 api/funkwhale_api/music/filters.py            | 34 ++++++++++++++++++-
 api/funkwhale_api/music/models.py             |  7 ++--
 api/funkwhale_api/music/serializers.py        |  5 ++-
 api/funkwhale_api/music/views.py              | 33 ++++++------------
 api/funkwhale_api/radios/filters.py           |  4 +--
 api/funkwhale_api/requests/views.py           |  4 ---
 front/src/components/audio/PlayButton.vue     | 28 +++++++++++----
 front/src/components/audio/artist/Card.vue    | 15 ++------
 front/src/components/library/Artist.vue       | 28 ++++++++-------
 front/src/components/library/Artists.vue      |  8 -----
 front/src/components/library/Home.vue         |  8 -----
 .../src/components/library/radios/Builder.vue |  2 +-
 .../src/components/library/radios/Filter.vue  |  2 +-
 13 files changed, 94 insertions(+), 84 deletions(-)

diff --git a/api/funkwhale_api/music/filters.py b/api/funkwhale_api/music/filters.py
index 6da9cca63..dc7aafc21 100644
--- a/api/funkwhale_api/music/filters.py
+++ b/api/funkwhale_api/music/filters.py
@@ -32,6 +32,33 @@ class ArtistFilter(ListenableMixin):
         }
 
 
+class TrackFilter(filters.FilterSet):
+    q = fields.SearchFilter(search_fields=[
+        'title',
+        'album__title',
+        'artist__name',
+    ])
+    listenable = filters.BooleanFilter(name='_', method='filter_listenable')
+
+    class Meta:
+        model = models.Track
+        fields = {
+            'title': ['exact', 'iexact', 'startswith', 'icontains'],
+            'listenable': ['exact'],
+            'artist': ['exact'],
+            'album': ['exact'],
+        }
+
+    def filter_listenable(self, queryset, name, value):
+        queryset = queryset.annotate(
+            files_count=Count('files')
+        )
+        if value:
+            return queryset.filter(files_count__gt=0)
+        else:
+            return queryset.filter(files_count=0)
+
+
 class ImportBatchFilter(filters.FilterSet):
     q = fields.SearchFilter(search_fields=[
         'submitted_by__username',
@@ -67,7 +94,12 @@ class ImportJobFilter(filters.FilterSet):
 
 class AlbumFilter(ListenableMixin):
     listenable = filters.BooleanFilter(name='_', method='filter_listenable')
+    q = fields.SearchFilter(search_fields=[
+        'title',
+        'artist__name'
+        'source',
+    ])
 
     class Meta:
         model = models.Album
-        fields = ['listenable']
+        fields = ['listenable', 'q', 'artist']
diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py
index 51ccec905..51ece7d7b 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -319,11 +319,8 @@ class Lyrics(models.Model):
 class TrackQuerySet(models.QuerySet):
     def for_nested_serialization(self):
         return (self.select_related()
-                    .select_related('album__artist')
-                    .prefetch_related(
-                        'tags',
-                        'files',
-                        'artist__albums__tracks__tags'))
+                    .select_related('album__artist', 'artist')
+                    .prefetch_related('files'))
 
 
 class Track(APIModelMixin):
diff --git a/api/funkwhale_api/music/serializers.py b/api/funkwhale_api/music/serializers.py
index 042646927..c77983a40 100644
--- a/api/funkwhale_api/music/serializers.py
+++ b/api/funkwhale_api/music/serializers.py
@@ -122,7 +122,10 @@ class AlbumSerializer(serializers.ModelSerializer):
         )
 
     def get_tracks(self, o):
-        ordered_tracks = sorted(o.tracks.all(), key=lambda v: v.position)
+        ordered_tracks = sorted(
+            o.tracks.all(),
+            key=lambda v: (v.position, v.title) if v.position else (99999, v.title)
+        )
         return AlbumTrackSerializer(ordered_tracks, many=True).data
 
 
diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index 3a03a9227..24a9cbbcd 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -46,17 +46,6 @@ from . import utils
 logger = logging.getLogger(__name__)
 
 
-class SearchMixin(object):
-    search_fields = []
-
-    @list_route(methods=['get'])
-    def search(self, request, *args, **kwargs):
-        query = utils.get_query(request.GET['query'], self.search_fields)
-        queryset = self.get_queryset().filter(query)
-        serializer = self.serializer_class(queryset, many=True)
-        return Response(serializer.data)
-
-
 class TagViewSetMixin(object):
 
     def get_queryset(self):
@@ -67,26 +56,25 @@ class TagViewSetMixin(object):
         return queryset
 
 
-class ArtistViewSet(SearchMixin, viewsets.ReadOnlyModelViewSet):
+class ArtistViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = models.Artist.objects.with_albums()
     serializer_class = serializers.ArtistWithAlbumsSerializer
     permission_classes = [ConditionalAuthentication]
-    search_fields = ['name__unaccent']
     filter_class = filters.ArtistFilter
     ordering_fields = ('id', 'name', 'creation_date')
 
 
-class AlbumViewSet(SearchMixin, viewsets.ReadOnlyModelViewSet):
+class AlbumViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = (
         models.Album.objects.all()
-                            .order_by('-creation_date')
+                            .order_by('artist', 'release_date')
                             .select_related()
-                            .prefetch_related('tracks__tags',
-                                              'tracks__files'))
+                            .prefetch_related(
+                                'tracks__artist',
+                                'tracks__files'))
     serializer_class = serializers.AlbumSerializer
     permission_classes = [ConditionalAuthentication]
-    search_fields = ['title__unaccent']
-    ordering_fields = ('creation_date',)
+    ordering_fields = ('creation_date', 'release_date', 'title')
     filter_class = filters.AlbumFilter
 
 
@@ -155,19 +143,20 @@ class ImportJobViewSet(
         )
 
 
-class TrackViewSet(
-        TagViewSetMixin, SearchMixin, viewsets.ReadOnlyModelViewSet):
+class TrackViewSet(TagViewSetMixin, viewsets.ReadOnlyModelViewSet):
     """
     A simple ViewSet for viewing and editing accounts.
     """
     queryset = (models.Track.objects.all().for_nested_serialization())
     serializer_class = serializers.TrackSerializer
     permission_classes = [ConditionalAuthentication]
-    search_fields = ['title', 'artist__name']
+    filter_class = filters.TrackFilter
     ordering_fields = (
         'creation_date',
         'title__unaccent',
         'album__title__unaccent',
+        'album__release_date',
+        'position',
         'artist__name__unaccent',
     )
 
diff --git a/api/funkwhale_api/radios/filters.py b/api/funkwhale_api/radios/filters.py
index 344a4dabf..d0d338d66 100644
--- a/api/funkwhale_api/radios/filters.py
+++ b/api/funkwhale_api/radios/filters.py
@@ -144,8 +144,8 @@ class ArtistFilter(RadioFilter):
             'name': 'ids',
             'type': 'list',
             'subtype': 'number',
-            'autocomplete': reverse_lazy('api:v1:artists-search'),
-            'autocomplete_qs': 'query={query}',
+            'autocomplete': reverse_lazy('api:v1:artists-list'),
+            'autocomplete_qs': 'q={query}',
             'autocomplete_fields': {'name': 'name', 'value': 'id'},
             'label': 'Artist',
             'placeholder': 'Select artists'
diff --git a/api/funkwhale_api/requests/views.py b/api/funkwhale_api/requests/views.py
index 395fac66c..6553f3316 100644
--- a/api/funkwhale_api/requests/views.py
+++ b/api/funkwhale_api/requests/views.py
@@ -3,15 +3,12 @@ from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.decorators import detail_route
 
-from funkwhale_api.music.views import SearchMixin
-
 from . import filters
 from . import models
 from . import serializers
 
 
 class ImportRequestViewSet(
-        SearchMixin,
         mixins.CreateModelMixin,
         mixins.RetrieveModelMixin,
         mixins.ListModelMixin,
@@ -22,7 +19,6 @@ class ImportRequestViewSet(
         models.ImportRequest.objects.all()
               .select_related()
               .order_by('-creation_date'))
-    search_fields = ['artist_name', 'album_name', 'comment']
     filter_class = filters.ImportRequestFilter
     ordering_fields = ('id', 'artist_name', 'creation_date', 'status')
 
diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue
index efa59a29d..6fc769969 100644
--- a/front/src/components/audio/PlayButton.vue
+++ b/front/src/components/audio/PlayButton.vue
@@ -21,7 +21,6 @@
 
 <script>
 import axios from 'axios'
-import logger from '@/logging'
 import jQuery from 'jquery'
 
 export default {
@@ -30,18 +29,15 @@ export default {
     tracks: {type: Array, required: false},
     track: {type: Object, required: false},
     playlist: {type: Object, required: false},
-    discrete: {type: Boolean, default: false}
+    discrete: {type: Boolean, default: false},
+    artist: {type: Number, required: false},
+    album: {type: Number, required: false}
   },
   data () {
     return {
       isLoading: false
     }
   },
-  created () {
-    if (!this.playlist && !this.track && !this.tracks) {
-      logger.default.error('You have to provide either a track playlist or tracks property')
-    }
-  },
   mounted () {
     jQuery(this.$el).find('.ui.dropdown').dropdown()
   },
@@ -62,6 +58,10 @@ export default {
         return this.tracks.length > 0
       } else if (this.playlist) {
         return true
+      } else if (this.artist) {
+        return true
+      } else if (this.album) {
+        return true
       }
       return false
     }
@@ -81,6 +81,20 @@ export default {
               return plt.track
             }))
           })
+        } else if (self.artist) {
+          let params = {
+            params: {'artist': self.artist, 'ordering': 'album__release_date,position'}
+          }
+          axios.get('tracks', params).then((response) => {
+            resolve(response.data.results)
+          })
+        } else if (self.album) {
+          let params = {
+            params: {'album': self.album, 'ordering': 'position'}
+          }
+          axios.get('tracks', params).then((response) => {
+            resolve(response.data.results)
+          })
         }
       })
       return getTracks.then((tracks) => {
diff --git a/front/src/components/audio/artist/Card.vue b/front/src/components/audio/artist/Card.vue
index 3ad6fb1c6..a46506791 100644
--- a/front/src/components/audio/artist/Card.vue
+++ b/front/src/components/audio/artist/Card.vue
@@ -18,10 +18,10 @@
                   <router-link class="discrete link":to="{name: 'library.albums.detail', params: {id: album.id }}">
                     <strong>{{ album.title }}</strong>
                   </router-link><br />
-                  {{ album.tracks.length }} tracks
+                  {{ album.tracks_count }} tracks
                 </td>
                 <td>
-                  <play-button class="right floated basic icon" :discrete="true" :tracks="album.tracks"></play-button>
+                  <play-button class="right floated basic icon" :discrete="true" :album="album.id"></play-button>
                 </td>
               </tr>
             </tbody>
@@ -45,7 +45,7 @@
             {{ artist.albums.length }}
           </i18next>
         </span>
-        <play-button class="mini basic orange right floated" :tracks="allTracks">
+        <play-button class="mini basic orange right floated" :artist="artist.id">
           <i18next path="Play all"/>
         </play-button>
       </div>
@@ -74,15 +74,6 @@ export default {
         return this.artist.albums
       }
       return this.artist.albums.slice(0, this.initialAlbums)
-    },
-    allTracks () {
-      let tracks = []
-      this.artist.albums.forEach(album => {
-        album.tracks.forEach(track => {
-          tracks.push(track)
-        })
-      })
-      return tracks
     }
   }
 }
diff --git a/front/src/components/library/Artist.vue b/front/src/components/library/Artist.vue
index e16cb6587..7d0a41d89 100644
--- a/front/src/components/library/Artist.vue
+++ b/front/src/components/library/Artist.vue
@@ -10,7 +10,7 @@
             <i class="circular inverted users violet icon"></i>
             <div class="content">
               {{ artist.name }}
-              <div class="sub header">
+              <div class="sub header" v-if="albums">
                 {{ $t('{% track_count %} tracks in {% album_count %} albums', {track_count: totalTracks, album_count: albums.length})}}
               </div>
             </div>
@@ -18,7 +18,7 @@
           <div class="ui hidden divider"></div>
           <radio-button type="artist" :object-id="artist.id"></radio-button>
           </button>
-          <play-button class="orange" :tracks="allTracks"><i18next path="Play all albums"/></play-button>
+          <play-button class="orange" :artist="artist.id"><i18next path="Play all albums"/></play-button>
 
           <a :href="wikipediaUrl" target="_blank" class="ui button">
             <i class="wikipedia icon"></i>
@@ -30,10 +30,13 @@
           </a>
         </div>
       </div>
-      <div class="ui vertical stripe segment">
+      <div v-if="isLoadingAlbums" class="ui vertical stripe segment">
+        <div :class="['ui', 'centered', 'active', 'inline', 'loader']"></div>
+      </div>
+      <div v-else-if="albums" class="ui vertical stripe segment">
         <h2><i18next path="Albums by this artist"/></h2>
         <div class="ui stackable doubling three column grid">
-          <div class="column" :key="album.id" v-for="album in sortedAlbums">
+          <div class="column" :key="album.id" v-for="album in albums">
             <album-card :mode="'rich'" class="fluid" :album="album"></album-card>
           </div>
         </div>
@@ -43,7 +46,6 @@
 </template>
 
 <script>
-import _ from 'lodash'
 import axios from 'axios'
 import logger from '@/logging'
 import backend from '@/audio/backend'
@@ -63,6 +65,7 @@ export default {
   data () {
     return {
       isLoading: true,
+      isLoadingAlbums: true,
       artist: null,
       albums: null
     }
@@ -78,18 +81,19 @@ export default {
       logger.default.debug('Fetching artist "' + this.id + '"')
       axios.get(url).then((response) => {
         self.artist = response.data
-        self.albums = JSON.parse(JSON.stringify(self.artist.albums)).map((album) => {
-          return backend.Album.clean(album)
-        })
         self.isLoading = false
+        self.isLoadingAlbums = true
+        axios.get('albums/', {params: {artist: this.id, ordering: '-release_date'}}).then((response) => {
+          self.albums = JSON.parse(JSON.stringify(response.data.results)).map((album) => {
+            return backend.Album.clean(album)
+          })
+
+          self.isLoadingAlbums = false
+        })
       })
     }
   },
   computed: {
-    sortedAlbums () {
-      let a = this.albums || []
-      return _.orderBy(a, ['release_date'], ['asc'])
-    },
     totalTracks () {
       return this.albums.map((album) => {
         return album.tracks.length
diff --git a/front/src/components/library/Artists.vue b/front/src/components/library/Artists.vue
index 0811f0aa7..aafa3a160 100644
--- a/front/src/components/library/Artists.vue
+++ b/front/src/components/library/Artists.vue
@@ -69,7 +69,6 @@ import axios from 'axios'
 import _ from 'lodash'
 import $ from 'jquery'
 
-import backend from '@/audio/backend'
 import logger from '@/logging'
 
 import OrderingMixin from '@/components/mixins/Ordering'
@@ -135,13 +134,6 @@ export default {
       logger.default.debug('Fetching artists')
       axios.get(url, {params: params}).then((response) => {
         self.result = response.data
-        self.result.results.map((artist) => {
-          var albums = JSON.parse(JSON.stringify(artist.albums)).map((album) => {
-            return backend.Album.clean(album)
-          })
-          artist.albums = albums
-          return artist
-        })
         self.isLoading = false
       })
     }, 500),
diff --git a/front/src/components/library/Home.vue b/front/src/components/library/Home.vue
index e69ecea80..2be693fab 100644
--- a/front/src/components/library/Home.vue
+++ b/front/src/components/library/Home.vue
@@ -30,7 +30,6 @@
 <script>
 import axios from 'axios'
 import Search from '@/components/audio/Search'
-import backend from '@/audio/backend'
 import logger from '@/logging'
 import ArtistCard from '@/components/audio/artist/Card'
 import RadioCard from '@/components/radios/Card'
@@ -66,13 +65,6 @@ export default {
       logger.default.time('Loading latest artists')
       axios.get(url, {params: params}).then((response) => {
         self.artists = response.data.results
-        self.artists.map((artist) => {
-          var albums = JSON.parse(JSON.stringify(artist.albums)).map((album) => {
-            return backend.Album.clean(album)
-          })
-          artist.albums = albums
-          return artist
-        })
         logger.default.timeEnd('Loading latest artists')
         self.isLoadingArtists = false
       })
diff --git a/front/src/components/library/radios/Builder.vue b/front/src/components/library/radios/Builder.vue
index 85642b0a1..6c81f532f 100644
--- a/front/src/components/library/radios/Builder.vue
+++ b/front/src/components/library/radios/Builder.vue
@@ -14,7 +14,7 @@
               <input id="public" type="checkbox" v-model="isPublic" />
               <i18next tag="label" for="public" path="Display publicly"/>
             </div>
-            <button :disabled="!canSave" @click="save" class="ui green button"><i18ext path="Save"/></button>
+            <button :disabled="!canSave" @click="save" class="ui green button"><i18next path="Save"/></button>
             <radio-button v-if="id" type="custom" :custom-radio-id="id"></radio-button>
           </div>
         </div>
diff --git a/front/src/components/library/radios/Filter.vue b/front/src/components/library/radios/Filter.vue
index c7f981ede..b27c36077 100644
--- a/front/src/components/library/radios/Filter.vue
+++ b/front/src/components/library/radios/Filter.vue
@@ -123,7 +123,7 @@ export default {
             if (settings.fields.remoteValues) {
               return initialResponse
             }
-            return {results: initialResponse}
+            return {results: initialResponse.results}
           }
         }
       }

From 7b03ddbb28ebf7d38eeb079223228f31f860b1ea Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 22 May 2018 22:57:20 +0200
Subject: [PATCH 09/57] Fix #224 and #226: changelog and documentation

---
 changes/changelog.d/224.enhancement | 30 +++++++++++++++++++++++++++++
 changes/changelog.d/226.bugfix      |  1 +
 dev.yml                             |  2 +-
 docs/swagger.yml                    | 16 +++++++--------
 4 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 changes/changelog.d/224.enhancement
 create mode 100644 changes/changelog.d/226.bugfix

diff --git a/changes/changelog.d/224.enhancement b/changes/changelog.d/224.enhancement
new file mode 100644
index 000000000..43c2e88c0
--- /dev/null
+++ b/changes/changelog.d/224.enhancement
@@ -0,0 +1,30 @@
+Retructured music API to increase performance and remove useless endpoints (#224)
+
+Music API changes
+^^^^^^^^^^^^^^^^^
+
+This release includes an API break. Even though the API is advertised
+as unstable, and not documented, here is a brief explanation of the change in
+case you are using the API in a client or in a script. Summary of the changes:
+
+- ``/api/v1/artists`` does not includes a list of tracks anymore. It was to heavy
+  to return all of this data all the time. You can get all tracks for an
+  artist using ``/api/v1/tracks?artist=artist_id``
+- Additionally, ``/api/v1/tracks`` now support an ``album`` filter to filter
+  tracks matching an album
+- ``/api/v1/artists/search``, ``/api/v1/albums/search`` and ``/api/v1/tracks/search``
+  endpoints are removed. Use ``/api/v1/{artists|albums|tracks}/?q=yourquery``
+  instead. It's also more powerful, since you can combine search with other
+  filters and ordering options.
+- ``/api/v1/requests/import-requests/search`` endpoint is removed as well.
+  Use ``/api/v1/requests/import-requests/?q=yourquery``
+  instead. It's also more powerful, since you can combine search with other
+  filters and ordering options.
+
+Of course, the front-end was updated to work with the new API, so this should
+not impact end-users in any way, apart from slight performance gains.
+
+.. note::
+
+    The API is still not stable and may evolve again in the future. API freeze
+    will come at a later point.
diff --git a/changes/changelog.d/226.bugfix b/changes/changelog.d/226.bugfix
new file mode 100644
index 000000000..18d448c23
--- /dev/null
+++ b/changes/changelog.d/226.bugfix
@@ -0,0 +1 @@
+Empty save button in radio builder (#226)
diff --git a/dev.yml b/dev.yml
index e85ce3b91..5dccfeca3 100644
--- a/dev.yml
+++ b/dev.yml
@@ -130,7 +130,7 @@ services:
     ports:
       - '8002:8080'
     volumes:
-      - "./api/docs/swagger.yml:/usr/share/nginx/html/swagger.yml"
+      - "./docs/swagger.yml:/usr/share/nginx/html/swagger.yml"
 
 networks:
   internal:
diff --git a/docs/swagger.yml b/docs/swagger.yml
index 7735a8f20..71c74e442 100644
--- a/docs/swagger.yml
+++ b/docs/swagger.yml
@@ -78,7 +78,7 @@ paths:
                   results:
                     type: "array"
                     items:
-                      $ref: "#/definitions/ArtistNested"
+                      $ref: "#/definitions/ArtistWithAlbums"
 
 properties:
   resultsCount:
@@ -106,7 +106,7 @@ definitions:
       creation_date:
         type: "string"
         format: "date-time"
-  ArtistNested:
+  ArtistWithAlbums:
     type: "object"
     allOf:
       - $ref: "#/definitions/Artist"
@@ -115,7 +115,7 @@ definitions:
           albums:
             type: "array"
             items:
-              $ref: "#/definitions/AlbumNested"
+              $ref: "#/definitions/ArtistAlbum"
 
   Album:
     type: "object"
@@ -143,16 +143,16 @@ definitions:
         format: "date"
         example: "2001-01-01"
 
-  AlbumNested:
+  ArtistAlbum:
     type: "object"
     allOf:
       - $ref: "#/definitions/Album"
       - type: "object"
         properties:
-          tracks:
-            type: "array"
-            items:
-              $ref: "#/definitions/Track"
+          tracks_count:
+            type: "integer"
+            format: "int64"
+            example: 16
 
   Track:
     type: "object"

From 47cc2a3920fecca516f2c8002388a0adf6da940e Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 22 May 2018 23:30:37 +0200
Subject: [PATCH 10/57] Fix #179: fixed broken ordering in front-end lists

---
 api/funkwhale_api/music/views.py               | 6 +++---
 changes/changelog.d/179.bugfix                 | 1 +
 front/src/components/favorites/List.vue        | 7 ++++---
 front/src/components/library/Artists.vue       | 4 ++--
 front/src/components/library/Radios.vue        | 4 ++--
 front/src/components/mixins/Ordering.vue       | 8 ++++++--
 front/src/components/requests/RequestsList.vue | 4 ++--
 front/src/views/federation/LibraryList.vue     | 4 ++--
 front/src/views/playlists/List.vue             | 4 ++--
 9 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 changes/changelog.d/179.bugfix

diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index 24a9cbbcd..5e3a7a4c1 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -153,11 +153,11 @@ class TrackViewSet(TagViewSetMixin, viewsets.ReadOnlyModelViewSet):
     filter_class = filters.TrackFilter
     ordering_fields = (
         'creation_date',
-        'title__unaccent',
-        'album__title__unaccent',
+        'title',
+        'album__title',
         'album__release_date',
         'position',
-        'artist__name__unaccent',
+        'artist__name',
     )
 
     def get_queryset(self):
diff --git a/changes/changelog.d/179.bugfix b/changes/changelog.d/179.bugfix
new file mode 100644
index 000000000..ac6c489e2
--- /dev/null
+++ b/changes/changelog.d/179.bugfix
@@ -0,0 +1 @@
+Fixed broken ordering in front-end lists (#179)
diff --git a/front/src/components/favorites/List.vue b/front/src/components/favorites/List.vue
index d189f2b85..120aae2a9 100644
--- a/front/src/components/favorites/List.vue
+++ b/front/src/components/favorites/List.vue
@@ -26,7 +26,7 @@
           <div class="field">
             <i18next tag="label" path="Ordering direction"/>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value=""><i18next path="Ascending"/></option>
+              <option value="+"><i18next path="Ascending"/></option>
               <option value="-"><i18next path="Descending"/></option>
             </select>
           </div>
@@ -74,7 +74,7 @@ export default {
     Pagination
   },
   data () {
-    let defaultOrdering = this.getOrderingFromString(this.defaultOrdering || 'artist__name')
+    let defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
     return {
       results: null,
       isLoading: false,
@@ -82,9 +82,10 @@ export default {
       previousLink: null,
       page: parseInt(this.defaultPage),
       paginateBy: parseInt(this.defaultPaginateBy || 25),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
+        ['creation_date', 'Creation date'],
         ['title', 'Track name'],
         ['album__title', 'Album name'],
         ['artist__name', 'Artist name']
diff --git a/front/src/components/library/Artists.vue b/front/src/components/library/Artists.vue
index aafa3a160..9f324eef3 100644
--- a/front/src/components/library/Artists.vue
+++ b/front/src/components/library/Artists.vue
@@ -19,7 +19,7 @@
           <div class="field">
             <i18next tag="label" path="Ordering direction"/>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value="">Ascending</option>
+              <option value="+">Ascending</option>
               <option value="-">Descending</option>
             </select>
           </div>
@@ -95,7 +95,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 12),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
         ['creation_date', 'Creation date'],
diff --git a/front/src/components/library/Radios.vue b/front/src/components/library/Radios.vue
index 9fcadf0a6..794e3a13b 100644
--- a/front/src/components/library/Radios.vue
+++ b/front/src/components/library/Radios.vue
@@ -23,7 +23,7 @@
           <div class="field">
             <i18next tag="label" path="Ordering direction"/>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value=""><i18next path="Ascending"/></option>
+              <option value="+"><i18next path="Ascending"/></option>
               <option value="-"><i18next path="Descending"/></option>
             </select>
           </div>
@@ -99,7 +99,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 12),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
         ['creation_date', 'Creation date'],
diff --git a/front/src/components/mixins/Ordering.vue b/front/src/components/mixins/Ordering.vue
index 494dddcee..6235fd7d0 100644
--- a/front/src/components/mixins/Ordering.vue
+++ b/front/src/components/mixins/Ordering.vue
@@ -13,13 +13,17 @@ export default {
         }
       } else {
         return {
-          direction: '',
+          direction: '+',
           field: s
         }
       }
     },
     getOrderingAsString () {
-      return [this.orderingDirection, this.ordering].join('')
+      let direction = this.orderingDirection
+      if (direction === '+') {
+        direction = ''
+      }
+      return [direction, this.ordering].join('')
     }
   }
 }
diff --git a/front/src/components/requests/RequestsList.vue b/front/src/components/requests/RequestsList.vue
index 130214c3a..58b7f5fa9 100644
--- a/front/src/components/requests/RequestsList.vue
+++ b/front/src/components/requests/RequestsList.vue
@@ -29,7 +29,7 @@
           <div class="field">
             <label>{{ $t('Ordering direction') }}</label>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value="">Ascending</option>
+              <option value="+">Ascending</option>
               <option value="-">Descending</option>
             </select>
           </div>
@@ -106,7 +106,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 12),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       status: this.defaultStatus || 'any'
     }
diff --git a/front/src/views/federation/LibraryList.vue b/front/src/views/federation/LibraryList.vue
index cc833d3a3..d067705fa 100644
--- a/front/src/views/federation/LibraryList.vue
+++ b/front/src/views/federation/LibraryList.vue
@@ -26,7 +26,7 @@
           <div class="field">
             <label>{{ $t('Ordering direction') }}</label>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value="">{{ $t('Ascending') }}</option>
+              <option value="+">{{ $t('Ascending') }}</option>
               <option value="-">{{ $t('Descending') }}</option>
             </select>
           </div>
@@ -102,7 +102,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 50),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
         ['creation_date', 'Creation date'],
diff --git a/front/src/views/playlists/List.vue b/front/src/views/playlists/List.vue
index 5001fb14d..cc6ad49bb 100644
--- a/front/src/views/playlists/List.vue
+++ b/front/src/views/playlists/List.vue
@@ -25,7 +25,7 @@
           <div class="field">
             <label>{{ $t('Ordering direction') }}</label>
             <select class="ui dropdown" v-model="orderingDirection">
-              <option value="">{{ $t('Ascending') }}</option>
+              <option value="+">{{ $t('Ascending') }}</option>
               <option value="-">{{ $t('Descending') }}</option>
             </select>
           </div>
@@ -83,7 +83,7 @@ export default {
       page: parseInt(this.defaultPage),
       query: this.defaultQuery,
       paginateBy: parseInt(this.defaultPaginateBy || 12),
-      orderingDirection: defaultOrdering.direction,
+      orderingDirection: defaultOrdering.direction || '+',
       ordering: defaultOrdering.field,
       orderingOptions: [
         ['creation_date', 'Creation date'],

From e3d2c010eedaedac5d6969994cc79a2cc96001ee Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 22 May 2018 23:38:18 +0200
Subject: [PATCH 11/57] Fix #227: fixed a few broken translation strings

---
 changes/changelog.d/227.bugfix          | 1 +
 front/src/components/library/Track.vue  | 3 +--
 front/src/components/playlists/Card.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 changes/changelog.d/227.bugfix

diff --git a/changes/changelog.d/227.bugfix b/changes/changelog.d/227.bugfix
new file mode 100644
index 000000000..5e67d186d
--- /dev/null
+++ b/changes/changelog.d/227.bugfix
@@ -0,0 +1 @@
+Fixed a few broken translations strings (#227)
diff --git a/front/src/components/library/Track.vue b/front/src/components/library/Track.vue
index 155a1245a..24acca75b 100644
--- a/front/src/components/library/Track.vue
+++ b/front/src/components/library/Track.vue
@@ -14,8 +14,7 @@
                 <i18next path="From album {%0%} by {%1%}">
                   <router-link :to="{name: 'library.albums.detail', params: {id: track.album.id }}">
                     {{ track.album.title }}
-                  </router-link>
-                  <router-link :to="{name: 'library.artists.detail', params: {id: track.artist.id }}">
+                  </router-link><router-link :to="{name: 'library.artists.detail', params: {id: track.artist.id }}">
                     {{ track.artist.name }}
                   </router-link>
                 </i18next>
diff --git a/front/src/components/playlists/Card.vue b/front/src/components/playlists/Card.vue
index 670b43194..19932a4e8 100644
--- a/front/src/components/playlists/Card.vue
+++ b/front/src/components/playlists/Card.vue
@@ -11,7 +11,7 @@
       </div>
       <div class="meta">
         <i class="clock icon"></i>
-        <i18next path="Updated {%date%}">
+        <i18next path="Updated {%0%}">
           <human-date :date="playlist.modification_date" />
         </i18next>
       </div>

From 01ea6562a63c0eca512b89cd39ab678ac2fc7099 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 22 May 2018 23:53:45 +0200
Subject: [PATCH 12/57] Fix #214: Do not crash on flac import if musicbrainz
 tags are missing

---
 api/funkwhale_api/music/metadata.py | 5 ++++-
 api/tests/music/test_metadata.py    | 8 ++++++++
 changes/changelog.d/214.bugfix      | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/214.bugfix

diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 494256711..519dd8b5e 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -30,7 +30,7 @@ def get_id3_tag(f, k):
 
 def get_flac_tag(f, k):
     try:
-        return f.get(k)[0]
+        return f.get(k, [])[0]
     except (KeyError, IndexError):
         raise TagNotFound(k)
 
@@ -158,6 +158,9 @@ CONF = {
             'musicbrainz_recordingid': {
                 'field': 'musicbrainz_trackid'
             },
+            'test': {
+                'field': 'test'
+            },
         }
     },
 }
diff --git a/api/tests/music/test_metadata.py b/api/tests/music/test_metadata.py
index 3f1ea9177..e7b9012b6 100644
--- a/api/tests/music/test_metadata.py
+++ b/api/tests/music/test_metadata.py
@@ -57,3 +57,11 @@ def test_can_get_metadata_from_flac_file(field, value):
     data = metadata.Metadata(path)
 
     assert data.get(field) == value
+
+
+def test_can_get_metadata_from_flac_file_not_crash_if_empty():
+    path = os.path.join(DATA_DIR, 'sample.flac')
+    data = metadata.Metadata(path)
+
+    with pytest.raises(metadata.TagNotFound):
+        data.get('test')
diff --git a/changes/changelog.d/214.bugfix b/changes/changelog.d/214.bugfix
new file mode 100644
index 000000000..f2f36c4af
--- /dev/null
+++ b/changes/changelog.d/214.bugfix
@@ -0,0 +1 @@
+Do not crash on flac import if musicbrainz tags are missing (#214)

From f1a1b93ee54b0946f7f2fd3027935dd9265f2d8c Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 23 May 2018 19:52:47 +0200
Subject: [PATCH 13/57] See #228: serializer logic

---
 api/funkwhale_api/common/serializers.py | 74 ++++++++++++++++++++
 api/tests/common/test_serializers.py    | 89 +++++++++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 api/funkwhale_api/common/serializers.py
 create mode 100644 api/tests/common/test_serializers.py

diff --git a/api/funkwhale_api/common/serializers.py b/api/funkwhale_api/common/serializers.py
new file mode 100644
index 000000000..7e214d7db
--- /dev/null
+++ b/api/funkwhale_api/common/serializers.py
@@ -0,0 +1,74 @@
+from rest_framework import serializers
+
+
+class ActionSerializer(serializers.Serializer):
+    """
+    A special serializer that can operate on a list of objects
+    and apply actions on it.
+    """
+
+    action = serializers.CharField(required=True)
+    objects = serializers.JSONField(required=True)
+    filters = serializers.DictField(required=False)
+    actions = None
+    filterset_class = None
+
+    def __init__(self, *args, **kwargs):
+        self.queryset = kwargs.pop('queryset')
+        if self.actions is None:
+            raise ValueError(
+                'You must declare a list of actions on '
+                'the serializer class')
+
+        for action in self.actions:
+            handler_name = 'handle_{}'.format(action)
+            assert hasattr(self, handler_name), (
+                '{} miss a {} method'.format(
+                    self.__class__.__name__, handler_name)
+            )
+        super().__init__(self, *args, **kwargs)
+
+    def validate_action(self, value):
+        if value not in self.actions:
+            raise serializers.ValidationError(
+                '{} is not a valid action. Pick one of {}.'.format(
+                    value, ', '.join(self.actions)
+                )
+            )
+        return value
+
+    def validate_objects(self, value):
+        qs = None
+        if value == 'all':
+            return self.queryset.all().order_by('id')
+        if type(value) in [list, tuple]:
+            return self.queryset.filter(pk__in=value).order_by('id')
+
+        raise serializers.ValidationError(
+            '{} is not a valid value for objects. You must provide either a '
+            'list of identifiers or the string "all".'.format(value))
+
+    def validate(self, data):
+        if not self.filterset_class or 'filters' not in data:
+            # no additional filters to apply, we just skip
+            return data
+
+        qs_filterset = self.filterset_class(
+            data['filters'], queryset=data['objects'])
+        try:
+            assert qs_filterset.form.is_valid()
+        except (AssertionError, TypeError):
+            raise serializers.ValidationError('Invalid filters')
+        data['objects'] = qs_filterset.qs
+        return data
+
+    def save(self):
+        handler_name = 'handle_{}'.format(self.validated_data['action'])
+        handler = getattr(self, handler_name)
+        result = handler(self.validated_data['objects'])
+        payload = {
+            'updated': self.validated_data['objects'].count(),
+            'action': self.validated_data['action'],
+            'result': result,
+        }
+        return payload
diff --git a/api/tests/common/test_serializers.py b/api/tests/common/test_serializers.py
new file mode 100644
index 000000000..075e957f6
--- /dev/null
+++ b/api/tests/common/test_serializers.py
@@ -0,0 +1,89 @@
+import django_filters
+
+from funkwhale_api.common import serializers
+from funkwhale_api.users import models
+
+
+class TestActionFilterSet(django_filters.FilterSet):
+    class Meta:
+        model = models.User
+        fields = ['is_active']
+
+
+class TestSerializer(serializers.ActionSerializer):
+    actions = ['test']
+    filterset_class = TestActionFilterSet
+
+    def handle_test(self, objects):
+        return {'hello': 'world'}
+
+
+def test_action_serializer_validates_action():
+    data = {'objects': 'all', 'action': 'nope'}
+    serializer = TestSerializer(data, queryset=models.User.objects.none())
+
+    assert serializer.is_valid() is False
+    assert 'action' in serializer.errors
+
+
+def test_action_serializer_validates_objects():
+    data = {'objects': 'nope', 'action': 'test'}
+    serializer = TestSerializer(data, queryset=models.User.objects.none())
+
+    assert serializer.is_valid() is False
+    assert 'objects' in serializer.errors
+
+
+def test_action_serializers_objects_clean_ids(factories):
+    user1 = factories['users.User']()
+    user2 = factories['users.User']()
+
+    data = {'objects': [user1.pk], 'action': 'test'}
+    serializer = TestSerializer(data, queryset=models.User.objects.all())
+
+    assert serializer.is_valid() is True
+    assert list(serializer.validated_data['objects']) == [user1]
+
+
+def test_action_serializers_objects_clean_all(factories):
+    user1 = factories['users.User']()
+    user2 = factories['users.User']()
+
+    data = {'objects': 'all', 'action': 'test'}
+    serializer = TestSerializer(data, queryset=models.User.objects.all())
+
+    assert serializer.is_valid() is True
+    assert list(serializer.validated_data['objects']) == [user1, user2]
+
+
+def test_action_serializers_save(factories, mocker):
+    handler = mocker.spy(TestSerializer, 'handle_test')
+    user1 = factories['users.User']()
+    user2 = factories['users.User']()
+
+    data = {'objects': 'all', 'action': 'test'}
+    serializer = TestSerializer(data, queryset=models.User.objects.all())
+
+    assert serializer.is_valid() is True
+    result = serializer.save()
+    assert result == {
+        'updated': 2,
+        'action': 'test',
+        'result': {'hello': 'world'},
+    }
+    handler.assert_called_once()
+
+
+def test_action_serializers_filterset(factories):
+    user1 = factories['users.User'](is_active=False)
+    user2 = factories['users.User'](is_active=True)
+
+    data = {
+        'objects': 'all',
+        'action': 'test',
+        'filters': {'is_active': True},
+    }
+    serializer = TestSerializer(data, queryset=models.User.objects.all())
+
+    assert serializer.is_valid() is True
+    assert list(serializer.validated_data['objects']) == [user2]

From ba4b6f6ba609ad9db5043d623e2198e6e9d0161b Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 23 May 2018 21:50:23 +0200
Subject: [PATCH 14/57] See #228: now use our new action logic for library
 track import

---
 api/funkwhale_api/common/serializers.py       | 24 +++++++------
 api/funkwhale_api/federation/serializers.py   | 31 ++++++++++++++++-
 api/funkwhale_api/federation/views.py         | 19 +++++++++--
 api/funkwhale_api/music/serializers.py        | 22 ------------
 api/funkwhale_api/music/views.py              | 16 ---------
 api/tests/common/test_serializers.py          | 11 ++++++
 api/tests/federation/test_views.py            | 34 +++++++++++++++++++
 api/tests/music/test_views.py                 | 18 ----------
 .../federation/LibraryTrackTable.vue          |  7 ++--
 9 files changed, 109 insertions(+), 73 deletions(-)

diff --git a/api/funkwhale_api/common/serializers.py b/api/funkwhale_api/common/serializers.py
index 7e214d7db..62d9c567e 100644
--- a/api/funkwhale_api/common/serializers.py
+++ b/api/funkwhale_api/common/serializers.py
@@ -49,17 +49,19 @@ class ActionSerializer(serializers.Serializer):
             'list of identifiers or the string "all".'.format(value))
 
     def validate(self, data):
-        if not self.filterset_class or 'filters' not in data:
-            # no additional filters to apply, we just skip
-            return data
+        if self.filterset_class and 'filters' in data:
+            qs_filterset = self.filterset_class(
+                data['filters'], queryset=data['objects'])
+            try:
+                assert qs_filterset.form.is_valid()
+            except (AssertionError, TypeError):
+                raise serializers.ValidationError('Invalid filters')
+            data['objects'] = qs_filterset.qs
 
-        qs_filterset = self.filterset_class(
-            data['filters'], queryset=data['objects'])
-        try:
-            assert qs_filterset.form.is_valid()
-        except (AssertionError, TypeError):
-            raise serializers.ValidationError('Invalid filters')
-        data['objects'] = qs_filterset.qs
+        data['count'] = data['objects'].count()
+        if data['count'] < 1:
+            raise serializers.ValidationError(
+                'No object matching your request')
         return data
 
     def save(self):
@@ -67,7 +69,7 @@ class ActionSerializer(serializers.Serializer):
         handler = getattr(self, handler_name)
         result = handler(self.validated_data['objects'])
         payload = {
-            'updated': self.validated_data['objects'].count(),
+            'updated': self.validated_data['count'],
             'action': self.validated_data['action'],
             'result': result,
         }
diff --git a/api/funkwhale_api/federation/serializers.py b/api/funkwhale_api/federation/serializers.py
index 51561e222..77cb25096 100644
--- a/api/funkwhale_api/federation/serializers.py
+++ b/api/funkwhale_api/federation/serializers.py
@@ -10,8 +10,11 @@ from rest_framework import serializers
 from dynamic_preferences.registries import global_preferences_registry
 
 from funkwhale_api.common import utils as funkwhale_utils
-
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.music import models as music_models
+from funkwhale_api.music import tasks as music_tasks
 from . import activity
+from . import filters
 from . import models
 from . import utils
 
@@ -806,3 +809,29 @@ class CollectionSerializer(serializers.Serializer):
         if self.context.get('include_ap_context', True):
             d['@context'] = AP_CONTEXT
         return d
+
+
+class LibraryTrackActionSerializer(common_serializers.ActionSerializer):
+    actions = ['import']
+    filterset_class = filters.LibraryTrackFilter
+
+    @transaction.atomic
+    def handle_import(self, objects):
+        batch = music_models.ImportBatch.objects.create(
+            source='federation',
+            submitted_by=self.context['submitted_by']
+        )
+        for lt in objects:
+            job = music_models.ImportJob.objects.create(
+                batch=batch,
+                library_track=lt,
+                mbid=lt.mbid,
+                source=lt.url,
+            )
+            funkwhale_utils.on_commit(
+                music_tasks.import_job_run.delay,
+                import_job_id=job.pk,
+                use_acoustid=False,
+            )
+
+        return {'batch': {'id': batch.pk}}
diff --git a/api/funkwhale_api/federation/views.py b/api/funkwhale_api/federation/views.py
index 06a2cd040..01bc02fdf 100644
--- a/api/funkwhale_api/federation/views.py
+++ b/api/funkwhale_api/federation/views.py
@@ -15,7 +15,7 @@ from rest_framework.serializers import ValidationError
 
 from funkwhale_api.common import preferences
 from funkwhale_api.common import utils as funkwhale_utils
-from funkwhale_api.music.models import TrackFile
+from funkwhale_api.music import models as music_models
 from funkwhale_api.users.permissions import HasUserPermission
 
 from . import activity
@@ -148,7 +148,9 @@ class MusicFilesViewSet(FederationMixin, viewsets.GenericViewSet):
     def list(self, request, *args, **kwargs):
         page = request.GET.get('page')
         library = actors.SYSTEM_ACTORS['library'].get_actor_instance()
-        qs = TrackFile.objects.order_by('-creation_date').select_related(
+        qs = music_models.TrackFile.objects.order_by(
+            '-creation_date'
+        ).select_related(
             'track__artist',
             'track__album__artist'
         ).filter(library_track__isnull=True)
@@ -307,3 +309,16 @@ class LibraryTrackViewSet(
         'fetched_date',
         'published_date',
     )
+
+    @list_route(methods=['post'])
+    def action(self, request, *args, **kwargs):
+        queryset = models.LibraryTrack.objects.filter(
+            local_track_file__isnull=True)
+        serializer = serializers.LibraryTrackActionSerializer(
+            request.data,
+            queryset=queryset,
+            context={'submitted_by': request.user}
+        )
+        serializer.is_valid(raise_exception=True)
+        result = serializer.save()
+        return response.Response(result, status=200)
diff --git a/api/funkwhale_api/music/serializers.py b/api/funkwhale_api/music/serializers.py
index c77983a40..b72bb8c4a 100644
--- a/api/funkwhale_api/music/serializers.py
+++ b/api/funkwhale_api/music/serializers.py
@@ -250,28 +250,6 @@ class TrackActivitySerializer(activity_serializers.ModelSerializer):
         return 'Audio'
 
 
-class SubmitFederationTracksSerializer(serializers.Serializer):
-    library_tracks = serializers.PrimaryKeyRelatedField(
-        many=True,
-        queryset=LibraryTrack.objects.filter(local_track_file__isnull=True),
-    )
-
-    @transaction.atomic
-    def save(self, **kwargs):
-        batch = models.ImportBatch.objects.create(
-            source='federation',
-            **kwargs
-        )
-        for lt in self.validated_data['library_tracks']:
-            models.ImportJob.objects.create(
-                batch=batch,
-                library_track=lt,
-                mbid=lt.mbid,
-                source=lt.url,
-            )
-        return batch
-
-
 class ImportJobRunSerializer(serializers.Serializer):
     jobs = serializers.PrimaryKeyRelatedField(
         many=True,
diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index 24a9cbbcd..b42ad1c35 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -449,22 +449,6 @@ class SubmitViewSet(viewsets.ViewSet):
             data, request, batch=None, import_request=import_request)
         return Response(import_data)
 
-    @list_route(methods=['post'])
-    @transaction.non_atomic_requests
-    def federation(self, request, *args, **kwargs):
-        serializer = serializers.SubmitFederationTracksSerializer(
-            data=request.data)
-        serializer.is_valid(raise_exception=True)
-        batch = serializer.save(submitted_by=request.user)
-        for job in batch.jobs.all():
-            funkwhale_utils.on_commit(
-                tasks.import_job_run.delay,
-                import_job_id=job.pk,
-                use_acoustid=False,
-            )
-
-        return Response({'id': batch.id}, status=201)
-
     @transaction.atomic
     def _import_album(self, data, request, batch=None, import_request=None):
         # we import the whole album here to prevent race conditions that occurs
diff --git a/api/tests/common/test_serializers.py b/api/tests/common/test_serializers.py
index 075e957f6..563676556 100644
--- a/api/tests/common/test_serializers.py
+++ b/api/tests/common/test_serializers.py
@@ -87,3 +87,14 @@ def test_action_serializers_filterset(factories):
 
     assert serializer.is_valid() is True
     assert list(serializer.validated_data['objects']) == [user2]
+
+
+def test_action_serializers_validates_at_least_one_object():
+    data = {
+        'objects': 'all',
+        'action': 'test',
+    }
+    serializer = TestSerializer(data, queryset=models.User.objects.none())
+
+    assert serializer.is_valid() is False
+    assert 'non_field_errors' in serializer.errors
diff --git a/api/tests/federation/test_views.py b/api/tests/federation/test_views.py
index 10237ed9f..1b0de5754 100644
--- a/api/tests/federation/test_views.py
+++ b/api/tests/federation/test_views.py
@@ -418,3 +418,37 @@ def test_can_filter_pending_follows(factories, superuser_api_client):
 
     assert response.status_code == 200
     assert len(response.data['results']) == 0
+
+
+def test_library_track_action_import(
+        factories, superuser_api_client, mocker):
+    lt1 = factories['federation.LibraryTrack']()
+    lt2 = factories['federation.LibraryTrack'](library=lt1.library)
+    lt3 = factories['federation.LibraryTrack']()
+    lt4 = factories['federation.LibraryTrack'](library=lt3.library)
+    mocker.patch('funkwhale_api.music.tasks.import_job_run')
+
+    payload = {
+        'objects': 'all',
+        'action': 'import',
+        'filters': {
+            'library': lt1.library.uuid
+        }
+    }
+    url = reverse('api:v1:federation:library-tracks-action')
+    response = superuser_api_client.post(url, payload, format='json')
+    batch = superuser_api_client.user.imports.latest('id')
+    expected = {
+        'updated': 2,
+        'action': 'import',
+        'result': {
+            'batch': {'id': batch.pk}
+        }
+    }
+
+    imported_lts = [lt1, lt2]
+    assert response.status_code == 200
+    assert response.data == expected
+    assert batch.jobs.count() == 2
+    for i, job in enumerate(batch.jobs.all()):
+        assert job.library_track == imported_lts[i]
diff --git a/api/tests/music/test_views.py b/api/tests/music/test_views.py
index 38366442f..9328ba329 100644
--- a/api/tests/music/test_views.py
+++ b/api/tests/music/test_views.py
@@ -249,24 +249,6 @@ def test_serve_updates_access_date(factories, settings, api_client):
     assert track_file.accessed_date > now
 
 
-def test_can_create_import_from_federation_tracks(
-        factories, superuser_api_client, mocker):
-    lts = factories['federation.LibraryTrack'].create_batch(size=5)
-    mocker.patch('funkwhale_api.music.tasks.import_job_run')
-
-    payload = {
-        'library_tracks': [l.pk for l in lts]
-    }
-    url = reverse('api:v1:submit-federation')
-    response = superuser_api_client.post(url, payload)
-
-    assert response.status_code == 201
-    batch = superuser_api_client.user.imports.latest('id')
-    assert batch.jobs.count() == 5
-    for i, job in enumerate(batch.jobs.all()):
-        assert job.library_track == lts[i]
-
-
 def test_can_list_import_jobs(factories, superuser_api_client):
     job = factories['music.ImportJob']()
     url = reverse('api:v1:import-jobs-list')
diff --git a/front/src/components/federation/LibraryTrackTable.vue b/front/src/components/federation/LibraryTrackTable.vue
index d8ee48bf2..ad8b801a6 100644
--- a/front/src/components/federation/LibraryTrackTable.vue
+++ b/front/src/components/federation/LibraryTrackTable.vue
@@ -157,10 +157,11 @@ export default {
       let self = this
       self.isImporting = true
       let payload = {
-        library_tracks: this.checked
+        objects: this.checked,
+        action: 'import'
       }
-      axios.post('/submit/federation/', payload).then((response) => {
-        self.importBatch = response.data
+      axios.post('/federation/library-tracks/action/', payload).then((response) => {
+        self.importBatch = response.data.result.batch
         self.isImporting = false
         self.fetchData()
       }, error => {

From dc76283ebb8f6659643a223016ea57cd09795a75 Mon Sep 17 00:00:00 2001
From: EorlBruder <eorlbruder@magnus-henriques.de>
Date: Wed, 23 May 2018 22:23:59 +0200
Subject: [PATCH 15/57] Added OggTheora Metadata

OggTheora wasn't support up until now. Now the config is there and the
import works

fixes #216
---
 api/funkwhale_api/music/metadata.py | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 519dd8b5e..9f30a21d1 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -97,6 +97,37 @@ CONF = {
             },
         }
     },
+    'OggTheora': {
+        'getter': lambda f, k: f[k][0],
+        'fields': {
+            'track_number': {
+                'field': 'TRACKNUMBER',
+                'to_application': convert_track_number
+            },
+            'title': {
+                'field': 'title'
+            },
+            'artist': {
+                'field': 'artist'
+            },
+            'album': {
+                'field': 'album'
+            },
+            'date': {
+                'field': 'date',
+                'to_application': lambda v: arrow.get(v).date()
+            },
+            'musicbrainz_albumid': {
+                'field': 'musicbrainz_albumid'
+            },
+            'musicbrainz_artistid': {
+                'field': 'musicbrainz_artistid'
+            },
+            'musicbrainz_recordingid': {
+                'field': 'musicbrainz_trackid'
+            },
+        }
+    },
     'MP3': {
         'getter': get_id3_tag,
         'fields': {

From 04e6d302d10fae92359b8694c127eaab286caca6 Mon Sep 17 00:00:00 2001
From: EorlBruder <eorlbruder@magnus-henriques.de>
Date: Wed, 23 May 2018 22:29:03 +0200
Subject: [PATCH 16/57] Added Information to Changelog

---
 changes/changelog.d/216.enhancement | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/changelog.d/216.enhancement

diff --git a/changes/changelog.d/216.enhancement b/changes/changelog.d/216.enhancement
new file mode 100644
index 000000000..0ed9dec48
--- /dev/null
+++ b/changes/changelog.d/216.enhancement
@@ -0,0 +1 @@
+Added Support for OggTheora in import.

From c6b5c71d268dc65329bd945c84f980cebb48c91a Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 23 May 2018 22:55:33 +0200
Subject: [PATCH 17/57] Upgraded to latest vue to benefit from slot scope

---
 front/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/package.json b/front/package.json
index 8844e8bee..3dec9c257 100644
--- a/front/package.json
+++ b/front/package.json
@@ -33,7 +33,7 @@
     "raven-js": "^3.22.3",
     "semantic-ui-css": "^2.2.10",
     "showdown": "^1.8.6",
-    "vue": "^2.3.3",
+    "vue": "^2.5.16",
     "vue-lazyload": "^1.1.4",
     "vue-masonry": "^0.10.16",
     "vue-router": "^2.3.1",

From 83738e4e04786d9d73153a1c0585d950d24d6d64 Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Wed, 23 May 2018 23:32:28 +0200
Subject: [PATCH 18/57] Reading the musicBrainz-Id-Fields from correct field

---
 api/funkwhale_api/music/metadata.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 9f30a21d1..3aa643e56 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -118,13 +118,13 @@ CONF = {
                 'to_application': lambda v: arrow.get(v).date()
             },
             'musicbrainz_albumid': {
-                'field': 'musicbrainz_albumid'
+                'field': 'MusicBrainz Album Id'
             },
             'musicbrainz_artistid': {
-                'field': 'musicbrainz_artistid'
+                'field': 'MusicBrainz Artist Id'
             },
             'musicbrainz_recordingid': {
-                'field': 'musicbrainz_trackid'
+                'field': 'MusicBrainz Track Id'
             },
         }
     },

From 7ae90305e328bfcdac2361dd2bb5d2e0d4368c70 Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Wed, 23 May 2018 23:33:19 +0200
Subject: [PATCH 19/57] Added test for OggTheora Import

---
 api/tests/music/test_metadata.py |  16 ++++++++++++++++
 api/tests/music/test_theora.ogg  | Bin 0 -> 22785 bytes
 2 files changed, 16 insertions(+)
 create mode 100644 api/tests/music/test_theora.ogg

diff --git a/api/tests/music/test_metadata.py b/api/tests/music/test_metadata.py
index e7b9012b6..bacec07fb 100644
--- a/api/tests/music/test_metadata.py
+++ b/api/tests/music/test_metadata.py
@@ -24,6 +24,22 @@ def test_can_get_metadata_from_ogg_file(field, value):
 
     assert data.get(field) == value
 
+@pytest.mark.parametrize('field,value', [
+    ('title', 'Drei Kreuze (dass wir hier sind)'),
+    ('artist', 'Die Toten Hosen'),
+    ('album', 'Ballast der Republik'),
+    ('date', datetime.date(2012, 5, 4)),
+    ('track_number', 1),
+    ('musicbrainz_albumid', uuid.UUID('1f0441ad-e609-446d-b355-809c445773cf')),
+    ('musicbrainz_recordingid', uuid.UUID('124d0150-8627-46bc-bc14-789a3bc960c8')),
+    ('musicbrainz_artistid', uuid.UUID('c3bc80a6-1f4a-4e17-8cf0-6b1efe8302f1')),
+])
+def test_can_get_metadata_from_ogg_theora_file(field, value):
+    path = os.path.join(DATA_DIR, 'test_theora.ogg')
+    data = metadata.Metadata(path)
+
+    assert data.get(field) == value
+
 
 @pytest.mark.parametrize('field,value', [
     ('title', 'Bend'),
diff --git a/api/tests/music/test_theora.ogg b/api/tests/music/test_theora.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..3aa7117387a87115d9316f9d34205254381c95ec
GIT binary patch
literal 22785
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

literal 0
HcmV?d00001


From fc88f72a71a45255114fb5dfcfc2eeb2599ba54a Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 00:05:00 +0200
Subject: [PATCH 20/57] See #228: generic action table component

---
 front/src/components/common/ActionTable.vue | 150 ++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 front/src/components/common/ActionTable.vue

diff --git a/front/src/components/common/ActionTable.vue b/front/src/components/common/ActionTable.vue
new file mode 100644
index 000000000..b9822ca4d
--- /dev/null
+++ b/front/src/components/common/ActionTable.vue
@@ -0,0 +1,150 @@
+<template>
+  <table class="ui compact very basic single line unstackable table">
+    <thead>
+      <tr v-if="actions.length > 0 && objectsData.count > 0">
+        <th colspan="1000">
+          <div class="ui small form">
+            <div class="ui inline fields">
+              <div class="field">
+                <label>{{ $t('Actions') }}</label>
+                <select class="ui dropdown" v-model="currentAction">
+                  <option v-for="action in actions" :value="action[0]">
+                    {{ action[1] }}
+                  </option>
+                </select>
+              </div>
+              <div class="field">
+                <div
+                  @click="launchAction"
+                  :disabled="checked.length === 0"
+                  :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']">
+                  {{ $t('Go') }}</div>
+              </div>
+              <div class="count field">
+                <span v-if="selectAll">{{ $t('{% count %} on {% total %} selected', {count: objectsData.count, total: objectsData.count}) }}</span>
+                <span v-else>{{ $t('{% count %} on {% total %} selected', {count: checked.length, total: objectsData.count}) }}</span>
+                <template v-if="checked.length === objectsData.results.length">
+                  <a @click="selectAll = true" v-if="!selectAll">
+                    {{ $t('Select all {% total %} elements', {total: objectsData.count}) }}
+                  </a>
+                  <a @click="selectAll = false" v-else>
+                    {{ $t('Select only current page') }}
+                  </a>
+                </template>
+              </div>
+            </div>
+            <div v-if="actionErrors.length > 0" class="ui negative message">
+              <div class="header">{{ $t('Error while applying action') }}</div>
+              <ul class="list">
+                <li v-for="error in actionErrors">{{ error }}</li>
+              </ul>
+            </div>
+            <div v-if="actionResult" class="ui positive message">
+              <p>{{ $t('Action {% action %} was launched successfully on {% count %} objects.', {action: actionResult.action, count: actionResult.updated}) }}</p>
+              <slot name="action-success-footer" :result="actionResult">
+              </slot>
+            </div>
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <th>
+          <div class="ui checkbox">
+            <input
+              type="checkbox"
+              @change="toggleCheckAll"
+              :checked="objectsData.results.length === checked.length"><label>&nbsp;</label>
+          </div>
+        </th>
+        <slot name="header-cells"></slot>
+      </tr>
+    </thead>
+    <tbody>
+      <tr v-for="obj in objectsData.results">
+        <td class="collapsing">
+          <input
+            type="checkbox"
+            @change="toggleCheck(obj.id)"
+            :checked="checked.indexOf(obj.id) > -1"><label>&nbsp;</label>
+          </div>
+        </td>
+        <slot name="row-cells" :obj="obj"></slot>
+      </tr>
+    </tbody>
+  </table>
+</template>
+<script>
+import axios from 'axios'
+
+export default {
+  props: {
+    actionUrl: {type: String, required: true},
+    objectsData: {type: Object, required: true},
+    actions: {type: Array, required: true, default: () => { return [] }},
+    filters: {type: Object, required: false, default: () => { return {} }}
+  },
+  components: {},
+  data () {
+    let d = {
+      checked: [],
+      actionLoading: false,
+      actionResult: null,
+      actionErrors: [],
+      currentAction: null,
+      selectAll: false
+    }
+    if (this.actions.length > 0) {
+      d.currentAction = this.actions[0][0]
+    }
+    return d
+  },
+  methods: {
+    toggleCheckAll () {
+      if (this.checked.length === this.objectsData.results.length) {
+        // we uncheck
+        this.checked = []
+      } else {
+        this.checked = this.objectsData.results.map(t => { return t.id })
+      }
+    },
+    toggleCheck (id) {
+      if (this.checked.indexOf(id) > -1) {
+        // we uncheck
+        this.selectAll = false
+        this.checked.splice(this.checked.indexOf(id), 1)
+      } else {
+        this.checked.push(id)
+      }
+    },
+    launchAction () {
+      let self = this
+      self.actionLoading = true
+      self.result = null
+      let payload = {
+        action: this.currentAction,
+        filters: this.filters
+      }
+      if (this.selectAll) {
+        payload.objects = 'all'
+      } else {
+        payload.objects = this.checked
+      }
+      axios.post(this.actionUrl, payload).then((response) => {
+        self.actionResult = response.data
+        self.actionLoading = false
+      }, error => {
+        self.actionLoading = false
+        self.actionErrors = error.backendErrors
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.count.field {
+  font-weight: normal;
+}
+.ui.form .inline.fields {
+  margin: 0;
+}
+</style>

From f12fe0047f3c46c143d64f2840d1be206b417914 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 00:05:14 +0200
Subject: [PATCH 21/57] See #228: use action table component for federation
 library tracks

---
 .../federation/LibraryTrackTable.vue          | 193 +++++++-----------
 1 file changed, 73 insertions(+), 120 deletions(-)

diff --git a/front/src/components/federation/LibraryTrackTable.vue b/front/src/components/federation/LibraryTrackTable.vue
index ad8b801a6..551fb992a 100644
--- a/front/src/components/federation/LibraryTrackTable.vue
+++ b/front/src/components/federation/LibraryTrackTable.vue
@@ -16,89 +16,63 @@
         </div>
       </div>
     </div>
-    <table v-if="result" class="ui compact very basic single line unstackable table">
-      <thead>
-        <tr>
-          <th>
-            <div class="ui checkbox">
-              <input
-                type="checkbox"
-                @change="toggleCheckAll"
-                :checked="result.results.length === checked.length"><label>&nbsp;</label>
-            </div>
-          </th>
-          <i18next tag="th" path="Title"/>
-          <i18next tag="th" path="Artist"/>
-          <i18next tag="th" path="Album"/>
-          <i18next tag="th" path="Published date"/>
-          <i18next tag="th" v-if="showLibrary" path="Library"/>
-        </tr>
-      </thead>
-      <tbody>
-        <tr v-for="track in result.results">
-          <td class="collapsing">
-            <div v-if="!track.local_track_file" class="ui checkbox">
-              <input
-                type="checkbox"
-                @change="toggleCheck(track.id)"
-                :checked="checked.indexOf(track.id) > -1"><label>&nbsp;</label>
-            </div>
-            <div v-else class="ui label">
-              <i18next path="In library"/>
-            </div>
-          </td>
-          <td>
-            <span :title="track.title">{{ track.title|truncate(30) }}</span>
-          </td>
-          <td>
-            <span :title="track.artist_name">{{ track.artist_name|truncate(30) }}</span>
-          </td>
-          <td>
-            <span :title="track.album_title">{{ track.album_title|truncate(20) }}</span>
-          </td>
-          <td>
-            <human-date :date="track.published_date"></human-date>
-          </td>
-          <td v-if="showLibrary">
-            {{ track.library.actor.domain }}
-          </td>
-        </tr>
-      </tbody>
-      <tfoot class="full-width">
-        <tr>
-          <th>
-            <pagination
-            v-if="result && result.results.length > 0"
-            @page-changed="selectPage"
-            :compact="true"
-            :current="page"
-            :paginate-by="paginateBy"
-            :total="result.count"
-            ></pagination>
+    <action-table
+      v-if="result"
+      :objects-data="result"
+      :actions="[['import', $t('Import')]]"
+      :action-url="'federation/library-tracks/action/'"
+      :filters="actionFilters">
+      <template slot="header-cells">
+        <th>{{ $t('Status') }}</th>
+        <th>{{ $t('Title') }}</th>
+        <th>{{ $t('Artist') }}</th>
+        <th>{{ $t('Album') }}</th>
+        <th>{{ $t('Published date') }}</th>
+        <th v-if="showLibrary">{{ $t('Library') }}</th>
+      </template>
+      <template slot="action-success-footer" slot-scope="scope">
+        <router-link
+          v-if="scope.result.action === 'import'"
+          :to="{name: 'library.import.batches.detail', params: {id: scope.result.result.batch.id }}">
+          {{ $t('Import #{% id %} launched', {id: scope.result.result.batch.id}) }}
+        </router-link>
+      </template>
+      <template slot="row-cells" slot-scope="scope">
+        <td>
+          <span v-if="scope.obj.local_track_file" class="ui basic green label">{{ $t('In library') }}</span>
+          <span v-else class="ui basic yellow label">{{ $t('Not imported') }}</span>
+        </td>
+        <td>
+          <span :title="scope.obj.title">{{ scope.obj.title|truncate(30) }}</span>
+        </td>
+        <td>
+          <span :title="scope.obj.artist_name">{{ scope.obj.artist_name|truncate(30) }}</span>
+        </td>
+        <td>
+          <span :title="scope.obj.album_title">{{ scope.obj.album_title|truncate(20) }}</span>
+        </td>
+        <td>
+          <human-date :date="scope.obj.published_date"></human-date>
+        </td>
+        <td v-if="showLibrary">
+          {{ scope.obj.library.actor.domain }}
+        </td>
+      </template>
+    </action-table>
+    <div>
+      <pagination
+        v-if="result && result.results.length > 0"
+        @page-changed="selectPage"
+        :compact="true"
+        :current="page"
+        :paginate-by="paginateBy"
+        :total="result.count"
+        ></pagination>
 
-          </th>
-          <th v-if="result && result.results.length > 0">
-            {{ $t('Showing results {%start%}-{%end%} on {%total%}', {start: ((page-1) * paginateBy) + 1 , end: ((page-1) * paginateBy) + result.results.length, total: result.count})}}
-          <th>
-            <button
-              @click="launchImport"
-              :disabled="checked.length === 0 || isImporting"
-              :class="['ui', 'green', {loading: isImporting}, 'button']">
-              {{ $t('Import {%count%} tracks', {'count': checked.length}) }}
-            </button>
-            <router-link
-              v-if="importBatch"
-              :to="{name: 'library.import.batches.detail', params: {id: importBatch.id }}">
-              {{ $t('Import #{% id %} launched', {id: importBatch.id}) }}
-            </router-link>
-          </th>
-          <th></th>
-          <th></th>
-          <th></th>
-          <th v-if="showLibrary"></th>
-        </tr>
-      </tfoot>
-    </table>
+      <span v-if="result && result.results.length > 0">
+        {{ $t('Showing results {%start%}-{%end%} on {%total%}', {start: ((page-1) * paginateBy) + 1 , end: ((page-1) * paginateBy) + result.results.length, total: result.count})}}
+      </span>
+    </div>
   </div>
 </template>
 
@@ -107,6 +81,7 @@ import axios from 'axios'
 import _ from 'lodash'
 
 import Pagination from '@/components/Pagination'
+import ActionTable from '@/components/common/ActionTable'
 
 export default {
   props: {
@@ -114,7 +89,8 @@ export default {
     showLibrary: {type: Boolean, default: false}
   },
   components: {
-    Pagination
+    Pagination,
+    ActionTable
   },
   data () {
     return {
@@ -123,9 +99,6 @@ export default {
       page: 1,
       paginateBy: 25,
       search: '',
-      checked: {},
-      isImporting: false,
-      importBatch: null,
       importedFilter: null
     }
   },
@@ -153,47 +126,26 @@ export default {
         self.errors = error.backendErrors
       })
     },
-    launchImport () {
-      let self = this
-      self.isImporting = true
-      let payload = {
-        objects: this.checked,
-        action: 'import'
-      }
-      axios.post('/federation/library-tracks/action/', payload).then((response) => {
-        self.importBatch = response.data.result.batch
-        self.isImporting = false
-        self.fetchData()
-      }, error => {
-        self.isImporting = false
-        self.errors = error.backendErrors
-      })
-    },
-    toggleCheckAll () {
-      if (this.checked.length === this.result.results.length) {
-        // we uncheck
-        this.checked = []
-      } else {
-        this.checked = this.result.results.filter(t => {
-          return t.local_track_file === null
-        }).map(t => { return t.id })
-      }
-    },
-    toggleCheck (id) {
-      if (this.checked.indexOf(id) > -1) {
-        // we uncheck
-        this.checked.splice(this.checked.indexOf(id), 1)
-      } else {
-        this.checked.push(id)
-      }
-    },
     selectPage: function (page) {
       this.page = page
     }
   },
+  computed: {
+    actionFilters () {
+      var currentFilters = {
+        q: this.search
+      }
+      if (this.filters) {
+        return _.merge(currentFilters, this.filters)
+      } else {
+        return currentFilters
+      }
+    }
+  },
   watch: {
     search (newValue) {
       if (newValue.length > 0) {
+        this.page = 1
         this.fetchData()
       }
     },
@@ -201,6 +153,7 @@ export default {
       this.fetchData()
     },
     importedFilter () {
+      this.page = 1
       this.fetchData()
     }
   }

From 4f8db661fa80c3b1c38fdbbcbc84f64b0fe644c6 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 18:33:26 +0200
Subject: [PATCH 22/57] See #228: now expose library track status in API

---
 api/funkwhale_api/federation/filters.py     | 16 ++++++++------
 api/funkwhale_api/federation/serializers.py | 13 ++++++++++++
 api/funkwhale_api/federation/views.py       |  2 +-
 api/tests/federation/test_serializers.py    | 23 +++++++++++++++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/api/funkwhale_api/federation/filters.py b/api/funkwhale_api/federation/filters.py
index 7a388ff12..1d93f68b9 100644
--- a/api/funkwhale_api/federation/filters.py
+++ b/api/funkwhale_api/federation/filters.py
@@ -24,7 +24,7 @@ class LibraryFilter(django_filters.FilterSet):
 
 class LibraryTrackFilter(django_filters.FilterSet):
     library = django_filters.CharFilter('library__uuid')
-    imported = django_filters.CharFilter(method='filter_imported')
+    status = django_filters.CharFilter(method='filter_status')
     q = fields.SearchFilter(search_fields=[
         'artist_name',
         'title',
@@ -32,11 +32,15 @@ class LibraryTrackFilter(django_filters.FilterSet):
         'library__actor__domain',
     ])
 
-    def filter_imported(self, queryset, field_name, value):
-        if value.lower() in ['true', '1', 'yes']:
-            queryset = queryset.filter(local_track_file__isnull=False)
-        elif value.lower() in ['false', '0', 'no']:
-            queryset = queryset.filter(local_track_file__isnull=True)
+    def filter_status(self, queryset, field_name, value):
+        if value == 'imported':
+            return queryset.filter(local_track_file__isnull=False)
+        elif value == 'not_imported':
+            return queryset.filter(
+                local_track_file__isnull=True
+            ).exclude(import_jobs__status='pending')
+        elif value == 'import_pending':
+            return queryset.filter(import_jobs__status='pending')
         return queryset
 
     class Meta:
diff --git a/api/funkwhale_api/federation/serializers.py b/api/funkwhale_api/federation/serializers.py
index 77cb25096..59e93a9b1 100644
--- a/api/funkwhale_api/federation/serializers.py
+++ b/api/funkwhale_api/federation/serializers.py
@@ -296,6 +296,7 @@ class APILibraryCreateSerializer(serializers.ModelSerializer):
 
 class APILibraryTrackSerializer(serializers.ModelSerializer):
     library = APILibrarySerializer()
+    status = serializers.SerializerMethodField()
 
     class Meta:
         model = models.LibraryTrack
@@ -314,8 +315,20 @@ class APILibraryTrackSerializer(serializers.ModelSerializer):
             'title',
             'library',
             'local_track_file',
+            'status',
         ]
 
+    def get_status(self, o):
+        try:
+            if o.local_track_file is not None:
+                return 'imported'
+        except music_models.TrackFile.DoesNotExist:
+            pass
+        for job in o.import_jobs.all():
+            if job.status == 'pending':
+                return 'import_pending'
+        return 'not_imported'
+
 
 class FollowSerializer(serializers.Serializer):
     id = serializers.URLField(max_length=500)
diff --git a/api/funkwhale_api/federation/views.py b/api/funkwhale_api/federation/views.py
index 01bc02fdf..1350ec731 100644
--- a/api/funkwhale_api/federation/views.py
+++ b/api/funkwhale_api/federation/views.py
@@ -296,7 +296,7 @@ class LibraryTrackViewSet(
         'library__actor',
         'library__follow',
         'local_track_file',
-    )
+    ).prefetch_related('import_jobs')
     filter_class = filters.LibraryTrackFilter
     serializer_class = serializers.APILibraryTrackSerializer
     ordering_fields = (
diff --git a/api/tests/federation/test_serializers.py b/api/tests/federation/test_serializers.py
index f298c61f5..fcf2ba1b6 100644
--- a/api/tests/federation/test_serializers.py
+++ b/api/tests/federation/test_serializers.py
@@ -699,3 +699,26 @@ def test_api_library_create_serializer_save(factories, r_mock):
     assert library.tracks_count == 10
     assert library.actor == actor
     assert library.follow == follow
+
+
+def test_tapi_library_track_serializer_not_imported(factories):
+    lt = factories['federation.LibraryTrack']()
+    serializer = serializers.APILibraryTrackSerializer(lt)
+
+    assert serializer.get_status(lt) == 'not_imported'
+
+
+def test_tapi_library_track_serializer_imported(factories):
+    tf = factories['music.TrackFile'](federation=True)
+    lt = tf.library_track
+    serializer = serializers.APILibraryTrackSerializer(lt)
+
+    assert serializer.get_status(lt) == 'imported'
+
+
+def test_tapi_library_track_serializer_import_pending(factories):
+    job = factories['music.ImportJob'](federation=True, status='pending')
+    lt = job.library_track
+    serializer = serializers.APILibraryTrackSerializer(lt)
+
+    assert serializer.get_status(lt) == 'import_pending'

From eded32c2e8271cfffb9575a123f0caabdcc851f9 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 18:53:12 +0200
Subject: [PATCH 23/57] See #228: more performante federation import launch via
 API

---
 api/funkwhale_api/federation/serializers.py | 12 ++++++------
 api/funkwhale_api/music/tasks.py            |  7 +++++++
 api/tests/federation/test_views.py          |  4 +++-
 api/tests/music/test_tasks.py               |  9 +++++++++
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/api/funkwhale_api/federation/serializers.py b/api/funkwhale_api/federation/serializers.py
index 59e93a9b1..6ffffaa9a 100644
--- a/api/funkwhale_api/federation/serializers.py
+++ b/api/funkwhale_api/federation/serializers.py
@@ -834,17 +834,17 @@ class LibraryTrackActionSerializer(common_serializers.ActionSerializer):
             source='federation',
             submitted_by=self.context['submitted_by']
         )
+        jobs = []
         for lt in objects:
-            job = music_models.ImportJob.objects.create(
+            job = music_models.ImportJob(
                 batch=batch,
                 library_track=lt,
                 mbid=lt.mbid,
                 source=lt.url,
             )
-            funkwhale_utils.on_commit(
-                music_tasks.import_job_run.delay,
-                import_job_id=job.pk,
-                use_acoustid=False,
-            )
+            jobs.append(job)
+
+        music_models.ImportJob.objects.bulk_create(jobs)
+        music_tasks.import_batch_run.delay(import_batch_id=batch.pk)
 
         return {'batch': {'id': batch.pk}}
diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py
index e5426904a..993456c27 100644
--- a/api/funkwhale_api/music/tasks.py
+++ b/api/funkwhale_api/music/tasks.py
@@ -173,6 +173,13 @@ def import_job_run(self, import_job, replace=False, use_acoustid=False):
         raise
 
 
+@celery.app.task(name='ImportBatch.run')
+@celery.require_instance(models.ImportBatch, 'import_batch')
+def import_batch_run(import_batch):
+    for job_id in import_batch.jobs.order_by('id').values_list('id', flat=True):
+        import_job_run.delay(import_job_id=job_id)
+
+
 @celery.app.task(name='Lyrics.fetch_content')
 @celery.require_instance(models.Lyrics, 'lyrics')
 def fetch_content(lyrics):
diff --git a/api/tests/federation/test_views.py b/api/tests/federation/test_views.py
index 1b0de5754..04a419aed 100644
--- a/api/tests/federation/test_views.py
+++ b/api/tests/federation/test_views.py
@@ -426,7 +426,8 @@ def test_library_track_action_import(
     lt2 = factories['federation.LibraryTrack'](library=lt1.library)
     lt3 = factories['federation.LibraryTrack']()
     lt4 = factories['federation.LibraryTrack'](library=lt3.library)
-    mocker.patch('funkwhale_api.music.tasks.import_job_run')
+    mocked_run = mocker.patch(
+        'funkwhale_api.music.tasks.import_batch_run.delay')
 
     payload = {
         'objects': 'all',
@@ -452,3 +453,4 @@ def test_library_track_action_import(
     assert batch.jobs.count() == 2
     for i, job in enumerate(batch.jobs.all()):
         assert job.library_track == imported_lts[i]
+    mocked_run.assert_called_once_with(import_batch_id=batch.pk)
diff --git a/api/tests/music/test_tasks.py b/api/tests/music/test_tasks.py
index 26cb9453e..dfe649be0 100644
--- a/api/tests/music/test_tasks.py
+++ b/api/tests/music/test_tasks.py
@@ -47,6 +47,15 @@ def test_set_acoustid_on_track_file_required_high_score(factories, mocker):
     assert track_file.acoustid_track_id is None
 
 
+def test_import_batch_run(factories, mocker):
+    job = factories['music.ImportJob']()
+    mocked_job_run = mocker.patch(
+        'funkwhale_api.music.tasks.import_job_run.delay')
+    tasks.import_batch_run(import_batch_id=job.batch.pk)
+
+    mocked_job_run.assert_called_once_with(import_job_id=job.pk)
+
+
 def test_import_job_can_run_with_file_and_acoustid(
         artists, albums, tracks, preferences, factories, mocker):
     preferences['providers_acoustid__api_key'] = 'test'

From 6586b2b73d6d094142a0d99edc6e750e4b5d925f Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 20:07:14 +0200
Subject: [PATCH 24/57] See #228: smarter action table with shift-click select

---
 front/src/components/common/ActionTable.vue   | 101 ++++++++++++---
 .../src/components/common/DangerousButton.vue |  13 +-
 .../federation/LibraryTrackTable.vue          | 115 ++++++++++--------
 3 files changed, 159 insertions(+), 70 deletions(-)

diff --git a/front/src/components/common/ActionTable.vue b/front/src/components/common/ActionTable.vue
index b9822ca4d..718e57b19 100644
--- a/front/src/components/common/ActionTable.vue
+++ b/front/src/components/common/ActionTable.vue
@@ -1,29 +1,42 @@
 <template>
   <table class="ui compact very basic single line unstackable table">
     <thead>
-      <tr v-if="actions.length > 0 && objectsData.count > 0">
+      <tr v-if="actions.length > 0">
         <th colspan="1000">
           <div class="ui small form">
             <div class="ui inline fields">
               <div class="field">
                 <label>{{ $t('Actions') }}</label>
-                <select class="ui dropdown" v-model="currentAction">
-                  <option v-for="action in actions" :value="action[0]">
-                    {{ action[1] }}
+                <select class="ui dropdown" v-model="currentActionName">
+                  <option v-for="action in actions" :value="action.name">
+                    {{ action.label }}
                   </option>
                 </select>
               </div>
               <div class="field">
                 <div
+                  v-if="!selectAll"
                   @click="launchAction"
                   :disabled="checked.length === 0"
                   :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']">
                   {{ $t('Go') }}</div>
+                <dangerous-button
+                  v-else :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']"
+                  confirm-color="green"
+                  color=""
+                  @confirm="launchAction">
+                  {{ $t('Go') }}
+                  <p slot="modal-header">{{ $t('Do you want to launch action "{% action %}" on {% total %} elements?', {action: currentActionName, total: objectsData.count}) }}
+                  <p slot="modal-content">
+                    {{ $t('This may affect a lot of elements, please double check this is really what you want.')}}
+                  </p>
+                  <p slot="modal-confirm">{{ $t('Launch') }}</p>
+                </dangerous-button>
               </div>
               <div class="count field">
                 <span v-if="selectAll">{{ $t('{% count %} on {% total %} selected', {count: objectsData.count, total: objectsData.count}) }}</span>
                 <span v-else>{{ $t('{% count %} on {% total %} selected', {count: checked.length, total: objectsData.count}) }}</span>
-                <template v-if="checked.length === objectsData.results.length">
+                <template v-if="checkable.length === checked.length">
                   <a @click="selectAll = true" v-if="!selectAll">
                     {{ $t('Select all {% total %} elements', {total: objectsData.count}) }}
                   </a>
@@ -53,18 +66,20 @@
             <input
               type="checkbox"
               @change="toggleCheckAll"
-              :checked="objectsData.results.length === checked.length"><label>&nbsp;</label>
+              :disabled="checkable.length === 0"
+              :checked="checkable.length > 0 && checked.length === checkable.length"><label>&nbsp;</label>
           </div>
         </th>
         <slot name="header-cells"></slot>
       </tr>
     </thead>
-    <tbody>
-      <tr v-for="obj in objectsData.results">
+    <tbody v-if="objectsData.count > 0">
+      <tr v-for="(obj, index) in objectsData.results">
         <td class="collapsing">
           <input
             type="checkbox"
-            @change="toggleCheck(obj.id)"
+            :disabled="checkable.indexOf(obj.id) === -1"
+            @click="toggleCheck($event, obj.id, index)"
             :checked="checked.indexOf(obj.id) > -1"><label>&nbsp;</label>
           </div>
         </td>
@@ -90,38 +105,60 @@ export default {
       actionLoading: false,
       actionResult: null,
       actionErrors: [],
-      currentAction: null,
-      selectAll: false
+      currentActionName: null,
+      selectAll: false,
+      lastCheckedIndex: -1
     }
     if (this.actions.length > 0) {
-      d.currentAction = this.actions[0][0]
+      d.currentActionName = this.actions[0].name
     }
     return d
   },
   methods: {
     toggleCheckAll () {
-      if (this.checked.length === this.objectsData.results.length) {
+      this.lastCheckedIndex = -1
+      if (this.checked.length === this.checkable.length) {
         // we uncheck
         this.checked = []
       } else {
-        this.checked = this.objectsData.results.map(t => { return t.id })
+        this.checked = this.checkable.map(i => { return i })
       }
     },
-    toggleCheck (id) {
+    toggleCheck (event, id, index) {
+      let self = this
+      let affectedIds = [id]
+      let newValue = null
       if (this.checked.indexOf(id) > -1) {
         // we uncheck
         this.selectAll = false
-        this.checked.splice(this.checked.indexOf(id), 1)
+        newValue = false
       } else {
-        this.checked.push(id)
+        newValue = true
       }
+      if (event.shiftKey && this.lastCheckedIndex > -1) {
+        // we also add inbetween ids to the list of affected ids
+        let idxs = [index, this.lastCheckedIndex]
+        idxs.sort((a, b) => a - b)
+        let objs = this.objectsData.results.slice(idxs[0], idxs[1] + 1)
+        affectedIds = affectedIds.concat(objs.map((o) => { return o.id }))
+      }
+      affectedIds.forEach((i) => {
+        let checked = self.checked.indexOf(i) > -1
+        if (newValue && !checked && self.checkable.indexOf(i) > -1) {
+          return self.checked.push(i)
+        }
+        if (!newValue && checked) {
+          self.checked.splice(self.checked.indexOf(i), 1)
+        }
+      })
+      this.lastCheckedIndex = index
     },
     launchAction () {
       let self = this
       self.actionLoading = true
       self.result = null
       let payload = {
-        action: this.currentAction,
+        action: this.currentActionName,
         filters: this.filters
       }
       if (this.selectAll) {
@@ -132,11 +169,39 @@ export default {
       axios.post(this.actionUrl, payload).then((response) => {
         self.actionResult = response.data
         self.actionLoading = false
+        self.$emit('action-launched', response.data)
       }, error => {
         self.actionLoading = false
         self.actionErrors = error.backendErrors
       })
     }
+  },
+  computed: {
+    currentAction () {
+      let self = this
+      return this.actions.filter((a) => {
+        return a.name === self.currentActionName
+      })[0]
+    },
+    checkable () {
+      let objs = this.objectsData.results
+      let filter = this.currentAction.filterCheckable
+      if (filter) {
+        objs = objs.filter((o) => {
+          return filter(o)
+        })
+      }
+      return objs.map((o) => { return o.id })
+    }
+  },
+  watch: {
+    objectsData: {
+      handler () {
+        this.checked = []
+        this.selectAll = false
+      },
+      deep: true
+    }
   }
 }
 </script>
diff --git a/front/src/components/common/DangerousButton.vue b/front/src/components/common/DangerousButton.vue
index 690291d5b..52fcdca61 100644
--- a/front/src/components/common/DangerousButton.vue
+++ b/front/src/components/common/DangerousButton.vue
@@ -13,7 +13,7 @@
       </div>
       <div class="actions">
         <div class="ui cancel button"><i18next path="Cancel"/></div>
-        <div :class="['ui', 'confirm', color, 'button']" @click="confirm">
+        <div :class="['ui', 'confirm', confirmButtonColor, 'button']" @click="confirm">
           <slot name="modal-confirm"><i18next path="Confirm"/></slot>
         </div>
       </div>
@@ -28,7 +28,8 @@ export default {
   props: {
     action: {type: Function, required: false},
     disabled: {type: Boolean, default: false},
-    color: {type: String, default: 'red'}
+    color: {type: String, default: 'red'},
+    confirmColor: {type: String, default: null, required: false}
   },
   components: {
     Modal
@@ -38,6 +39,14 @@ export default {
       showModal: false
     }
   },
+  computed: {
+    confirmButtonColor () {
+      if (this.confirmColor) {
+        return this.confirmColor
+      }
+      return this.color
+    }
+  },
   methods: {
     confirm () {
       this.showModal = false
diff --git a/front/src/components/federation/LibraryTrackTable.vue b/front/src/components/federation/LibraryTrackTable.vue
index 551fb992a..43b52c835 100644
--- a/front/src/components/federation/LibraryTrackTable.vue
+++ b/front/src/components/federation/LibraryTrackTable.vue
@@ -10,55 +10,63 @@
           <label>{{ $t('Import status') }}</label>
           <select class="ui dropdown" v-model="importedFilter">
             <option :value="null">{{ $t('Any') }}</option>
-            <option :value="true">{{ $t('Imported') }}</option>
-            <option :value="false">{{ $t('Not imported') }}</option>
+            <option :value="'imported'">{{ $t('Imported') }}</option>
+            <option :value="'not_imported'">{{ $t('Not imported') }}</option>
+            <option :value="'import_pending'">{{ $t('Import pending') }}</option>
           </select>
         </div>
       </div>
     </div>
-    <action-table
-      v-if="result"
-      :objects-data="result"
-      :actions="[['import', $t('Import')]]"
-      :action-url="'federation/library-tracks/action/'"
-      :filters="actionFilters">
-      <template slot="header-cells">
-        <th>{{ $t('Status') }}</th>
-        <th>{{ $t('Title') }}</th>
-        <th>{{ $t('Artist') }}</th>
-        <th>{{ $t('Album') }}</th>
-        <th>{{ $t('Published date') }}</th>
-        <th v-if="showLibrary">{{ $t('Library') }}</th>
-      </template>
-      <template slot="action-success-footer" slot-scope="scope">
-        <router-link
-          v-if="scope.result.action === 'import'"
-          :to="{name: 'library.import.batches.detail', params: {id: scope.result.result.batch.id }}">
-          {{ $t('Import #{% id %} launched', {id: scope.result.result.batch.id}) }}
-        </router-link>
-      </template>
-      <template slot="row-cells" slot-scope="scope">
-        <td>
-          <span v-if="scope.obj.local_track_file" class="ui basic green label">{{ $t('In library') }}</span>
-          <span v-else class="ui basic yellow label">{{ $t('Not imported') }}</span>
-        </td>
-        <td>
-          <span :title="scope.obj.title">{{ scope.obj.title|truncate(30) }}</span>
-        </td>
-        <td>
-          <span :title="scope.obj.artist_name">{{ scope.obj.artist_name|truncate(30) }}</span>
-        </td>
-        <td>
-          <span :title="scope.obj.album_title">{{ scope.obj.album_title|truncate(20) }}</span>
-        </td>
-        <td>
-          <human-date :date="scope.obj.published_date"></human-date>
-        </td>
-        <td v-if="showLibrary">
-          {{ scope.obj.library.actor.domain }}
-        </td>
-      </template>
-    </action-table>
+    <div class="dimmable">
+      <div v-if="isLoading" class="ui active inverted dimmer">
+          <div class="ui loader"></div>
+      </div>
+      <action-table
+        v-if="result"
+        @action-launched="fetchData"
+        :objects-data="result"
+        :actions="actions"
+        :action-url="'federation/library-tracks/action/'"
+        :filters="actionFilters">
+        <template slot="header-cells">
+          <th>{{ $t('Status') }}</th>
+          <th>{{ $t('Title') }}</th>
+          <th>{{ $t('Artist') }}</th>
+          <th>{{ $t('Album') }}</th>
+          <th>{{ $t('Published date') }}</th>
+          <th v-if="showLibrary">{{ $t('Library') }}</th>
+        </template>
+        <template slot="action-success-footer" slot-scope="scope">
+          <router-link
+            v-if="scope.result.action === 'import'"
+            :to="{name: 'library.import.batches.detail', params: {id: scope.result.result.batch.id }}">
+            {{ $t('Import #{% id %} launched', {id: scope.result.result.batch.id}) }}
+          </router-link>
+        </template>
+        <template slot="row-cells" slot-scope="scope">
+          <td>
+            <span v-if="scope.obj.status === 'imported'" class="ui basic green label">{{ $t('In library') }}</span>
+            <span v-else-if="scope.obj.status === 'import_pending'" class="ui basic yellow label">{{ $t('Import pending') }}</span>
+            <span v-else class="ui basic label">{{ $t('Not imported') }}</span>
+          </td>
+          <td>
+            <span :title="scope.obj.title">{{ scope.obj.title|truncate(30) }}</span>
+          </td>
+          <td>
+            <span :title="scope.obj.artist_name">{{ scope.obj.artist_name|truncate(30) }}</span>
+          </td>
+          <td>
+            <span :title="scope.obj.album_title">{{ scope.obj.album_title|truncate(20) }}</span>
+          </td>
+          <td>
+            <human-date :date="scope.obj.published_date"></human-date>
+          </td>
+          <td v-if="showLibrary">
+            {{ scope.obj.library.actor.domain }}
+          </td>
+        </template>
+      </action-table>
+    </div>
     <div>
       <pagination
         v-if="result && result.results.length > 0"
@@ -113,7 +121,7 @@ export default {
         'q': this.search
       }, this.filters)
       if (this.importedFilter !== null) {
-        params.imported = this.importedFilter
+        params.status = this.importedFilter
       }
       let self = this
       self.isLoading = true
@@ -140,14 +148,21 @@ export default {
       } else {
         return currentFilters
       }
+    },
+    actions () {
+      return [
+        {
+          name: 'import',
+          label: this.$t('Import'),
+          filterCheckable: (obj) => { return obj.status === 'not_imported' }
+        }
+      ]
     }
   },
   watch: {
     search (newValue) {
-      if (newValue.length > 0) {
-        this.page = 1
-        this.fetchData()
-      }
+      this.page = 1
+      this.fetchData()
     },
     page () {
       this.fetchData()

From c547c7e14bb8e6813a8b9c69b219ce866579515a Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 20:11:53 +0200
Subject: [PATCH 25/57] Fix #164 and #228: new action table component on
 federated tracks pages

---
 changes/changelog.d/164.enhancement | 2 ++
 changes/changelog.d/228.feature     | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 changes/changelog.d/164.enhancement
 create mode 100644 changes/changelog.d/228.feature

diff --git a/changes/changelog.d/164.enhancement b/changes/changelog.d/164.enhancement
new file mode 100644
index 000000000..ceea6c2b8
--- /dev/null
+++ b/changes/changelog.d/164.enhancement
@@ -0,0 +1,2 @@
+Can now import a whole remote library at once thanks to new Action Table
+component (#164)
diff --git a/changes/changelog.d/228.feature b/changes/changelog.d/228.feature
new file mode 100644
index 000000000..548c1927e
--- /dev/null
+++ b/changes/changelog.d/228.feature
@@ -0,0 +1,3 @@
+New action table component for quick and efficient batch actions (#228)
+This is implemented on the federated tracks pages, but will be included
+in other pages as well depending on the feedback.

From 2586444db235e384e9773af58ab563a24b3a033a Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 21:34:59 +0200
Subject: [PATCH 26/57] Fix #229: removed last hardcoded settings to protect
 audio files

---
 api/config/settings/common.py          |  6 ----
 api/funkwhale_api/music/permissions.py |  3 --
 api/tests/music/test_permissions.py    | 29 ++++++----------
 api/tests/music/test_views.py          | 47 ++++++++++++++++++--------
 changes/changelog.d/229.bugfix         |  1 +
 demo/setup.sh                          |  2 --
 6 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 changes/changelog.d/229.bugfix

diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 59aa93117..f376781b0 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -433,12 +433,6 @@ USE_X_FORWARDED_PORT = True
 REVERSE_PROXY_TYPE = env('REVERSE_PROXY_TYPE', default='nginx')
 assert REVERSE_PROXY_TYPE in ['apache2', 'nginx'], 'Unsupported REVERSE_PROXY_TYPE'
 
-# Wether we should check user permission before serving audio files (meaning
-# return an obfuscated url)
-# This require a special configuration on the reverse proxy side
-# See https://wellfire.co/learn/nginx-django-x-accel-redirects/ for example
-PROTECT_AUDIO_FILES = env.bool('PROTECT_AUDIO_FILES', default=True)
-
 # Which path will be used to process the internal redirection
 # **DO NOT** put a slash at the end
 PROTECT_FILES_PATH = env('PROTECT_FILES_PATH', default='/_protected')
diff --git a/api/funkwhale_api/music/permissions.py b/api/funkwhale_api/music/permissions.py
index 77f95c477..d31e1c5d5 100644
--- a/api/funkwhale_api/music/permissions.py
+++ b/api/funkwhale_api/music/permissions.py
@@ -10,9 +10,6 @@ from funkwhale_api.federation import models
 class Listen(BasePermission):
 
     def has_permission(self, request, view):
-        if not settings.PROTECT_AUDIO_FILES:
-            return True
-
         if not preferences.get('common__api_authentication_required'):
             return True
 
diff --git a/api/tests/music/test_permissions.py b/api/tests/music/test_permissions.py
index a5f0c4109..825d1731d 100644
--- a/api/tests/music/test_permissions.py
+++ b/api/tests/music/test_permissions.py
@@ -4,26 +4,17 @@ from funkwhale_api.federation import actors
 from funkwhale_api.music import permissions
 
 
-def test_list_permission_no_protect(anonymous_user, api_request, settings):
-    settings.PROTECT_AUDIO_FILES = False
+def test_list_permission_no_protect(preferences, anonymous_user, api_request):
+    preferences['common__api_authentication_required'] = False
     view = APIView.as_view()
     permission = permissions.Listen()
     request = api_request.get('/')
     assert permission.has_permission(request, view) is True
 
 
-def test_list_permission_protect_anonymous(
-        db, anonymous_user, api_request, settings):
-    settings.PROTECT_AUDIO_FILES = True
-    view = APIView.as_view()
-    permission = permissions.Listen()
-    request = api_request.get('/')
-    assert permission.has_permission(request, view) is False
-
-
 def test_list_permission_protect_authenticated(
-        factories, api_request, settings):
-    settings.PROTECT_AUDIO_FILES = True
+        factories, api_request, preferences):
+    preferences['common__api_authentication_required'] = True
     user = factories['users.User']()
     view = APIView.as_view()
     permission = permissions.Listen()
@@ -33,8 +24,8 @@ def test_list_permission_protect_authenticated(
 
 
 def test_list_permission_protect_not_following_actor(
-        factories, api_request, settings):
-    settings.PROTECT_AUDIO_FILES = True
+        factories, api_request, preferences):
+    preferences['common__api_authentication_required'] = True
     actor = factories['federation.Actor']()
     view = APIView.as_view()
     permission = permissions.Listen()
@@ -44,8 +35,8 @@ def test_list_permission_protect_not_following_actor(
 
 
 def test_list_permission_protect_following_actor(
-        factories, api_request, settings):
-    settings.PROTECT_AUDIO_FILES = True
+        factories, api_request, preferences):
+    preferences['common__api_authentication_required'] = True
     library_actor = actors.SYSTEM_ACTORS['library'].get_actor_instance()
     follow = factories['federation.Follow'](
         approved=True, target=library_actor)
@@ -58,8 +49,8 @@ def test_list_permission_protect_following_actor(
 
 
 def test_list_permission_protect_following_actor_not_approved(
-        factories, api_request, settings):
-    settings.PROTECT_AUDIO_FILES = True
+        factories, api_request, preferences):
+    preferences['common__api_authentication_required'] = True
     library_actor = actors.SYSTEM_ACTORS['library'].get_actor_instance()
     follow = factories['federation.Follow'](
         approved=False, target=library_actor)
diff --git a/api/tests/music/test_views.py b/api/tests/music/test_views.py
index 9328ba329..042c1f607 100644
--- a/api/tests/music/test_views.py
+++ b/api/tests/music/test_views.py
@@ -119,8 +119,8 @@ def test_album_view_filter_listenable(
 
 
 def test_can_serve_track_file_as_remote_library(
-        factories, authenticated_actor, settings, api_client):
-    settings.PROTECT_AUDIO_FILES = True
+        factories, authenticated_actor, api_client, settings, preferences):
+    preferences['common__api_authentication_required'] = True
     library_actor = actors.SYSTEM_ACTORS['library'].get_actor_instance()
     follow = factories['federation.Follow'](
         approved=True,
@@ -137,8 +137,8 @@ def test_can_serve_track_file_as_remote_library(
 
 
 def test_can_serve_track_file_as_remote_library_deny_not_following(
-        factories, authenticated_actor, settings, api_client):
-    settings.PROTECT_AUDIO_FILES = True
+        factories, authenticated_actor, settings, api_client, preferences):
+    preferences['common__api_authentication_required'] = True
     track_file = factories['music.TrackFile']()
     response = api_client.get(track_file.path)
 
@@ -152,12 +152,18 @@ def test_can_serve_track_file_as_remote_library_deny_not_following(
     ('nginx', '/app/music', '/_protected/music/hello/world.mp3'),
 ])
 def test_serve_file_in_place(
-        proxy, serve_path, expected, factories, api_client, settings):
+        proxy,
+        serve_path,
+        expected,
+        factories,
+        api_client,
+        preferences,
+        settings):
     headers = {
         'apache2': 'X-Sendfile',
         'nginx': 'X-Accel-Redirect',
     }
-    settings.PROTECT_AUDIO_FILES = False
+    preferences['common__api_authentication_required'] = False
     settings.PROTECT_FILE_PATH = '/_protected/music'
     settings.REVERSE_PROXY_TYPE = proxy
     settings.MUSIC_DIRECTORY_PATH = '/app/music'
@@ -179,8 +185,14 @@ def test_serve_file_in_place(
     ('nginx', '/app/music', '/_protected/music/hello/worldéà.mp3'),
 ])
 def test_serve_file_in_place_utf8(
-        proxy, serve_path, expected, factories, api_client, settings):
-    settings.PROTECT_AUDIO_FILES = False
+        proxy,
+        serve_path,
+        expected,
+        factories,
+        api_client,
+        settings,
+        preferences):
+    preferences['common__api_authentication_required'] = False
     settings.PROTECT_FILE_PATH = '/_protected/music'
     settings.REVERSE_PROXY_TYPE = proxy
     settings.MUSIC_DIRECTORY_PATH = '/app/music'
@@ -198,12 +210,18 @@ def test_serve_file_in_place_utf8(
     ('nginx', '/app/music', '/_protected/media/tracks/hello/world.mp3'),
 ])
 def test_serve_file_media(
-        proxy, serve_path, expected, factories, api_client, settings):
+        proxy,
+        serve_path,
+        expected,
+        factories,
+        api_client,
+        settings,
+        preferences):
     headers = {
         'apache2': 'X-Sendfile',
         'nginx': 'X-Accel-Redirect',
     }
-    settings.PROTECT_AUDIO_FILES = False
+    preferences['common__api_authentication_required'] = False
     settings.MEDIA_ROOT = '/host/media'
     settings.PROTECT_FILE_PATH = '/_protected/music'
     settings.REVERSE_PROXY_TYPE = proxy
@@ -220,8 +238,8 @@ def test_serve_file_media(
 
 
 def test_can_proxy_remote_track(
-        factories, settings, api_client, r_mock):
-    settings.PROTECT_AUDIO_FILES = False
+        factories, settings, api_client, r_mock, preferences):
+    preferences['common__api_authentication_required'] = False
     track_file = factories['music.TrackFile'](federation=True)
 
     r_mock.get(track_file.library_track.audio_url, body=io.BytesIO(b'test'))
@@ -236,8 +254,9 @@ def test_can_proxy_remote_track(
     assert library_track.audio_file.read() == b'test'
 
 
-def test_serve_updates_access_date(factories, settings, api_client):
-    settings.PROTECT_AUDIO_FILES = False
+def test_serve_updates_access_date(
+        factories, settings, api_client, preferences):
+    preferences['common__api_authentication_required'] = False
     track_file = factories['music.TrackFile']()
     now = timezone.now()
     assert track_file.accessed_date is None
diff --git a/changes/changelog.d/229.bugfix b/changes/changelog.d/229.bugfix
new file mode 100644
index 000000000..118ed6af2
--- /dev/null
+++ b/changes/changelog.d/229.bugfix
@@ -0,0 +1 @@
+Ensure anonymous users can use the app if the instance is configured accordingly (#229)
diff --git a/demo/setup.sh b/demo/setup.sh
index b96f517b3..e33bdf290 100644
--- a/demo/setup.sh
+++ b/demo/setup.sh
@@ -23,8 +23,6 @@ echo "DJANGO_SECRET_KEY=demo" >> .env
 echo "DJANGO_ALLOWED_HOSTS=demo.funkwhale.audio" >> .env
 echo "FUNKWHALE_VERSION=$version" >> .env
 echo "FUNKWHALE_API_PORT=5001" >> .env
-echo "FEDERATION_MUSIC_NEEDS_APPROVAL=False" >>.env
-echo "PROTECT_AUDIO_FILES=False" >> .env
 /usr/local/bin/docker-compose pull
 /usr/local/bin/docker-compose up -d postgres redis
 sleep 5

From ed6c1a9a5b2ce10d21053989db05398dd8222901 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 22:37:23 +0200
Subject: [PATCH 27/57] See #230: added an upload permission on user model

---
 api/funkwhale_api/users/admin.py              |  1 +
 .../migrations/0007_auto_20180524_2009.py     | 33 +++++++++++++++++++
 api/funkwhale_api/users/models.py             |  6 +++-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py

diff --git a/api/funkwhale_api/users/admin.py b/api/funkwhale_api/users/admin.py
index 7e9062a13..cb74abf0e 100644
--- a/api/funkwhale_api/users/admin.py
+++ b/api/funkwhale_api/users/admin.py
@@ -62,6 +62,7 @@ class UserAdmin(AuthUserAdmin):
                 'is_active',
                 'is_staff',
                 'is_superuser',
+                'permission_upload',
                 'permission_library',
                 'permission_settings',
                 'permission_federation')}),
diff --git a/api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py b/api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py
new file mode 100644
index 000000000..e3d582c53
--- /dev/null
+++ b/api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py
@@ -0,0 +1,33 @@
+# Generated by Django 2.0.4 on 2018-05-24 20:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0006_auto_20180517_2324'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='permission_upload',
+            field=models.BooleanField(default=False, verbose_name='Upload new content to the library'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='permission_federation',
+            field=models.BooleanField(default=False, help_text='Follow other instances, accept/deny library follow requests...', verbose_name='Manage library federation'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='permission_library',
+            field=models.BooleanField(default=False, help_text='Manage library', verbose_name='Manage library'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='permission_settings',
+            field=models.BooleanField(default=False, verbose_name='Manage instance-level settings'),
+        ),
+    ]
diff --git a/api/funkwhale_api/users/models.py b/api/funkwhale_api/users/models.py
index c16cd62b3..9e2a185c8 100644
--- a/api/funkwhale_api/users/models.py
+++ b/api/funkwhale_api/users/models.py
@@ -23,6 +23,7 @@ PERMISSIONS = [
     'federation',
     'library',
     'settings',
+    'upload',
 ]
 
 
@@ -52,11 +53,14 @@ class User(AbstractUser):
         default=False)
     permission_library = models.BooleanField(
         'Manage library',
-        help_text='Import new content, manage existing content',
+        help_text='Manage library',
         default=False)
     permission_settings = models.BooleanField(
         'Manage instance-level settings',
         default=False)
+    permission_upload = models.BooleanField(
+        'Upload new content to the library',
+        default=False)
 
     def __str__(self):
         return self.username

From dfb4f5f62a1af4ed137a2f99b5617edf027e2ad7 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 22:38:26 +0200
Subject: [PATCH 28/57] See #230: can now use "or" operator to check
 permissions

---
 api/funkwhale_api/users/models.py      |  7 +++++--
 api/funkwhale_api/users/permissions.py |  4 +++-
 api/tests/conftest.py                  |  3 ++-
 api/tests/users/test_models.py         | 15 ++++++++++++--
 api/tests/users/test_permissions.py    | 28 +++++++++++++++++++++++++-
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/api/funkwhale_api/users/models.py b/api/funkwhale_api/users/models.py
index 9e2a185c8..a739c1e38 100644
--- a/api/funkwhale_api/users/models.py
+++ b/api/funkwhale_api/users/models.py
@@ -72,9 +72,12 @@ class User(AbstractUser):
             perms[p] = v
         return perms
 
-    def has_permissions(self, *perms):
+    def has_permissions(self, *perms, operator='and'):
+        if operator not in ['and', 'or']:
+            raise ValueError('Invalid operator {}'.format(operator))
         permissions = self.get_permissions()
-        return all([permissions[p] for p in perms])
+        checker = all if operator == 'and' else any
+        return checker([permissions[p] for p in perms])
 
     def get_absolute_url(self):
         return reverse('users:detail', kwargs={'username': self.username})
diff --git a/api/funkwhale_api/users/permissions.py b/api/funkwhale_api/users/permissions.py
index 2ff49ff3f..146bc5e1c 100644
--- a/api/funkwhale_api/users/permissions.py
+++ b/api/funkwhale_api/users/permissions.py
@@ -16,4 +16,6 @@ class HasUserPermission(BasePermission):
             return False
         if request.user.is_anonymous:
             return False
-        return request.user.has_permissions(*view.required_permissions)
+        operator = getattr(view, 'permission_operator', 'and')
+        return request.user.has_permissions(
+            *view.required_permissions, operator=operator)
diff --git a/api/tests/conftest.py b/api/tests/conftest.py
index d6b1c0204..7caff2009 100644
--- a/api/tests/conftest.py
+++ b/api/tests/conftest.py
@@ -231,8 +231,9 @@ def authenticated_actor(factories, mocker):
 
 @pytest.fixture
 def assert_user_permission():
-    def inner(view, permissions):
+    def inner(view, permissions, operator='and'):
         assert HasUserPermission in view.permission_classes
+        assert getattr(view, 'permission_operator', 'and') == operator
         assert set(view.required_permissions) == set(permissions)
     return inner
 
diff --git a/api/tests/users/test_models.py b/api/tests/users/test_models.py
index 49199e0a7..445744802 100644
--- a/api/tests/users/test_models.py
+++ b/api/tests/users/test_models.py
@@ -47,6 +47,17 @@ def test_get_permissions_regular(factories):
     ({'permission_library': True}, ['library'], True),
     ({'permission_library': True}, ['library', 'federation'], False),
 ])
-def test_has_permissions(args, perms, expected, factories):
+def test_has_permissions_and(args, perms, expected, factories):
     user = factories['users.User'](**args)
-    assert user.has_permissions(*perms) is expected
+    assert user.has_permissions(*perms, operator='and') is expected
+
+
+@pytest.mark.parametrize('args,perms,expected', [
+    ({'is_superuser': True}, ['federation', 'library'], True),
+    ({'is_superuser': False}, ['federation'], False),
+    ({'permission_library': True}, ['library', 'federation'], True),
+    ({'permission_library': True}, ['federation'], False),
+])
+def test_has_permissions_or(args, perms, expected, factories):
+    user = factories['users.User'](**args)
+    assert user.has_permissions(*perms, operator='or') is expected
diff --git a/api/tests/users/test_permissions.py b/api/tests/users/test_permissions.py
index 1564c761d..518ccd1c8 100644
--- a/api/tests/users/test_permissions.py
+++ b/api/tests/users/test_permissions.py
@@ -39,7 +39,7 @@ def test_has_user_permission_logged_in_single(value, factories, api_request):
     (False, False, False),
     (True, True, True),
 ])
-def test_has_user_permission_logged_in_single(
+def test_has_user_permission_logged_in_multiple_and(
         federation, library, expected, factories, api_request):
     user = factories['users.User'](
         permission_federation=federation,
@@ -48,9 +48,35 @@ def test_has_user_permission_logged_in_single(
 
     class View(APIView):
         required_permissions = ['federation', 'library']
+        permission_operator = 'and'
     view = View()
     permission = permissions.HasUserPermission()
     request = api_request.get('/')
     setattr(request, 'user', user)
     result = permission.has_permission(request, view)
     assert result == user.has_permissions('federation', 'library') == expected
+
+
+@pytest.mark.parametrize('federation,library,expected', [
+    (True, False, True),
+    (False, True, True),
+    (False, False, False),
+    (True, True, True),
+])
+def test_has_user_permission_logged_in_multiple_or(
+        federation, library, expected, factories, api_request):
+    user = factories['users.User'](
+        permission_federation=federation,
+        permission_library=library,
+    )
+
+    class View(APIView):
+        required_permissions = ['federation', 'library']
+        permission_operator = 'or'
+    view = View()
+    permission = permissions.HasUserPermission()
+    request = api_request.get('/')
+    setattr(request, 'user', user)
+    result = permission.has_permission(request, view)
+    assert result == user.has_permissions(
+        'federation', 'library', operator='or') == expected

From 8d55040e9e2dc61ad3fc0d965ea333c8a8cfcc95 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 22:39:32 +0200
Subject: [PATCH 29/57] See #230: users with upload permission can now launch
 import and manage their own imports

---
 api/funkwhale_api/music/views.py         | 24 +++++++++++++++--
 api/tests/music/test_views.py            | 34 ++++++++++++++++++++----
 front/src/components/Sidebar.vue         |  9 ++++++-
 front/src/components/library/Library.vue | 10 ++++---
 4 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index aa07ad52c..d8b173b4f 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -91,12 +91,21 @@ class ImportBatchViewSet(
     )
     serializer_class = serializers.ImportBatchSerializer
     permission_classes = (HasUserPermission,)
-    required_permissions = ['library']
+    required_permissions = ['library', 'upload']
+    permission_operator = 'or'
     filter_class = filters.ImportBatchFilter
 
     def perform_create(self, serializer):
         serializer.save(submitted_by=self.request.user)
 
+    def get_queryset(self):
+        qs = super().get_queryset()
+        # if user do not have library permission, we limit to their
+        # own jobs
+        if not self.request.user.has_permissions('library'):
+            qs = qs.filter(submitted_by=self.request.user)
+        return qs
+
 
 class ImportJobViewSet(
         mixins.CreateModelMixin,
@@ -105,11 +114,22 @@ class ImportJobViewSet(
     queryset = (models.ImportJob.objects.all().select_related())
     serializer_class = serializers.ImportJobSerializer
     permission_classes = (HasUserPermission,)
-    required_permissions = ['library']
+    required_permissions = ['library', 'upload']
+    permission_operator = 'or'
     filter_class = filters.ImportJobFilter
 
+    def get_queryset(self):
+        qs = super().get_queryset()
+        # if user do not have library permission, we limit to their
+        # own jobs
+        if not self.request.user.has_permissions('library'):
+            qs = qs.filter(batch__submitted_by=self.request.user)
+        return qs
+
     @list_route(methods=['get'])
     def stats(self, request, *args, **kwargs):
+        if not request.user.has_permissions('library'):
+            return Response(status=403)
         qs = models.ImportJob.objects.all()
         filterset = filters.ImportJobFilter(request.GET, queryset=qs)
         qs = filterset.qs
diff --git a/api/tests/music/test_views.py b/api/tests/music/test_views.py
index 9328ba329..1fe113832 100644
--- a/api/tests/music/test_views.py
+++ b/api/tests/music/test_views.py
@@ -9,12 +9,12 @@ from funkwhale_api.music import views
 from funkwhale_api.federation import actors
 
 
-@pytest.mark.parametrize('view,permissions', [
-    (views.ImportBatchViewSet, ['library']),
-    (views.ImportJobViewSet, ['library']),
+@pytest.mark.parametrize('view,permissions,operator', [
+    (views.ImportBatchViewSet, ['library', 'upload'], 'or'),
+    (views.ImportJobViewSet, ['library', 'upload'], 'or'),
 ])
-def test_permissions(assert_user_permission, view, permissions):
-    assert_user_permission(view, permissions)
+def test_permissions(assert_user_permission, view, permissions, operator):
+    assert_user_permission(view, permissions, operator)
 
 
 def test_artist_list_serializer(api_request, factories, logged_in_api_client):
@@ -351,3 +351,27 @@ def test_import_batch_and_job_run_via_api(
 
     run.assert_any_call(import_job_id=job1.pk)
     run.assert_any_call(import_job_id=job2.pk)
+
+
+def test_import_job_viewset_get_queryset_upload_filters_user(
+        factories, logged_in_api_client):
+    logged_in_api_client.user.permission_upload = True
+    logged_in_api_client.user.save()
+
+    job = factories['music.ImportJob']()
+    url = reverse('api:v1:import-jobs-list')
+    response = logged_in_api_client.get(url)
+
+    assert response.data['count'] == 0
+
+
+def test_import_batch_viewset_get_queryset_upload_filters_user(
+        factories, logged_in_api_client):
+    logged_in_api_client.user.permission_upload = True
+    logged_in_api_client.user.save()
+
+    job = factories['music.ImportBatch']()
+    url = reverse('api:v1:import-batches-list')
+    response = logged_in_api_client.get(url)
+
+    assert response.data['count'] == 0
diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue
index 9f3134c2a..e8f330c38 100644
--- a/front/src/components/Sidebar.vue
+++ b/front/src/components/Sidebar.vue
@@ -68,6 +68,12 @@
                 :title="$t('Pending import requests')">
                 {{ notifications.importRequests }}</div>
             </router-link>
+            <router-link
+              class="item"
+              v-else-if="$store.state.auth.availablePermissions['upload']"
+              to="/library/import/launch">
+              <i class="download icon"></i>{{ $t('Import music') }}
+            </router-link>
             <router-link
               class="item"
               v-if="$store.state.auth.availablePermissions['federation']"
@@ -193,7 +199,8 @@ export default {
     showAdmin () {
       let adminPermissions = [
         this.$store.state.auth.availablePermissions['federation'],
-        this.$store.state.auth.availablePermissions['library']
+        this.$store.state.auth.availablePermissions['library'],
+        this.$store.state.auth.availablePermissions['upload']
       ]
       return adminPermissions.filter(e => {
         return e
diff --git a/front/src/components/library/Library.vue b/front/src/components/library/Library.vue
index e360ccb1c..50337b229 100644
--- a/front/src/components/library/Library.vue
+++ b/front/src/components/library/Library.vue
@@ -13,10 +13,10 @@
           exact>
           <i18next path="Requests"/>
         </router-link>
-        <router-link v-if="$store.state.auth.availablePermissions['library']" class="ui item" to="/library/import/launch" exact>
+        <router-link v-if="showImports" class="ui item" to="/library/import/launch" exact>
           <i18next path="Import"/>
         </router-link>
-        <router-link v-if="$store.state.auth.availablePermissions['library']" class="ui item" to="/library/import/batches">
+        <router-link v-if="showImports" class="ui item" to="/library/import/batches">
           <i18next path="Import batches"/>
         </router-link>
       </div>
@@ -27,7 +27,11 @@
 
 <script>
 export default {
-  name: 'library'
+  computed: {
+    showImports () {
+      return this.$store.state.auth.availablePermissions['upload'] || this.$store.state.auth.availablePermissions['library']
+    }
+  }
 }
 </script>
 

From 0314f786eaa0f5e672fcf06087d917168cc12dac Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 24 May 2018 22:47:01 +0200
Subject: [PATCH 30/57] Fix #230: changelog

---
 changes/changelog.d/230.enhancement | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 changes/changelog.d/230.enhancement

diff --git a/changes/changelog.d/230.enhancement b/changes/changelog.d/230.enhancement
new file mode 100644
index 000000000..3d8c4176f
--- /dev/null
+++ b/changes/changelog.d/230.enhancement
@@ -0,0 +1,22 @@
+Added a new "upload" permission that allows user to launch import and view
+their own imports (#230)
+
+New "upload" permission
+^^^^^^^^^^^^^^^^^^^^^^^
+
+This new permission is helpful if you want to give upload/import rights
+to some users, but don't want them to be able to manage the library as a whole:
+although there are no controls yet for managing library in the fron-end,
+subsequent release will introduce management interfaces for artists, files,
+etc.
+
+Because of that, users with the "library" permission will have much more power,
+and will also be able to remove content from the platform. On the other hand,
+users with the "upload" permission will only have the ability to add new
+content.
+
+Also, this release also includes a new feature called "default permissions":
+those are permissions that are granted to every users on the platform.
+On public/open instances, this will play well with the "upload" permission
+since everyone will be able to contribute to the instance library without
+an admin giving the permission to every single user.

From 2ef36928c6e6abea869ec374f0f0ea7991d1b70b Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 26 May 2018 11:47:12 +0200
Subject: [PATCH 31/57] See #236: added a basic string list preference

---
 api/funkwhale_api/common/preferences.py | 39 ++++++++++++++++++++++
 api/tests/common/test_preferences.py    | 44 +++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 api/tests/common/test_preferences.py

diff --git a/api/funkwhale_api/common/preferences.py b/api/funkwhale_api/common/preferences.py
index e6eb8beda..a2d3f04b7 100644
--- a/api/funkwhale_api/common/preferences.py
+++ b/api/funkwhale_api/common/preferences.py
@@ -1,4 +1,8 @@
 from django.conf import settings
+from django import forms
+
+from dynamic_preferences import serializers
+from dynamic_preferences import types
 from dynamic_preferences.registries import global_preferences_registry
 
 
@@ -10,3 +14,38 @@ class DefaultFromSettingMixin(object):
 def get(pref):
     manager = global_preferences_registry.manager()
     return manager[pref]
+
+
+class StringListSerializer(serializers.BaseSerializer):
+    separator = ','
+    sort = True
+
+    @classmethod
+    def to_db(cls, value, **kwargs):
+        if not value:
+            return
+
+        if type(value) not in [list, tuple]:
+            raise cls.exception(
+                "Cannot serialize, value {} is not a list or a tuple".format(
+                    value))
+
+        if cls.sort:
+            value = sorted(value)
+        return cls.separator.join(value)
+
+    @classmethod
+    def to_python(cls, value, **kwargs):
+        if not value:
+            return []
+        return value.split(',')
+
+
+class StringListPreference(types.BasePreferenceType):
+    serializer = StringListSerializer
+    field_class = forms.MultipleChoiceField
+
+    def get_api_additional_data(self):
+        d = super(StringListPreference, self).get_api_additional_data()
+        d['choices'] = self.get('choices')
+        return d
diff --git a/api/tests/common/test_preferences.py b/api/tests/common/test_preferences.py
new file mode 100644
index 000000000..475610a93
--- /dev/null
+++ b/api/tests/common/test_preferences.py
@@ -0,0 +1,44 @@
+import pytest
+
+from dynamic_preferences.registries import global_preferences_registry
+from funkwhale_api.common import preferences as common_preferences
+
+
+@pytest.fixture
+def string_list_pref(preferences):
+
+    @global_preferences_registry.register
+    class P(common_preferences.StringListPreference):
+        default = ['hello']
+        section = 'test'
+        name = 'string_list'
+    yield
+    del global_preferences_registry['test']['string_list']
+
+
+@pytest.mark.parametrize('input,output', [
+    (['a', 'b', 'c'], 'a,b,c'),
+    (['a', 'c', 'b'], 'a,b,c'),
+    (('a', 'c', 'b'), 'a,b,c'),
+    ([], None),
+])
+def test_string_list_serializer_to_db(input, output):
+    s = common_preferences.StringListSerializer.to_db(input) == output
+
+
+@pytest.mark.parametrize('input,output', [
+    ('a,b,c', ['a', 'b', 'c'], ),
+    (None, []),
+    ('', []),
+])
+def test_string_list_serializer_to_python(input, output):
+    s = common_preferences.StringListSerializer.to_python(input) == output
+
+
+def test_string_list_pref_default(string_list_pref, preferences):
+    assert preferences['test__string_list'] == ['hello']
+
+
+def test_string_list_pref_set(string_list_pref, preferences):
+    preferences['test__string_list'] = ['world', 'hello']
+    assert preferences['test__string_list'] == ['hello', 'world']

From a9799e66d72b9f344d3aa1da78c51f2ccf90a377 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 26 May 2018 12:45:55 +0200
Subject: [PATCH 32/57] See #236: backend for users default permissions

---
 .../users/dynamic_preferences_registry.py     | 24 ++++++++++
 api/funkwhale_api/users/models.py             | 48 ++++++++++++++-----
 api/tests/users/test_models.py                | 11 +++++
 3 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/api/funkwhale_api/users/dynamic_preferences_registry.py b/api/funkwhale_api/users/dynamic_preferences_registry.py
index 4f7360530..7108360b9 100644
--- a/api/funkwhale_api/users/dynamic_preferences_registry.py
+++ b/api/funkwhale_api/users/dynamic_preferences_registry.py
@@ -1,6 +1,10 @@
 from dynamic_preferences import types
 from dynamic_preferences.registries import global_preferences_registry
 
+from funkwhale_api.common import preferences as common_preferences
+
+from . import models
+
 users = types.Section('users')
 
 
@@ -14,3 +18,23 @@ class RegistrationEnabled(types.BooleanPreference):
     help_text = (
         'When enabled, new users will be able to register on this instance.'
     )
+
+
+@global_preferences_registry.register
+class DefaultPermissions(common_preferences.StringListPreference):
+    show_in_api = True
+    section = users
+    name = 'default_permissions'
+    default = []
+    verbose_name = 'Default permissions'
+    help_text = (
+        'A list of default preferences to give to all registered users.'
+    )
+    choices = [
+        (k, c['label'])
+        for k, c in models.PERMISSIONS_CONFIGURATION.items()
+    ]
+    field_kwargs = {
+        'choices': choices,
+        'required': False,
+    }
diff --git a/api/funkwhale_api/users/models.py b/api/funkwhale_api/users/models.py
index a739c1e38..a3c5bd0bf 100644
--- a/api/funkwhale_api/users/models.py
+++ b/api/funkwhale_api/users/models.py
@@ -13,18 +13,33 @@ from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 from funkwhale_api.common import fields
+from funkwhale_api.common import preferences
 
 
 def get_token():
     return binascii.b2a_hex(os.urandom(15)).decode('utf-8')
 
 
-PERMISSIONS = [
-    'federation',
-    'library',
-    'settings',
-    'upload',
-]
+PERMISSIONS_CONFIGURATION = {
+    'federation': {
+        'label': 'Manage library federation',
+        'help_text': 'Follow other instances, accept/deny library follow requests...',
+    },
+    'library': {
+        'label': 'Manage library',
+        'help_text': 'Manage library',
+    },
+    'settings': {
+        'label': 'Manage instance-level settings',
+        'help_text': '',
+    },
+    'upload': {
+        'label': 'Upload new content to the library',
+        'help_text': '',
+    },
+}
+
+PERMISSIONS = sorted(PERMISSIONS_CONFIGURATION.keys())
 
 
 @python_2_unicode_compatible
@@ -48,27 +63,34 @@ class User(AbstractUser):
 
     # permissions
     permission_federation = models.BooleanField(
-        'Manage library federation',
-        help_text='Follow other instances, accept/deny library follow requests...',
+        PERMISSIONS_CONFIGURATION['federation']['label'],
+        help_text=PERMISSIONS_CONFIGURATION['federation']['help_text'],
         default=False)
     permission_library = models.BooleanField(
-        'Manage library',
-        help_text='Manage library',
+        PERMISSIONS_CONFIGURATION['library']['label'],
+        help_text=PERMISSIONS_CONFIGURATION['library']['help_text'],
         default=False)
     permission_settings = models.BooleanField(
-        'Manage instance-level settings',
+        PERMISSIONS_CONFIGURATION['settings']['label'],
+        help_text=PERMISSIONS_CONFIGURATION['settings']['help_text'],
         default=False)
     permission_upload = models.BooleanField(
-        'Upload new content to the library',
+        PERMISSIONS_CONFIGURATION['upload']['label'],
+        help_text=PERMISSIONS_CONFIGURATION['upload']['help_text'],
         default=False)
 
     def __str__(self):
         return self.username
 
     def get_permissions(self):
+        defaults = preferences.get('users__default_permissions')
         perms = {}
         for p in PERMISSIONS:
-            v = self.is_superuser or getattr(self, 'permission_{}'.format(p))
+            v = (
+                self.is_superuser or
+                getattr(self, 'permission_{}'.format(p)) or
+                p in defaults
+            )
             perms[p] = v
         return perms
 
diff --git a/api/tests/users/test_models.py b/api/tests/users/test_models.py
index 445744802..42123b5e8 100644
--- a/api/tests/users/test_models.py
+++ b/api/tests/users/test_models.py
@@ -41,6 +41,17 @@ def test_get_permissions_regular(factories):
             assert perms[p] is False
 
 
+def test_get_permissions_default(factories, preferences):
+    preferences['users__default_permissions'] = ['upload', 'federation']
+    user = factories['users.User']()
+
+    perms = user.get_permissions()
+    assert perms['upload'] is True
+    assert perms['federation'] is True
+    assert perms['library'] is False
+    assert perms['settings'] is False
+
+
 @pytest.mark.parametrize('args,perms,expected', [
     ({'is_superuser': True}, ['federation', 'library'], True),
     ({'is_superuser': False}, ['federation'], False),

From 7ad19a3fbb58cb3aadefff86b400c3408796b16e Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 26 May 2018 12:46:13 +0200
Subject: [PATCH 33/57] Ensure 403 errors are probably handled on the front-end

---
 front/src/main.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/front/src/main.js b/front/src/main.js
index 2e92fbbd2..eb2e3a23d 100644
--- a/front/src/main.js
+++ b/front/src/main.js
@@ -81,6 +81,8 @@ axios.interceptors.response.use(function (response) {
   }
   if (error.response.status === 404) {
     error.backendErrors.push('Resource not found')
+  } else if (error.response.status === 403) {
+    error.backendErrors.push('Permission denied')
   } else if (error.response.status === 500) {
     error.backendErrors.push('A server error occured')
   } else if (error.response.data) {

From 67aef15aca5b1e6efa2494b75e878ef0da7b129d Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 26 May 2018 12:46:28 +0200
Subject: [PATCH 34/57] See #236: front-end to manage users default permissions

---
 front/src/components/admin/SettingsGroup.vue | 7 +++++++
 front/src/views/admin/Settings.vue           | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/front/src/components/admin/SettingsGroup.vue b/front/src/components/admin/SettingsGroup.vue
index 255f04488..f6d57c239 100644
--- a/front/src/components/admin/SettingsGroup.vue
+++ b/front/src/components/admin/SettingsGroup.vue
@@ -50,6 +50,13 @@
         <label :for="setting.identifier">{{ setting.verbose_name }}</label>
         <p v-if="setting.help_text">{{ setting.help_text }}</p>
       </div>
+      <select
+        v-else-if="setting.field.class === 'MultipleChoiceField'"
+        v-model="values[setting.identifier]"
+        multiple
+        class="ui search selection dropdown">
+        <option v-for="v in setting.additional_data.choices" :value="v[0]">{{ v[1] }}</option>
+      </select>
     </div>
     <button
       type="submit"
diff --git a/front/src/views/admin/Settings.vue b/front/src/views/admin/Settings.vue
index 81eb97aa6..10e32968d 100644
--- a/front/src/views/admin/Settings.vue
+++ b/front/src/views/admin/Settings.vue
@@ -51,12 +51,12 @@ export default {
         if (self.$store.state.route.hash) {
           self.scrollTo(self.$store.state.route.hash.substr(1))
         }
+        $('select.dropdown').dropdown()
       })
     })
   },
   methods: {
     scrollTo (id) {
-      console.log(id, 'hello')
       this.current = id
       document.getElementById(id).scrollIntoView()
     },
@@ -86,7 +86,8 @@ export default {
           id: 'users',
           settings: [
             'users__registration_enabled',
-            'common__api_authentication_required'
+            'common__api_authentication_required',
+            'users__default_permissions'
           ]
         },
         {

From e9fc220e19b05fb3d6ef0f3e225d8a40230314d6 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 26 May 2018 12:47:09 +0200
Subject: [PATCH 35/57] Fix #236: changelog

---
 changes/changelog.d/236.feature | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changes/changelog.d/236.feature

diff --git a/changes/changelog.d/236.feature b/changes/changelog.d/236.feature
new file mode 100644
index 000000000..379f9648e
--- /dev/null
+++ b/changes/changelog.d/236.feature
@@ -0,0 +1,2 @@
+Admins can now configure default permissions that will be granted to all
+registered users (#236)

From 06a5ee939a2c0d97193abca9cf60d7d5a65ae14a Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Sat, 26 May 2018 13:06:40 +0200
Subject: [PATCH 36/57] Changed ID3Tag for Track-Number to TRCK

Until now the ID3Tag for the Track-Number was read from TPOS.
The Problem is, that TPOS is the part of the set (eg disc number)
and not the track-number. TRCK is the correct tag for the track
number.

Fixes #220
---
 api/funkwhale_api/music/metadata.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 3aa643e56..5c8c065f5 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -67,7 +67,7 @@ VALIDATION = {
 
 CONF = {
     'OggVorbis': {
-        'getter': lambda f, k: f[k][0],
+        'getter': lambda f, k: f[kTr][0],
         'fields': {
             'track_number': {
                 'field': 'TRACKNUMBER',
@@ -132,7 +132,7 @@ CONF = {
         'getter': get_id3_tag,
         'fields': {
             'track_number': {
-                'field': 'TPOS',
+                'field': 'TRCK',
                 'to_application': convert_track_number
             },
             'title': {

From e478bb923e1bfac47bfbb813ea3161a1b3e8ff52 Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Sat, 26 May 2018 13:16:20 +0200
Subject: [PATCH 37/57] Improved Unit test

The tracknumber and the compilation number are now not identical
anymore
---
 api/tests/music/test.mp3         | Bin 297745 -> 297745 bytes
 api/tests/music/test_metadata.py |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/tests/music/test.mp3 b/api/tests/music/test.mp3
index 35a6e5fcef6fb272010c19534995393f840eafa7..8502de71b8284e9f30a397f58401d96fc42dbb17 100644
GIT binary patch
delta 581
zcmZvX!ArtW9LIlen;64DEQAi?Arj1k&Y<WN+7>L0Ew@BNg21qWxgonmhYlU2ZtIbq
zI(V&9c<9ijKcTz-L&uKU?@eif9UgC=&%W<{f6wd3ynd{#${RcYkaI9qGml@32;-k3
zoIwYg$fmAHxUEdJ<?AjuU_l#fa9N~KF5)J6Rq2`?&<vyyGg%2#z043x2>z1`Cc>m6
z2V0N>)@f>$`k&6D%)utpb*1v3){j`-l0VTtoWjL)SQ{Y1=4Ds1d8sYLvC1^Gd85x{
zM9kD`H8hEPl3;Y8$Vf@=Dapt%6h`!c^KlYQ(>0O~PG;z_keS6kpCRDA%Ve7#I%)bv
zq8tDnb@sxO^D64n!n9ZOGpkN2xS>U>q!r+$pXk|opsr9Q>4<9(pdWmScAN;!awkFH
z76S?TEJW!y-<a2J0>kyts}(UTyCr-e&IkG7z{&GBqT3T)f{Vk&zlpB!5)U`Kj@7nZ
PI&hXBKktMcjvN01{rr9p

delta 516
zcmbO@O=#jYAuUfAV`c^h2F47A5YG@JAd4Hw`Tx&}A(bJIA%!6%z|{~aC=L{ytj{DS
z782y_4dk-`v7x?6h@+1akflG-$51RJz&{u+V;JJ=>H_4+PM*prKe>j<nNfOj9-}Nr
zNJK;gP*{EPb4E=VCw1}{=5!dxeDXv#*~xdAWMBfVPywFF(^%s;LV|-`!N%?b8XL=^
zKAD|0Mj^z-F$5?Gakv44IfDU%5kp9@Kgc&QhjRlxg3N~*uQ}PDNgKv#2im1OS(_~e
zCZIW43RSjKB*Z@`5^k9h&?*B4v(3`%8#5>WW^&^S_76a^R5m2iH3(fX12hcE;U4Q_
z2~Z9R2nB_tAUN>77!nzBp%IV|Q|}8`e}q{L=0JD2U?H>8<|hSe%#%M9cr<gBv~!g(
l0x=U1GjHcAVOcH4{-mfNGbg`f^1}j==@+_K?3oz<0{}{fdZGXT

diff --git a/api/tests/music/test_metadata.py b/api/tests/music/test_metadata.py
index bacec07fb..9f9c93984 100644
--- a/api/tests/music/test_metadata.py
+++ b/api/tests/music/test_metadata.py
@@ -43,10 +43,10 @@ def test_can_get_metadata_from_ogg_theora_file(field, value):
 
 @pytest.mark.parametrize('field,value', [
     ('title', 'Bend'),
-    ('artist', 'Binärpilot'),
+    ('artist', 'Bindrpilot'),
     ('album', 'You Can\'t Stop Da Funk'),
     ('date', datetime.date(2006, 2, 7)),
-    ('track_number', 1),
+    ('track_number', 2),
     ('musicbrainz_albumid', uuid.UUID('ce40cdb1-a562-4fd8-a269-9269f98d4124')),
     ('musicbrainz_recordingid', uuid.UUID('f269d497-1cc0-4ae4-a0c4-157ec7d73fcb')),
     ('musicbrainz_artistid', uuid.UUID('9c6bddde-6228-4d9f-ad0d-03f6fcb19e13')),

From 737063946a770da1a26a9d7e16f3eec7f9eb334f Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Sat, 26 May 2018 13:18:18 +0200
Subject: [PATCH 38/57] Added Changelog

---
 changes/changelog.d/220.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/changelog.d/220.bugfix

diff --git a/changes/changelog.d/220.bugfix b/changes/changelog.d/220.bugfix
new file mode 100644
index 000000000..1913df1bd
--- /dev/null
+++ b/changes/changelog.d/220.bugfix
@@ -0,0 +1 @@
+Read ID3Tag Tracknumber from TRCK (#220)

From 8790631a65bd409e6f48be41a24c5cbc0da5e84d Mon Sep 17 00:00:00 2001
From: David Magnus Henriques <eorl@bruder.space>
Date: Sat, 26 May 2018 13:23:08 +0200
Subject: [PATCH 39/57] Removed Typo which broke oggVorbis-import

---
 api/funkwhale_api/music/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 5c8c065f5..522c64c85 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -67,7 +67,7 @@ VALIDATION = {
 
 CONF = {
     'OggVorbis': {
-        'getter': lambda f, k: f[kTr][0],
+        'getter': lambda f, k: f[k][0],
         'fields': {
             'track_number': {
                 'field': 'TRACKNUMBER',

From 2569f136b78a77cd10ee39155c8320f780d520fc Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 28 May 2018 22:17:36 +0200
Subject: [PATCH 40/57] Fix #241: autoremove media files on model instance
 deletion

---
 api/config/settings/common.py       | 1 +
 api/requirements/base.txt           | 1 +
 changes/changelog.d/241.enhancement | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 changes/changelog.d/241.enhancement

diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index f376781b0..50c62e9d5 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -97,6 +97,7 @@ THIRD_PARTY_APPS = (
     'dynamic_preferences',
     'django_filters',
     'cacheops',
+    'django_cleanup',
 )
 
 
diff --git a/api/requirements/base.txt b/api/requirements/base.txt
index d88483de4..13c0efdbc 100644
--- a/api/requirements/base.txt
+++ b/api/requirements/base.txt
@@ -65,3 +65,4 @@ cryptography>=2,<3
 # requests-http-signature==0.0.3
 # clone until the branch is merged and released upstream
 git+https://github.com/EliotBerriot/requests-http-signature.git@signature-header-support
+django-cleanup==2.1.0
diff --git a/changes/changelog.d/241.enhancement b/changes/changelog.d/241.enhancement
new file mode 100644
index 000000000..00c84c497
--- /dev/null
+++ b/changes/changelog.d/241.enhancement
@@ -0,0 +1 @@
+Autoremove media files on model instance deletion (#241)

From c7782693bca3aeddcceeba932dd30a4e8bd79233 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 00:07:20 +0200
Subject: [PATCH 41/57] See #223: api for listing/managing library files

---
 api/config/api_urls.py                  |  4 ++
 api/funkwhale_api/manage/__init__.py    |  3 +
 api/funkwhale_api/manage/filters.py     | 25 ++++++++
 api/funkwhale_api/manage/serializers.py | 81 +++++++++++++++++++++++++
 api/funkwhale_api/manage/urls.py        | 11 ++++
 api/funkwhale_api/manage/views.py       | 49 +++++++++++++++
 api/funkwhale_api/music/factories.py    |  5 ++
 api/tests/manage/__init__.py            |  0
 api/tests/manage/test_serializers.py    | 10 +++
 api/tests/manage/test_views.py          | 25 ++++++++
 10 files changed, 213 insertions(+)
 create mode 100644 api/funkwhale_api/manage/__init__.py
 create mode 100644 api/funkwhale_api/manage/filters.py
 create mode 100644 api/funkwhale_api/manage/serializers.py
 create mode 100644 api/funkwhale_api/manage/urls.py
 create mode 100644 api/funkwhale_api/manage/views.py
 create mode 100644 api/tests/manage/__init__.py
 create mode 100644 api/tests/manage/test_serializers.py
 create mode 100644 api/tests/manage/test_views.py

diff --git a/api/config/api_urls.py b/api/config/api_urls.py
index e75781d14..98b863a93 100644
--- a/api/config/api_urls.py
+++ b/api/config/api_urls.py
@@ -38,6 +38,10 @@ v1_patterns += [
         include(
             ('funkwhale_api.instance.urls', 'instance'),
             namespace='instance')),
+    url(r'^manage/',
+        include(
+            ('funkwhale_api.manage.urls', 'manage'),
+            namespace='manage')),
     url(r'^federation/',
         include(
             ('funkwhale_api.federation.api_urls', 'federation'),
diff --git a/api/funkwhale_api/manage/__init__.py b/api/funkwhale_api/manage/__init__.py
new file mode 100644
index 000000000..03e091e5c
--- /dev/null
+++ b/api/funkwhale_api/manage/__init__.py
@@ -0,0 +1,3 @@
+"""
+App that includes all views/serializers and stuff for management API
+"""
diff --git a/api/funkwhale_api/manage/filters.py b/api/funkwhale_api/manage/filters.py
new file mode 100644
index 000000000..9853b7a61
--- /dev/null
+++ b/api/funkwhale_api/manage/filters.py
@@ -0,0 +1,25 @@
+from django.db.models import Count
+
+from django_filters import rest_framework as filters
+
+from funkwhale_api.common import fields
+from funkwhale_api.music import models as music_models
+
+
+class ManageTrackFileFilterSet(filters.FilterSet):
+    q = fields.SearchFilter(search_fields=[
+        'track__title',
+        'track__album__title',
+        'track__artist__name',
+        'source',
+    ])
+
+    class Meta:
+        model = music_models.TrackFile
+        fields = [
+            'q',
+            'track__album',
+            'track__artist',
+            'track',
+            'library_track'
+        ]
diff --git a/api/funkwhale_api/manage/serializers.py b/api/funkwhale_api/manage/serializers.py
new file mode 100644
index 000000000..bbd393236
--- /dev/null
+++ b/api/funkwhale_api/manage/serializers.py
@@ -0,0 +1,81 @@
+from django.db import transaction
+from rest_framework import serializers
+
+from funkwhale_api.common import serializers as common_serializers
+from funkwhale_api.music import models as music_models
+
+from . import filters
+
+
+class ManageTrackFileArtistSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = music_models.Artist
+        fields = [
+            'id',
+            'mbid',
+            'creation_date',
+            'name',
+        ]
+
+
+class ManageTrackFileAlbumSerializer(serializers.ModelSerializer):
+    artist = ManageTrackFileArtistSerializer()
+
+    class Meta:
+        model = music_models.Album
+        fields = (
+            'id',
+            'mbid',
+            'title',
+            'artist',
+            'release_date',
+            'cover',
+            'creation_date',
+        )
+
+
+class ManageTrackFileTrackSerializer(serializers.ModelSerializer):
+    artist = ManageTrackFileArtistSerializer()
+    album = ManageTrackFileAlbumSerializer()
+
+    class Meta:
+        model = music_models.Track
+        fields = (
+            'id',
+            'mbid',
+            'title',
+            'album',
+            'artist',
+            'creation_date',
+            'position',
+        )
+
+
+class ManageTrackFileSerializer(serializers.ModelSerializer):
+    track = ManageTrackFileTrackSerializer()
+
+    class Meta:
+        model = music_models.TrackFile
+        fields = (
+            'id',
+            'path',
+            'source',
+            'filename',
+            'mimetype',
+            'track',
+            'duration',
+            'mimetype',
+            'bitrate',
+            'size',
+            'path',
+            'library_track',
+        )
+
+
+class ManageTrackFileActionSerializer(common_serializers.ActionSerializer):
+    actions = ['delete']
+    filterset_class = filters.ManageTrackFileFilterSet
+
+    @transaction.atomic
+    def handle_delete(self, objects):
+        return objects.delete()
diff --git a/api/funkwhale_api/manage/urls.py b/api/funkwhale_api/manage/urls.py
new file mode 100644
index 000000000..c434581ec
--- /dev/null
+++ b/api/funkwhale_api/manage/urls.py
@@ -0,0 +1,11 @@
+from django.conf.urls import include, url
+from . import views
+
+from rest_framework import routers
+library_router = routers.SimpleRouter()
+library_router.register(r'track-files', views.ManageTrackFileViewSet, 'track-files')
+
+urlpatterns = [
+    url(r'^library/',
+        include((library_router.urls, 'instance'), namespace='library')),
+]
diff --git a/api/funkwhale_api/manage/views.py b/api/funkwhale_api/manage/views.py
new file mode 100644
index 000000000..74059caa1
--- /dev/null
+++ b/api/funkwhale_api/manage/views.py
@@ -0,0 +1,49 @@
+from rest_framework import mixins
+from rest_framework import response
+from rest_framework import viewsets
+from rest_framework.decorators import list_route
+
+from funkwhale_api.music import models as music_models
+from funkwhale_api.users.permissions import HasUserPermission
+
+from . import filters
+from . import serializers
+
+
+class ManageTrackFileViewSet(
+        mixins.ListModelMixin,
+        mixins.RetrieveModelMixin,
+        mixins.DestroyModelMixin,
+        viewsets.GenericViewSet):
+    queryset = (
+        music_models.TrackFile.objects.all()
+            .select_related(
+                'track__artist',
+                'track__album__artist',
+                'library_track')
+            .order_by('-id')
+    )
+    serializer_class = serializers.ManageTrackFileSerializer
+    filter_class = filters.ManageTrackFileFilterSet
+    permission_classes = (HasUserPermission,)
+    required_permissions = ['library']
+    ordering_fields = [
+        'accessed_date',
+        'modification_date',
+        'creation_date',
+        'track__artist__name',
+        'bitrate',
+        'size',
+        'duration',
+    ]
+
+    @list_route(methods=['post'])
+    def action(self, request, *args, **kwargs):
+        queryset = self.get_queryset()
+        serializer = serializers.ManageTrackFileActionSerializer(
+            request.data,
+            queryset=queryset,
+        )
+        serializer.is_valid(raise_exception=True)
+        result = serializer.save()
+        return response.Response(result, status=200)
diff --git a/api/funkwhale_api/music/factories.py b/api/funkwhale_api/music/factories.py
index 412e2f798..11423f5b0 100644
--- a/api/funkwhale_api/music/factories.py
+++ b/api/funkwhale_api/music/factories.py
@@ -117,6 +117,11 @@ class ImportJobFactory(factory.django.DjangoModelFactory):
             status='finished',
             audio_file=None,
         )
+        with_audio_file = factory.Trait(
+            status='finished',
+            audio_file=factory.django.FileField(
+                from_path=os.path.join(SAMPLES_PATH, 'test.ogg')),
+        )
 
 
 @registry.register(name='music.FileImportJob')
diff --git a/api/tests/manage/__init__.py b/api/tests/manage/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/api/tests/manage/test_serializers.py b/api/tests/manage/test_serializers.py
new file mode 100644
index 000000000..45167722c
--- /dev/null
+++ b/api/tests/manage/test_serializers.py
@@ -0,0 +1,10 @@
+from funkwhale_api.manage import serializers
+
+
+def test_manage_track_file_action_delete(factories):
+    tfs = factories['music.TrackFile'](size=5)
+    s = serializers.ManageTrackFileActionSerializer(queryset=None)
+
+    s.handle_delete(tfs.__class__.objects.all())
+
+    assert tfs.__class__.objects.count() == 0
diff --git a/api/tests/manage/test_views.py b/api/tests/manage/test_views.py
new file mode 100644
index 000000000..0507e6c11
--- /dev/null
+++ b/api/tests/manage/test_views.py
@@ -0,0 +1,25 @@
+import pytest
+
+from django.urls import reverse
+
+from funkwhale_api.manage import serializers
+from funkwhale_api.manage import views
+
+
+@pytest.mark.parametrize('view,permissions,operator', [
+    (views.ManageTrackFileViewSet, ['library'], 'and'),
+])
+def test_permissions(assert_user_permission, view, permissions, operator):
+    assert_user_permission(view, permissions, operator)
+
+
+def test_track_file_view(factories, superuser_api_client):
+    tfs = factories['music.TrackFile'].create_batch(size=5)
+    qs = tfs[0].__class__.objects.order_by('-creation_date')
+    url = reverse('api:v1:manage:library:track-files-list')
+
+    response = superuser_api_client.get(url, {'sort': '-creation_date'})
+    expected = serializers.ManageTrackFileSerializer(qs, many=True).data
+
+    assert response.data['count'] == len(tfs)
+    assert response.data['results'] == expected

From 7df9112d551a77776a281755a73abc1c1f44fbc4 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 00:07:38 +0200
Subject: [PATCH 42/57] See #223: front-end to browse/manage library files

---
 front/src/components/Sidebar.vue              |   6 +
 .../components/manage/library/FilesTable.vue  | 205 ++++++++++++++++++
 front/src/router/index.js                     |  13 ++
 front/src/views/admin/library/Base.vue        |  28 +++
 front/src/views/admin/library/FilesList.vue   |  23 ++
 5 files changed, 275 insertions(+)
 create mode 100644 front/src/components/manage/library/FilesTable.vue
 create mode 100644 front/src/views/admin/library/Base.vue
 create mode 100644 front/src/views/admin/library/FilesList.vue

diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue
index e8f330c38..72c55847f 100644
--- a/front/src/components/Sidebar.vue
+++ b/front/src/components/Sidebar.vue
@@ -68,6 +68,12 @@
                 :title="$t('Pending import requests')">
                 {{ notifications.importRequests }}</div>
             </router-link>
+            <router-link
+              class="item"
+              v-if="$store.state.auth.availablePermissions['library']"
+              :to="{name: 'manage.library.files'}">
+              <i class="book icon"></i>{{ $t('Library') }}
+            </router-link>
             <router-link
               class="item"
               v-else-if="$store.state.auth.availablePermissions['upload']"
diff --git a/front/src/components/manage/library/FilesTable.vue b/front/src/components/manage/library/FilesTable.vue
new file mode 100644
index 000000000..7d230cc85
--- /dev/null
+++ b/front/src/components/manage/library/FilesTable.vue
@@ -0,0 +1,205 @@
+<template>
+  <div>
+    <div class="ui inline form">
+      <div class="fields">
+        <div class="ui field">
+          <label>{{ $t('Search') }}</label>
+          <input type="text" v-model="search" placeholder="Search by title, artist, domain..." />
+        </div>
+        <div class="field">
+          <i18next tag="label" path="Ordering"/>
+          <select class="ui dropdown" v-model="ordering">
+            <option v-for="option in orderingOptions" :value="option[0]">
+              {{ option[1] }}
+            </option>
+          </select>
+        </div>
+        <div class="field">
+          <i18next tag="label" path="Ordering direction"/>
+          <select class="ui dropdown" v-model="orderingDirection">
+            <option value="+">Ascending</option>
+            <option value="-">Descending</option>
+          </select>
+        </div>
+      </div>
+      </div>
+    <div class="dimmable">
+      <div v-if="isLoading" class="ui active inverted dimmer">
+          <div class="ui loader"></div>
+      </div>
+      <action-table
+        v-if="result"
+        @action-launched="fetchData"
+        :objects-data="result"
+        :actions="actions"
+        :action-url="'manage/library/track-files/action/'"
+        :filters="actionFilters">
+        <template slot="header-cells">
+          <th>{{ $t('Title') }}</th>
+          <th>{{ $t('Artist') }}</th>
+          <th>{{ $t('Album') }}</th>
+          <th>{{ $t('Import date') }}</th>
+          <th>{{ $t('Type') }}</th>
+          <th>{{ $t('Bitrate') }}</th>
+          <th>{{ $t('Duration') }}</th>
+          <th>{{ $t('Size') }}</th>
+        </template>
+        <template slot="row-cells" slot-scope="scope">
+          <td>
+            <span :title="scope.obj.track.title">{{ scope.obj.track.title|truncate(30) }}</span>
+          </td>
+          <td>
+            <span :title="scope.obj.track.artist.name">{{ scope.obj.track.artist.name|truncate(30) }}</span>
+          </td>
+          <td>
+            <span :title="scope.obj.track.album.title">{{ scope.obj.track.album.title|truncate(20) }}</span>
+          </td>
+          <td>
+            <human-date :date="scope.obj.creation_date"></human-date>
+          </td>
+          <td v-if="scope.obj.audio_mimetype">
+            {{ scope.obj.audio_mimetype }}
+          </td>
+          <td v-else>
+            {{ $t('N/A') }}
+          </td>
+          <td v-if="scope.obj.bitrate">
+            {{ scope.obj.bitrate | humanSize }}/s
+          </td>
+          <td v-else>
+            {{ $t('N/A') }}
+          </td>
+          <td v-if="scope.obj.duration">
+            {{ time.parse(scope.obj.duration) }}
+          </td>
+          <td v-else>
+            {{ $t('N/A') }}
+          </td>
+          <td v-if="scope.obj.size">
+            {{ scope.obj.size | humanSize }}
+          </td>
+          <td v-else>
+            {{ $t('N/A') }}
+          </td>
+        </template>
+      </action-table>
+    </div>
+    <div>
+      <pagination
+        v-if="result && result.results.length > 0"
+        @page-changed="selectPage"
+        :compact="true"
+        :current="page"
+        :paginate-by="paginateBy"
+        :total="result.count"
+        ></pagination>
+
+      <span v-if="result && result.results.length > 0">
+        {{ $t('Showing results {%start%}-{%end%} on {%total%}', {start: ((page-1) * paginateBy) + 1 , end: ((page-1) * paginateBy) + result.results.length, total: result.count})}}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import _ from 'lodash'
+import time from '@/utils/time'
+import Pagination from '@/components/Pagination'
+import ActionTable from '@/components/common/ActionTable'
+import OrderingMixin from '@/components/mixins/Ordering'
+
+export default {
+  mixins: [OrderingMixin],
+  props: {
+    filters: {type: Object, required: false}
+  },
+  components: {
+    Pagination,
+    ActionTable
+  },
+  data () {
+    let defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
+    return {
+      time,
+      isLoading: false,
+      result: null,
+      page: 1,
+      paginateBy: 25,
+      search: '',
+      orderingDirection: defaultOrdering.direction || '+',
+      ordering: defaultOrdering.field,
+      orderingOptions: [
+        ['creation_date', 'Creation date'],
+        ['accessed_date', 'Accessed date'],
+        ['modification_date', 'Modification date'],
+        ['size', 'Size'],
+        ['bitrate', 'Bitrate'],
+        ['duration', 'Duration']
+      ]
+
+    }
+  },
+  created () {
+    this.fetchData()
+  },
+  methods: {
+    fetchData () {
+      let params = _.merge({
+        'page': this.page,
+        'page_size': this.paginateBy,
+        'q': this.search,
+        'ordering': this.getOrderingAsString()
+      }, this.filters)
+      let self = this
+      self.isLoading = true
+      self.checked = []
+      axios.get('/manage/library/track-files/', {params: params}).then((response) => {
+        self.result = response.data
+        self.isLoading = false
+      }, error => {
+        self.isLoading = false
+        self.errors = error.backendErrors
+      })
+    },
+    selectPage: function (page) {
+      this.page = page
+    }
+  },
+  computed: {
+    actionFilters () {
+      var currentFilters = {
+        q: this.search
+      }
+      if (this.filters) {
+        return _.merge(currentFilters, this.filters)
+      } else {
+        return currentFilters
+      }
+    },
+    actions () {
+      return [
+        {
+          name: 'delete',
+          label: this.$t('Delete')
+        }
+      ]
+    }
+  },
+  watch: {
+    search (newValue) {
+      this.page = 1
+      this.fetchData()
+    },
+    page () {
+      this.fetchData()
+    },
+    ordering () {
+      this.fetchData()
+    },
+    orderingDirection () {
+      this.fetchData()
+    }
+  }
+}
+</script>
diff --git a/front/src/router/index.js b/front/src/router/index.js
index f71dab7f9..a52070e35 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -29,6 +29,8 @@ import PlaylistDetail from '@/views/playlists/Detail'
 import PlaylistList from '@/views/playlists/List'
 import Favorites from '@/components/favorites/List'
 import AdminSettings from '@/views/admin/Settings'
+import AdminLibraryBase from '@/views/admin/library/Base'
+import AdminLibraryFilesList from '@/views/admin/library/FilesList'
 import FederationBase from '@/views/federation/Base'
 import FederationScan from '@/views/federation/Scan'
 import FederationLibraryDetail from '@/views/federation/LibraryDetail'
@@ -167,6 +169,17 @@ export default new Router({
         { path: 'libraries/:id', name: 'federation.libraries.detail', component: FederationLibraryDetail, props: true }
       ]
     },
+    {
+      path: '/manage/library',
+      component: AdminLibraryBase,
+      children: [
+        {
+          path: 'files',
+          name: 'manage.library.files',
+          component: AdminLibraryFilesList
+        }
+      ]
+    },
     {
       path: '/library',
       component: Library,
diff --git a/front/src/views/admin/library/Base.vue b/front/src/views/admin/library/Base.vue
new file mode 100644
index 000000000..834fca920
--- /dev/null
+++ b/front/src/views/admin/library/Base.vue
@@ -0,0 +1,28 @@
+<template>
+  <div class="main pusher"  v-title="'Manage library'">
+    <div class="ui secondary pointing menu">
+      <router-link
+        class="ui item"
+        :to="{name: 'manage.library.files'}">{{ $t('Files') }}</router-link>
+    </div>
+    <router-view :key="$route.fullPath"></router-view>
+  </div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style lang="scss">
+@import '../../../style/vendor/media';
+
+.main.pusher > .ui.secondary.menu {
+  @include media(">tablet") {
+    margin: 0 2.5rem;
+  }
+  .item {
+    padding-top: 1.5em;
+    padding-bottom: 1.5em;
+  }
+}
+</style>
diff --git a/front/src/views/admin/library/FilesList.vue b/front/src/views/admin/library/FilesList.vue
new file mode 100644
index 000000000..9c52de576
--- /dev/null
+++ b/front/src/views/admin/library/FilesList.vue
@@ -0,0 +1,23 @@
+<template>
+  <div v-title="'Files'">
+    <div class="ui vertical stripe segment">
+      <h2 class="ui header">{{ $t('Library files') }}</h2>
+      <div class="ui hidden divider"></div>
+      <library-files-table :show-library="true"></library-files-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import LibraryFilesTable from '@/components/manage/library/FilesTable'
+
+export default {
+  components: {
+    LibraryFilesTable
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+</style>

From 62cd1df248d59677083f41e179ea8aadd79cf660 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 18:12:46 +0200
Subject: [PATCH 43/57] Fix #249: Added missing subsonic configuration block in
 deployment vhost files

---
 changes/changelog.d/249.doc | 26 ++++++++++++++++++++++++++
 deploy/apache.conf          |  6 ++++++
 deploy/nginx.conf           |  6 ++++++
 3 files changed, 38 insertions(+)
 create mode 100644 changes/changelog.d/249.doc

diff --git a/changes/changelog.d/249.doc b/changes/changelog.d/249.doc
new file mode 100644
index 000000000..df0fbb7d1
--- /dev/null
+++ b/changes/changelog.d/249.doc
@@ -0,0 +1,26 @@
+Added missing subsonic configuration block in deployment vhost files (#249)
+
+Missing subsonic configuration bloc in vhost files
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Because of a missing bloc in the sample Nginx and Apache configurations,
+instances that were deployed after the 0.13 release are likely to be unable
+to answer to Subsonic clients (the missing bits were properly documented
+in the changelog).
+
+Ensure you have the following snippets in your Nginx or Apache configuration
+if you plan to use the Subsonic API.
+
+Nginx::
+
+    location /rest/ {
+        include /etc/nginx/funkwhale_proxy.conf;
+        proxy_pass   http://funkwhale-api/api/subsonic/rest/;
+    }
+
+Apache2::
+
+    <Location "/rest">
+        ProxyPass ${funkwhale-api}/api/subsonic/rest
+        ProxyPassReverse ${funkwhale-api}/api/subsonic/rest
+     </Location>
diff --git a/deploy/apache.conf b/deploy/apache.conf
index 5bfcbce04..5b74efecd 100644
--- a/deploy/apache.conf
+++ b/deploy/apache.conf
@@ -84,6 +84,12 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
       ProxyPassReverse ${funkwhale-api}/federation
    </Location>
 
+   # You can comment this if you don't plan to use the Subsonic API
+   <Location "/rest">
+      ProxyPass ${funkwhale-api}/api/subsonic/rest
+      ProxyPassReverse ${funkwhale-api}/api/subsonic/rest
+   </Location>
+
    <Location "/.well-known/">
       ProxyPass ${funkwhale-api}/.well-known/
       ProxyPassReverse ${funkwhale-api}/.well-known/
diff --git a/deploy/nginx.conf b/deploy/nginx.conf
index 7d344408b..5314d9017 100644
--- a/deploy/nginx.conf
+++ b/deploy/nginx.conf
@@ -67,6 +67,12 @@ server {
         proxy_pass   http://funkwhale-api/federation/;
     }
 
+    # You can comment this if you do not plan to use the Subsonic API
+    location /rest/ {
+        include /etc/nginx/funkwhale_proxy.conf;
+        proxy_pass   http://funkwhale-api/api/subsonic/rest/;
+    }
+
     location /.well-known/ {
         include /etc/nginx/funkwhale_proxy.conf;
         proxy_pass   http://funkwhale-api/.well-known/;

From 7b84a988fdeee4a5002ccecf91a9b569cbc4a649 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 21:55:00 +0200
Subject: [PATCH 44/57] See #223: dangerous actions can now prevent executing
 an action on all objects

---
 api/funkwhale_api/common/serializers.py |  7 +++++
 api/tests/common/test_serializers.py    | 36 +++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/api/funkwhale_api/common/serializers.py b/api/funkwhale_api/common/serializers.py
index 62d9c567e..a995cc360 100644
--- a/api/funkwhale_api/common/serializers.py
+++ b/api/funkwhale_api/common/serializers.py
@@ -12,6 +12,9 @@ class ActionSerializer(serializers.Serializer):
     filters = serializers.DictField(required=False)
     actions = None
     filterset_class = None
+    # those are actions identifier where we don't want to allow the "all"
+    # selector because it's to dangerous. Like object deletion.
+    dangerous_actions = []
 
     def __init__(self, *args, **kwargs):
         self.queryset = kwargs.pop('queryset')
@@ -49,6 +52,10 @@ class ActionSerializer(serializers.Serializer):
             'list of identifiers or the string "all".'.format(value))
 
     def validate(self, data):
+        dangerous = data['action'] in self.dangerous_actions
+        if dangerous and self.initial_data['objects'] == 'all':
+            raise serializers.ValidationError(
+                'This action is to dangerous to be applied to all objects')
         if self.filterset_class and 'filters' in data:
             qs_filterset = self.filterset_class(
                 data['filters'], queryset=data['objects'])
diff --git a/api/tests/common/test_serializers.py b/api/tests/common/test_serializers.py
index 563676556..f0f5fb7e6 100644
--- a/api/tests/common/test_serializers.py
+++ b/api/tests/common/test_serializers.py
@@ -18,6 +18,17 @@ class TestSerializer(serializers.ActionSerializer):
         return {'hello': 'world'}
 
 
+class TestDangerousSerializer(serializers.ActionSerializer):
+    actions = ['test', 'test_dangerous']
+    dangerous_actions = ['test_dangerous']
+
+    def handle_test(self, objects):
+        pass
+
+    def handle_test_dangerous(self, objects):
+        pass
+
+
 def test_action_serializer_validates_action():
     data = {'objects': 'all', 'action': 'nope'}
     serializer = TestSerializer(data, queryset=models.User.objects.none())
@@ -98,3 +109,28 @@ def test_action_serializers_validates_at_least_one_object():
 
     assert serializer.is_valid() is False
     assert 'non_field_errors' in serializer.errors
+
+
+def test_dangerous_actions_refuses_all(factories):
+    factories['users.User']()
+    data = {
+        'objects': 'all',
+        'action': 'test_dangerous',
+    }
+    serializer = TestDangerousSerializer(
+        data, queryset=models.User.objects.all())
+
+    assert serializer.is_valid() is False
+    assert 'non_field_errors' in serializer.errors
+
+
+def test_dangerous_actions_refuses_not_listed(factories):
+    factories['users.User']()
+    data = {
+        'objects': 'all',
+        'action': 'test',
+    }
+    serializer = TestDangerousSerializer(
+        data, queryset=models.User.objects.all())
+
+    assert serializer.is_valid() is True

From 256d98b77d7cf6e490b9950ea54a84ad99c544d2 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 22:22:51 +0200
Subject: [PATCH 45/57] See #223: delete actions is now dangerous anc cannot be
 applied to all files

---
 api/funkwhale_api/manage/serializers.py            | 1 +
 front/src/components/common/ActionTable.vue        | 4 ++--
 front/src/components/manage/library/FilesTable.vue | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/funkwhale_api/manage/serializers.py b/api/funkwhale_api/manage/serializers.py
index bbd393236..02300ec06 100644
--- a/api/funkwhale_api/manage/serializers.py
+++ b/api/funkwhale_api/manage/serializers.py
@@ -74,6 +74,7 @@ class ManageTrackFileSerializer(serializers.ModelSerializer):
 
 class ManageTrackFileActionSerializer(common_serializers.ActionSerializer):
     actions = ['delete']
+    dangerous_actions = ['delete']
     filterset_class = filters.ManageTrackFileFilterSet
 
     @transaction.atomic
diff --git a/front/src/components/common/ActionTable.vue b/front/src/components/common/ActionTable.vue
index 718e57b19..5221c3282 100644
--- a/front/src/components/common/ActionTable.vue
+++ b/front/src/components/common/ActionTable.vue
@@ -21,7 +21,7 @@
                   :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']">
                   {{ $t('Go') }}</div>
                 <dangerous-button
-                  v-else :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']"
+                  v-else-if="!currentAction.isDangerous" :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']"
                   confirm-color="green"
                   color=""
                   @confirm="launchAction">
@@ -36,7 +36,7 @@
               <div class="count field">
                 <span v-if="selectAll">{{ $t('{% count %} on {% total %} selected', {count: objectsData.count, total: objectsData.count}) }}</span>
                 <span v-else>{{ $t('{% count %} on {% total %} selected', {count: checked.length, total: objectsData.count}) }}</span>
-                <template v-if="checkable.length === checked.length">
+                <template v-if="!currentAction.isDangerous && checkable.length === checked.length">
                   <a @click="selectAll = true" v-if="!selectAll">
                     {{ $t('Select all {% total %} elements', {total: objectsData.count}) }}
                   </a>
diff --git a/front/src/components/manage/library/FilesTable.vue b/front/src/components/manage/library/FilesTable.vue
index 7d230cc85..2788006f4 100644
--- a/front/src/components/manage/library/FilesTable.vue
+++ b/front/src/components/manage/library/FilesTable.vue
@@ -181,7 +181,8 @@ export default {
       return [
         {
           name: 'delete',
-          label: this.$t('Delete')
+          label: this.$t('Delete'),
+          isDangerous: true
         }
       ]
     }

From 1737a75d4e8976969814e738544171bc5ecf7368 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 22:36:47 +0200
Subject: [PATCH 46/57] See #223: reflect new possibilities of library
 permission in help text

---
 api/funkwhale_api/users/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/funkwhale_api/users/models.py b/api/funkwhale_api/users/models.py
index a3c5bd0bf..fcf78d047 100644
--- a/api/funkwhale_api/users/models.py
+++ b/api/funkwhale_api/users/models.py
@@ -27,7 +27,7 @@ PERMISSIONS_CONFIGURATION = {
     },
     'library': {
         'label': 'Manage library',
-        'help_text': 'Manage library',
+        'help_text': 'Manage library, delete files, tracks, artists, albums...',
     },
     'settings': {
         'label': 'Manage instance-level settings',

From c59f289ea460b71be0cc31bfd7142b9916dca3a2 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 22:39:28 +0200
Subject: [PATCH 47/57] Fix #223: changelog

---
 changes/changelog.d/223.feature | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 changes/changelog.d/223.feature

diff --git a/changes/changelog.d/223.feature b/changes/changelog.d/223.feature
new file mode 100644
index 000000000..c2f104ba5
--- /dev/null
+++ b/changes/changelog.d/223.feature
@@ -0,0 +1,10 @@
+Files management interface for users with "library" permission (#223)
+
+Files management interface
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This is the first bit of an ongoing work that will span several releases, to
+bring more powerful library management features to Funkwhale. This iteration
+includes a basic file management interface where users with the "library"
+permission can list and search available files, order them using
+various criterias (size, bitrate, duration...) and delete them.

From dcd150a1f17965046847c73f94afd15f59dbfe66 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 22:54:53 +0200
Subject: [PATCH 48/57] See #223: fixed failing test

---
 api/tests/manage/test_views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/tests/manage/test_views.py b/api/tests/manage/test_views.py
index 0507e6c11..db2e0980a 100644
--- a/api/tests/manage/test_views.py
+++ b/api/tests/manage/test_views.py
@@ -19,7 +19,8 @@ def test_track_file_view(factories, superuser_api_client):
     url = reverse('api:v1:manage:library:track-files-list')
 
     response = superuser_api_client.get(url, {'sort': '-creation_date'})
-    expected = serializers.ManageTrackFileSerializer(qs, many=True).data
+    expected = serializers.ManageTrackFileSerializer(
+        qs, many=True, context={'request': response.wsgi_request}).data
 
     assert response.data['count'] == len(tfs)
     assert response.data['results'] == expected

From 47126232d4234a1af2efcca87c0a8f33fb973a98 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 23:08:29 +0200
Subject: [PATCH 49/57] Fix #251: Moved upgrade doc under install doc in TOC

---
 changes/changelog.d/251.doc | 1 +
 docs/index.rst              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/251.doc

diff --git a/changes/changelog.d/251.doc b/changes/changelog.d/251.doc
new file mode 100644
index 000000000..d54b1137a
--- /dev/null
+++ b/changes/changelog.d/251.doc
@@ -0,0 +1 @@
+Moved upgrade doc under install doc in TOC (#251)
diff --git a/docs/index.rst b/docs/index.rst
index 01f76d3cc..f177a4240 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,11 +14,11 @@ Funkwhale is a self-hosted, modern free and open-source music server, heavily in
    users/index
    features
    installation/index
+   upgrading
    configuration
    importing-music
    federation
    api
-   upgrading
    third-party
    contributing
    changelog

From 540c6fb583c48580afbd4a47ee426a53ab44e87d Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 23:20:57 +0200
Subject: [PATCH 50/57] Fixed #240: ignored page_size paremeter on artist and
 favorites list

---
 api/funkwhale_api/common/pagination.py  | 2 +-
 api/funkwhale_api/favorites/views.py    | 7 -------
 changes/changelog.d/240.bugfix          | 1 +
 front/src/components/favorites/List.vue | 4 ----
 4 files changed, 2 insertions(+), 12 deletions(-)
 create mode 100644 changes/changelog.d/240.bugfix

diff --git a/api/funkwhale_api/common/pagination.py b/api/funkwhale_api/common/pagination.py
index 224c470dc..20efcb741 100644
--- a/api/funkwhale_api/common/pagination.py
+++ b/api/funkwhale_api/common/pagination.py
@@ -3,4 +3,4 @@ from rest_framework.pagination import PageNumberPagination
 
 class FunkwhalePagination(PageNumberPagination):
     page_size_query_param = 'page_size'
-    max_page_size = 25
+    max_page_size = 50
diff --git a/api/funkwhale_api/favorites/views.py b/api/funkwhale_api/favorites/views.py
index d874c9e1e..cd2aa3b61 100644
--- a/api/funkwhale_api/favorites/views.py
+++ b/api/funkwhale_api/favorites/views.py
@@ -12,12 +12,6 @@ from . import models
 from . import serializers
 
 
-class CustomLimitPagination(pagination.PageNumberPagination):
-    page_size = 100
-    page_size_query_param = 'page_size'
-    max_page_size = 100
-
-
 class TrackFavoriteViewSet(mixins.CreateModelMixin,
                            mixins.DestroyModelMixin,
                            mixins.ListModelMixin,
@@ -26,7 +20,6 @@ class TrackFavoriteViewSet(mixins.CreateModelMixin,
     serializer_class = serializers.UserTrackFavoriteSerializer
     queryset = (models.TrackFavorite.objects.all())
     permission_classes = [ConditionalAuthentication]
-    pagination_class = CustomLimitPagination
 
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
diff --git a/changes/changelog.d/240.bugfix b/changes/changelog.d/240.bugfix
new file mode 100644
index 000000000..69e8048b8
--- /dev/null
+++ b/changes/changelog.d/240.bugfix
@@ -0,0 +1 @@
+Fixed ignored page_size paremeter on artist and favorites list (#240)
diff --git a/front/src/components/favorites/List.vue b/front/src/components/favorites/List.vue
index 120aae2a9..65d97cef9 100644
--- a/front/src/components/favorites/List.vue
+++ b/front/src/components/favorites/List.vue
@@ -136,19 +136,15 @@ export default {
   watch: {
     page: function () {
       this.updateQueryString()
-      this.fetchFavorites(FAVORITES_URL)
     },
     paginateBy: function () {
       this.updateQueryString()
-      this.fetchFavorites(FAVORITES_URL)
     },
     orderingDirection: function () {
       this.updateQueryString()
-      this.fetchFavorites(FAVORITES_URL)
     },
     ordering: function () {
       this.updateQueryString()
-      this.fetchFavorites(FAVORITES_URL)
     }
   }
 }

From 7a8c336e0da56e45dd8c6a6934cde23b100db77b Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 29 May 2018 23:24:05 +0200
Subject: [PATCH 51/57] Fix #225: Display proper total number of tracks on
 radio detail

---
 changes/changelog.d/225.bugfix    | 1 +
 front/src/views/radios/Detail.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/225.bugfix

diff --git a/changes/changelog.d/225.bugfix b/changes/changelog.d/225.bugfix
new file mode 100644
index 000000000..d14c7b9a5
--- /dev/null
+++ b/changes/changelog.d/225.bugfix
@@ -0,0 +1 @@
+Display proper total number of tracks on radio detail (#225)
diff --git a/front/src/views/radios/Detail.vue b/front/src/views/radios/Detail.vue
index b3b500cf6..26d8a4d83 100644
--- a/front/src/views/radios/Detail.vue
+++ b/front/src/views/radios/Detail.vue
@@ -10,7 +10,7 @@
           <div class="content">
             {{ radio.name }}
             <div class="sub header">
-              Radio containing {{ tracks.length }} tracks,
+              Radio containing {{ totalTracks }} tracks,
               by <username :username="radio.user.username"></username>
             </div>
           </div>

From 8d50743b3bc6501bae138d9c6f1b5b74a7ba3e3e Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 31 May 2018 23:46:15 +0200
Subject: [PATCH 52/57] Fix #258: Implemented getCovertArt in Subsonic API to
 serve album covers

---
 api/funkwhale_api/music/views.py          |  4 +-
 api/funkwhale_api/subsonic/serializers.py |  9 +++-
 api/funkwhale_api/subsonic/views.py       | 51 ++++++++++++++++++++++-
 api/tests/subsonic/test_serializers.py    |  3 ++
 api/tests/subsonic/test_views.py          | 13 ++++++
 changes/changelog.d/258.enhancement       |  1 +
 6 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 changes/changelog.d/258.enhancement

diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index d8b173b4f..2f5b75a97 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -242,8 +242,8 @@ def get_file_path(audio_file):
                     'You need to specify MUSIC_DIRECTORY_SERVE_PATH and '
                     'MUSIC_DIRECTORY_PATH to serve in-place imported files'
                 )
-            path = audio_file.replace(prefix, serve_path, 1).encode('utf-8')
-        return path
+            path = audio_file.replace(prefix, serve_path, 1)
+        return path.encode('utf-8')
 
 
 def handle_serve(track_file):
diff --git a/api/funkwhale_api/subsonic/serializers.py b/api/funkwhale_api/subsonic/serializers.py
index 6709930f5..f63ad5d2e 100644
--- a/api/funkwhale_api/subsonic/serializers.py
+++ b/api/funkwhale_api/subsonic/serializers.py
@@ -57,8 +57,10 @@ class GetArtistSerializer(serializers.Serializer):
                 'name': album.title,
                 'artist': artist.name,
                 'created': album.creation_date,
-                'songCount': len(album.tracks.all())
+                'songCount': len(album.tracks.all()),
             }
+            if album.cover:
+                album_data['coverArt'] = 'al-{}'.format(album.id)
             if album.release_date:
                 album_data['year'] = album.release_date.year
             payload['album'].append(album_data)
@@ -81,6 +83,8 @@ def get_track_data(album, track, tf):
         'artistId': album.artist.pk,
         'type': 'music',
     }
+    if track.album.cover:
+        data['coverArt'] = 'al-{}'.format(track.album.id)
     if tf.bitrate:
         data['bitrate'] = int(tf.bitrate/1000)
     if tf.size:
@@ -98,6 +102,9 @@ def get_album2_data(album):
         'artist': album.artist.name,
         'created': album.creation_date,
     }
+    if album.cover:
+        payload['coverArt'] = 'al-{}'.format(album.id)
+
     try:
         payload['songCount'] = album._tracks_count
     except AttributeError:
diff --git a/api/funkwhale_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py
index 2692a3dda..87c9f7270 100644
--- a/api/funkwhale_api/subsonic/views.py
+++ b/api/funkwhale_api/subsonic/views.py
@@ -1,5 +1,6 @@
 import datetime
 
+from django.conf import settings
 from django.utils import timezone
 
 from rest_framework import exceptions
@@ -459,7 +460,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
                     'code': 10,
                     'message': 'Playlist ID or name must be specified.'
                 }
-            }, data)
+            })
 
         playlist = request.user.playlists.create(
             name=name
@@ -503,3 +504,51 @@ class SubsonicViewSet(viewsets.GenericViewSet):
             }
         }
         return response.Response(data)
+
+    @list_route(
+        methods=['get', 'post'],
+        url_name='get_cover_art',
+        url_path='getCoverArt')
+    def get_cover_art(self, request, *args, **kwargs):
+        data = request.GET or request.POST
+        id = data.get('id', '')
+        if not id:
+            return response.Response({
+                'error': {
+                    'code': 10,
+                    'message': 'cover art ID must be specified.'
+                }
+            })
+        
+        if id.startswith('al-'):
+            try:
+                album_id = int(id.replace('al-', ''))
+                album = music_models.Album.objects.exclude(
+                    cover__isnull=True
+                ).exclude(cover='').get(pk=album_id)
+            except (TypeError, ValueError, music_models.Album.DoesNotExist):
+                return response.Response({
+                    'error': {
+                        'code': 70,
+                        'message': 'cover art not found.'
+                    }
+                })
+            cover = album.cover
+        else:
+            return response.Response({
+                'error': {
+                    'code': 70,
+                    'message': 'cover art not found.'
+                }
+            })
+
+        mapping = {
+            'nginx': 'X-Accel-Redirect',
+            'apache2': 'X-Sendfile',
+        }
+        path = music_views.get_file_path(cover)
+        file_header = mapping[settings.REVERSE_PROXY_TYPE]
+        # let the proxy set the content-type
+        r = response.Response({}, content_type='')
+        r[file_header] = path
+        return r
\ No newline at end of file
diff --git a/api/tests/subsonic/test_serializers.py b/api/tests/subsonic/test_serializers.py
index ad9f739a1..081b669c5 100644
--- a/api/tests/subsonic/test_serializers.py
+++ b/api/tests/subsonic/test_serializers.py
@@ -60,6 +60,7 @@ def test_get_artist_serializer(factories):
         'album': [
             {
                 'id': album.pk,
+                'coverArt': 'al-{}'.format(album.id),
                 'artistId': artist.pk,
                 'name': album.title,
                 'artist': artist.name,
@@ -88,11 +89,13 @@ def test_get_album_serializer(factories):
         'songCount': 1,
         'created': album.creation_date,
         'year': album.release_date.year,
+        'coverArt': 'al-{}'.format(album.id),
         'song': [
             {
                 'id': track.pk,
                 'isDir': 'false',
                 'title': track.title,
+                'coverArt': 'al-{}'.format(album.id),
                 'album': album.title,
                 'artist': artist.name,
                 'track': track.position,
diff --git a/api/tests/subsonic/test_views.py b/api/tests/subsonic/test_views.py
index bd445e070..65c2ad95f 100644
--- a/api/tests/subsonic/test_views.py
+++ b/api/tests/subsonic/test_views.py
@@ -391,3 +391,16 @@ def test_get_indexes(f, db, logged_in_api_client, factories):
 
     assert response.status_code == 200
     assert response.data == expected
+
+
+def test_get_cover_art_album(factories, logged_in_api_client):
+    url = reverse('api:subsonic-get-cover-art')
+    assert url.endswith('getCoverArt') is True
+    album = factories['music.Album']()
+    response = logged_in_api_client.get(url, {'id': 'al-{}'.format(album.pk)})
+
+    assert response.status_code == 200
+    assert response['Content-Type'] == ''
+    assert response['X-Accel-Redirect'] == music_views.get_file_path(
+        album.cover
+    ).decode('utf-8')
diff --git a/changes/changelog.d/258.enhancement b/changes/changelog.d/258.enhancement
new file mode 100644
index 000000000..28f05c01b
--- /dev/null
+++ b/changes/changelog.d/258.enhancement
@@ -0,0 +1 @@
+Implemented getCovertArt in Subsonic API to serve album covers (#258)
\ No newline at end of file

From 0f792bf75cfa9ea0be1b73f2863706c38e66cd35 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Fri, 1 Jun 2018 23:59:08 +0200
Subject: [PATCH 53/57] Fix #260: Implemented scrobble endpoint of subsonic API

---
 api/funkwhale_api/subsonic/serializers.py | 16 ++++++++++++++++
 api/funkwhale_api/subsonic/views.py       | 23 +++++++++++++++++++++--
 api/tests/subsonic/test_serializers.py    | 19 +++++++++++++++++++
 api/tests/subsonic/test_views.py          | 14 ++++++++++++++
 changes/changelog.d/260.enhancement       |  2 ++
 5 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 changes/changelog.d/260.enhancement

diff --git a/api/funkwhale_api/subsonic/serializers.py b/api/funkwhale_api/subsonic/serializers.py
index f63ad5d2e..97cdbcfc6 100644
--- a/api/funkwhale_api/subsonic/serializers.py
+++ b/api/funkwhale_api/subsonic/serializers.py
@@ -4,6 +4,7 @@ from django.db.models import functions, Count
 
 from rest_framework import serializers
 
+from funkwhale_api.history import models as history_models
 from funkwhale_api.music import models as music_models
 
 
@@ -228,3 +229,18 @@ def get_music_directory_data(artist):
             td['size'] = tf.size
         data['child'].append(td)
     return data
+
+
+class ScrobbleSerializer(serializers.Serializer):
+    submission = serializers.BooleanField(default=True, required=False)
+    id = serializers.PrimaryKeyRelatedField(
+        queryset=music_models.Track.objects.annotate(
+            files_count=Count('files')
+        ).filter(files_count__gt=0)
+    )
+
+    def create(self, data):
+        return history_models.Listening.objects.create(
+            user=self.context['user'],
+            track=data['id'],
+        )
diff --git a/api/funkwhale_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py
index 87c9f7270..dbc31ec5f 100644
--- a/api/funkwhale_api/subsonic/views.py
+++ b/api/funkwhale_api/subsonic/views.py
@@ -519,7 +519,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
                     'message': 'cover art ID must be specified.'
                 }
             })
-        
+
         if id.startswith('al-'):
             try:
                 album_id = int(id.replace('al-', ''))
@@ -551,4 +551,23 @@ class SubsonicViewSet(viewsets.GenericViewSet):
         # let the proxy set the content-type
         r = response.Response({}, content_type='')
         r[file_header] = path
-        return r
\ No newline at end of file
+        return r
+
+    @list_route(
+        methods=['get', 'post'],
+        url_name='scrobble',
+        url_path='scrobble')
+    def scrobble(self, request, *args, **kwargs):
+        data = request.GET or request.POST
+        serializer = serializers.ScrobbleSerializer(
+            data=data, context={'user': request.user})
+        if not serializer.is_valid():
+            return response.Response({
+                'error': {
+                    'code': 0,
+                    'message': 'Invalid payload'
+                }
+            })
+        if serializer.validated_data['submission']:
+            serializer.save()
+        return response.Response({})
diff --git a/api/tests/subsonic/test_serializers.py b/api/tests/subsonic/test_serializers.py
index 081b669c5..6b9ec232d 100644
--- a/api/tests/subsonic/test_serializers.py
+++ b/api/tests/subsonic/test_serializers.py
@@ -214,3 +214,22 @@ def test_directory_serializer_artist(factories):
     }
     data = serializers.get_music_directory_data(artist)
     assert data == expected
+
+
+def test_scrobble_serializer(factories):
+    tf = factories['music.TrackFile']()
+    track = tf.track
+    user = factories['users.User']()
+    payload = {
+        'id': track.pk,
+        'submission': True,
+    }
+    serializer = serializers.ScrobbleSerializer(
+        data=payload, context={'user': user})
+
+    assert serializer.is_valid(raise_exception=True)
+
+    listening = serializer.save()
+
+    assert listening.user == user
+    assert listening.track == track
diff --git a/api/tests/subsonic/test_views.py b/api/tests/subsonic/test_views.py
index 65c2ad95f..52e410e52 100644
--- a/api/tests/subsonic/test_views.py
+++ b/api/tests/subsonic/test_views.py
@@ -404,3 +404,17 @@ def test_get_cover_art_album(factories, logged_in_api_client):
     assert response['X-Accel-Redirect'] == music_views.get_file_path(
         album.cover
     ).decode('utf-8')
+
+
+def test_scrobble(factories, logged_in_api_client):
+    tf = factories['music.TrackFile']()
+    track = tf.track
+    url = reverse('api:subsonic-scrobble')
+    assert url.endswith('scrobble') is True
+    response = logged_in_api_client.get(
+        url, {'id': track.pk, 'submission': True})
+
+    assert response.status_code == 200
+
+    l = logged_in_api_client.user.listenings.latest('id')
+    assert l.track == track
diff --git a/changes/changelog.d/260.enhancement b/changes/changelog.d/260.enhancement
new file mode 100644
index 000000000..8d6503473
--- /dev/null
+++ b/changes/changelog.d/260.enhancement
@@ -0,0 +1,2 @@
+Implemented scrobble endpoint of subsonic API, listenings are now tracked
+correctly from third party apps that use this endpoint (#260)

From 5ebaa884c131596d9e31fafc72179c1dd6ce90df Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 2 Jun 2018 00:11:31 +0200
Subject: [PATCH 54/57] Send proper activity when listening is created through
 subsonic API

---
 api/funkwhale_api/subsonic/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/funkwhale_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py
index dbc31ec5f..cc75b5279 100644
--- a/api/funkwhale_api/subsonic/views.py
+++ b/api/funkwhale_api/subsonic/views.py
@@ -11,6 +11,7 @@ from rest_framework import viewsets
 from rest_framework.decorators import list_route
 from rest_framework.serializers import ValidationError
 
+from funkwhale_api.activity import record
 from funkwhale_api.common import preferences
 from funkwhale_api.favorites.models import TrackFavorite
 from funkwhale_api.music import models as music_models
@@ -569,5 +570,6 @@ class SubsonicViewSet(viewsets.GenericViewSet):
                 }
             })
         if serializer.validated_data['submission']:
-            serializer.save()
+            l = serializer.save()
+            record.send(l)
         return response.Response({})

From 14c8073e2697fb52ce2aa724bcd1179cabc08bee Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 2 Jun 2018 09:17:32 +0200
Subject: [PATCH 55/57] Ensure we can serve images securely locally

---
 .env.dev                          | 1 +
 api/config/settings/common.py     | 3 +++
 api/config/settings/production.py | 4 ----
 docker/nginx/entrypoint.sh        | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.env.dev b/.env.dev
index e117dbe56..7037b1dbd 100644
--- a/.env.dev
+++ b/.env.dev
@@ -11,3 +11,4 @@ WEBPACK_DEVSERVER_PORT=8080
 MUSIC_DIRECTORY_PATH=/music
 BROWSABLE_API_ENABLED=True
 CACHEOPS_ENABLED=False
+FORWARDED_PROTO=http
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 50c62e9d5..6ab2a8303 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -303,6 +303,9 @@ ROOT_URLCONF = 'config.urls'
 WSGI_APPLICATION = 'config.wsgi.application'
 ASGI_APPLICATION = "config.routing.application"
 
+# This ensures that Django will be able to detect a secure connection
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+
 # AUTHENTICATION CONFIGURATION
 # ------------------------------------------------------------------------------
 AUTHENTICATION_BACKENDS = (
diff --git a/api/config/settings/production.py b/api/config/settings/production.py
index 2866e9103..39be40dc3 100644
--- a/api/config/settings/production.py
+++ b/api/config/settings/production.py
@@ -22,10 +22,6 @@ from .common import *  # noqa
 # Raises ImproperlyConfigured exception if DJANGO_SECRET_KEY not in os.environ
 SECRET_KEY = env("DJANGO_SECRET_KEY")
 
-# This ensures that Django will be able to detect a secure connection
-# properly on Heroku.
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
-
 # django-secure
 # ------------------------------------------------------------------------------
 # INSTALLED_APPS += ("djangosecure", )
diff --git a/docker/nginx/entrypoint.sh b/docker/nginx/entrypoint.sh
index 14e072a7e..ea6a3322d 100755
--- a/docker/nginx/entrypoint.sh
+++ b/docker/nginx/entrypoint.sh
@@ -12,6 +12,7 @@ cp /etc/nginx/funkwhale_proxy.conf{.template,}
 sed -i "s/X-Forwarded-Host \$host:\$server_port/X-Forwarded-Host ${FUNKWHALE_HOSTNAME}:${FORWARDED_PORT}/" /etc/nginx/funkwhale_proxy.conf
 sed -i "s/proxy_set_header Host \$host/proxy_set_header Host ${FUNKWHALE_HOSTNAME}/" /etc/nginx/funkwhale_proxy.conf
 sed -i "s/proxy_set_header X-Forwarded-Port \$server_port/proxy_set_header X-Forwarded-Port ${FORWARDED_PORT}/" /etc/nginx/funkwhale_proxy.conf
+sed -i "s/proxy_set_header X-Forwarded-Proto \$scheme/proxy_set_header X-Forwarded-Proto ${FORWARDED_PROTO}/" /etc/nginx/funkwhale_proxy.conf
 
 cat /etc/nginx/funkwhale_proxy.conf
 nginx -g "daemon off;"

From 290cae9a8f6790d8d412b36965ad73ac3ec8139e Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 2 Jun 2018 09:21:55 +0200
Subject: [PATCH 56/57] Fix #231 and #219: ensure we import covers regarless of
 the import method

Can now import covers from track metadata and track directory as well
---
 api/config/settings/local.py        |   1 +
 api/funkwhale_api/music/metadata.py | 113 ++++++++++++++++-----------
 api/funkwhale_api/music/models.py   |  25 +++++-
 api/funkwhale_api/music/tasks.py    | 114 ++++++++++++++++++++++++++--
 api/tests/music/cover.jpg           | Bin 0 -> 107 bytes
 api/tests/music/cover.png           | Bin 0 -> 379 bytes
 api/tests/music/sample.flac         | Bin 9793 -> 91522 bytes
 api/tests/music/test_metadata.py    |  14 ++++
 api/tests/music/test_models.py      |   8 ++
 api/tests/music/test_tasks.py       |  71 +++++++++++++++++
 changes/changelog.d/219.enhancement |   1 +
 changes/changelog.d/231.bugfix      |  50 ++++++++++++
 docs/importing-music.rst            |   9 +++
 13 files changed, 353 insertions(+), 53 deletions(-)
 create mode 100644 api/tests/music/cover.jpg
 create mode 100644 api/tests/music/cover.png
 create mode 100644 changes/changelog.d/219.enhancement
 create mode 100644 changes/changelog.d/231.bugfix

diff --git a/api/config/settings/local.py b/api/config/settings/local.py
index 592600629..df14945cc 100644
--- a/api/config/settings/local.py
+++ b/api/config/settings/local.py
@@ -76,3 +76,4 @@ LOGGING = {
         },
     },
 }
+CSRF_TRUSTED_ORIGINS = [o for o in ALLOWED_HOSTS]
diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 522c64c85..3637b1c8c 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -9,7 +9,13 @@ class TagNotFound(KeyError):
     pass
 
 
+class UnsupportedTag(KeyError):
+    pass
+
+
 def get_id3_tag(f, k):
+    if k == 'pictures':
+        return f.tags.getall('APIC')
     # First we try to grab the standard key
     try:
         return f.tags[k].text[0]
@@ -28,13 +34,39 @@ def get_id3_tag(f, k):
         raise TagNotFound(k)
 
 
+def clean_id3_pictures(apic):
+    pictures = []
+    for p in list(apic):
+        pictures.append({
+            'mimetype': p.mime,
+            'content': p.data,
+            'description': p.desc,
+            'type': p.type.real,
+        })
+    return pictures
+
+
 def get_flac_tag(f, k):
+    if k == 'pictures':
+        return f.pictures
     try:
         return f.get(k, [])[0]
     except (KeyError, IndexError):
         raise TagNotFound(k)
 
 
+def clean_flac_pictures(apic):
+    pictures = []
+    for p in list(apic):
+        pictures.append({
+            'mimetype': p.mime,
+            'content': p.data,
+            'description': p.desc,
+            'type': p.type.real,
+        })
+    return pictures
+
+
 def get_mp3_recording_id(f, k):
     try:
         return [
@@ -73,25 +105,15 @@ CONF = {
                 'field': 'TRACKNUMBER',
                 'to_application': convert_track_number
             },
-            'title': {
-                'field': 'title'
-            },
-            'artist': {
-                'field': 'artist'
-            },
-            'album': {
-                'field': 'album'
-            },
+            'title': {},
+            'artist': {},
+            'album': {},
             'date': {
                 'field': 'date',
                 'to_application': lambda v: arrow.get(v).date()
             },
-            'musicbrainz_albumid': {
-                'field': 'musicbrainz_albumid'
-            },
-            'musicbrainz_artistid': {
-                'field': 'musicbrainz_artistid'
-            },
+            'musicbrainz_albumid': {},
+            'musicbrainz_artistid': {},
             'musicbrainz_recordingid': {
                 'field': 'musicbrainz_trackid'
             },
@@ -104,15 +126,9 @@ CONF = {
                 'field': 'TRACKNUMBER',
                 'to_application': convert_track_number
             },
-            'title': {
-                'field': 'title'
-            },
-            'artist': {
-                'field': 'artist'
-            },
-            'album': {
-                'field': 'album'
-            },
+            'title': {},
+            'artist': {},
+            'album': {},
             'date': {
                 'field': 'date',
                 'to_application': lambda v: arrow.get(v).date()
@@ -130,6 +146,7 @@ CONF = {
     },
     'MP3': {
         'getter': get_id3_tag,
+        'clean_pictures': clean_id3_pictures,
         'fields': {
             'track_number': {
                 'field': 'TRCK',
@@ -158,40 +175,31 @@ CONF = {
                 'field': 'UFID',
                 'getter': get_mp3_recording_id,
             },
+            'pictures': {},
         }
     },
     'FLAC': {
         'getter': get_flac_tag,
+        'clean_pictures': clean_flac_pictures,
         'fields': {
             'track_number': {
                 'field': 'tracknumber',
                 'to_application': convert_track_number
             },
-            'title': {
-                'field': 'title'
-            },
-            'artist': {
-                'field': 'artist'
-            },
-            'album': {
-                'field': 'album'
-            },
+            'title': {},
+            'artist': {},
+            'album': {},
             'date': {
                 'field': 'date',
                 'to_application': lambda v: arrow.get(str(v)).date()
             },
-            'musicbrainz_albumid': {
-                'field': 'musicbrainz_albumid'
-            },
-            'musicbrainz_artistid': {
-                'field': 'musicbrainz_artistid'
-            },
+            'musicbrainz_albumid': {},
+            'musicbrainz_artistid': {},
             'musicbrainz_recordingid': {
                 'field': 'musicbrainz_trackid'
             },
-            'test': {
-                'field': 'test'
-            },
+            'test': {},
+            'pictures': {},
         }
     },
 }
@@ -213,8 +221,12 @@ class Metadata(object):
         return f.__class__.__name__
 
     def get(self, key, default=NODEFAULT):
-        field_conf = self._conf['fields'][key]
-        real_key = field_conf['field']
+        try:
+            field_conf = self._conf['fields'][key]
+        except KeyError:
+            raise UnsupportedTag(
+                '{} is not supported for this file format'.format(key))
+        real_key = field_conf.get('field', key)
         try:
             getter = field_conf.get('getter', self._conf['getter'])
             v = getter(self._file, real_key)
@@ -230,3 +242,16 @@ class Metadata(object):
         if field:
             v = field.to_python(v)
         return v
+
+    def get_picture(self, picture_type='cover_front'):
+        ptype = getattr(mutagen.id3.PictureType, picture_type.upper())
+        try:
+            pictures = self.get('pictures')
+        except (UnsupportedTag, TagNotFound):
+            return
+
+        cleaner = self._conf.get('clean_pictures', lambda v: v)
+        pictures = cleaner(pictures)
+        for p in pictures:
+            if p['type'] == ptype:
+                return p
diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py
index 51ece7d7b..0ba4d22c3 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -23,6 +23,7 @@ from funkwhale_api import downloader
 from funkwhale_api import musicbrainz
 from funkwhale_api.federation import utils as federation_utils
 from . import importers
+from . import metadata
 from . import utils
 
 
@@ -192,10 +193,20 @@ class Album(APIModelMixin):
     }
     objects = AlbumQuerySet.as_manager()
 
-    def get_image(self):
-        image_data =  musicbrainz.api.images.get_front(str(self.mbid))
-        f = ContentFile(image_data)
-        self.cover.save('{0}.jpg'.format(self.mbid), f)
+    def get_image(self, data=None):
+        if data:
+            f = ContentFile(data['content'])
+            extensions = {
+                'image/jpeg': 'jpg',
+                'image/png': 'png',
+                'image/gif': 'gif',
+            }
+            extension = extensions.get(data['mimetype'], 'jpg')
+            self.cover.save('{}.{}'.format(self.uuid, extension), f)
+        else:
+            image_data =  musicbrainz.api.images.get_front(str(self.mbid))
+            f = ContentFile(image_data)
+            self.cover.save('{0}.jpg'.format(self.mbid), f)
         return self.cover.file
 
     def __str__(self):
@@ -522,6 +533,12 @@ class TrackFile(models.Model):
             self.mimetype = utils.guess_mimetype(self.audio_file)
         return super().save(**kwargs)
 
+    def get_metadata(self):
+        audio_file = self.get_audio_file()
+        if not audio_file:
+            return
+        return metadata.Metadata(audio_file)
+
 
 IMPORT_STATUS_CHOICES = (
     ('pending', 'Pending'),
diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py
index 993456c27..218e374e8 100644
--- a/api/funkwhale_api/music/tasks.py
+++ b/api/funkwhale_api/music/tasks.py
@@ -1,7 +1,10 @@
+import logging
 import os
 
 from django.core.files.base import ContentFile
 
+from musicbrainzngs import ResponseError
+
 from funkwhale_api.common import preferences
 from funkwhale_api.federation import activity
 from funkwhale_api.federation import actors
@@ -16,6 +19,8 @@ from . import models
 from . import lyrics as lyrics_utils
 from . import utils as music_utils
 
+logger = logging.getLogger(__name__)
+
 
 @celery.app.task(name='acoustid.set_on_track_file')
 @celery.require_instance(models.TrackFile, 'track_file')
@@ -74,6 +79,7 @@ def import_track_from_remote(library_track):
 
 
 def _do_import(import_job, replace=False, use_acoustid=False):
+    logger.info('[Import Job %s] starting job', import_job.pk)
     from_file = bool(import_job.audio_file)
     mbid = import_job.mbid
     acoustid_track_id = None
@@ -91,15 +97,32 @@ def _do_import(import_job, replace=False, use_acoustid=False):
             mbid = match['recordings'][0]['id']
             acoustid_track_id = match['id']
     if mbid:
+        logger.info(
+            '[Import Job %s] importing track from musicbrainz recording %s',
+            import_job.pk,
+            str(mbid))
         track, _ = models.Track.get_or_create_from_api(mbid=mbid)
     elif import_job.audio_file:
+        logger.info(
+            '[Import Job %s] importing track from uploaded track data at %s',
+            import_job.pk,
+            import_job.audio_file.path)
         track = audiofile_tasks.import_track_data_from_path(
             import_job.audio_file.path)
     elif import_job.library_track:
+        logger.info(
+            '[Import Job %s] importing track from federated library track %s',
+            import_job.pk,
+            import_job.library_track.pk)
         track = import_track_from_remote(import_job.library_track)
     elif import_job.source.startswith('file://'):
+        tf_path = import_job.source.replace('file://', '', 1)
+        logger.info(
+            '[Import Job %s] importing track from local track data at %s',
+            import_job.pk,
+            tf_path)
         track = audiofile_tasks.import_track_data_from_path(
-            import_job.source.replace('file://', '', 1))
+            tf_path)
     else:
         raise ValueError(
             'Not enough data to process import, '
@@ -107,8 +130,13 @@ def _do_import(import_job, replace=False, use_acoustid=False):
 
     track_file = None
     if replace:
+        logger.info(
+            '[Import Job %s] replacing existing audio file', import_job.pk)
         track_file = track.files.first()
     elif track.files.count() > 0:
+        logger.info(
+            '[Import Job %s] skipping, we already have a file for this track',
+            import_job.pk)
         if import_job.audio_file:
             import_job.audio_file.delete()
         import_job.status = 'skipped'
@@ -132,6 +160,9 @@ def _do_import(import_job, replace=False, use_acoustid=False):
             pass
     elif not import_job.audio_file and not import_job.source.startswith('file://'):
         # not an implace import, and we have a source, so let's download it
+        logger.info(
+            '[Import Job %s] downloading audio file from remote',
+            import_job.pk)
         track_file.download_file()
     elif not import_job.audio_file and import_job.source.startswith('file://'):
         # in place import, we set mimetype from extension
@@ -139,23 +170,96 @@ def _do_import(import_job, replace=False, use_acoustid=False):
         track_file.mimetype = music_utils.get_type_from_ext(ext)
     track_file.set_audio_data()
     track_file.save()
+    # if no cover is set on track album, we try to update it as well:
+    if not track.album.cover:
+        logger.info(
+            '[Import Job %s] retrieving album cover',
+            import_job.pk)
+        update_album_cover(track.album, track_file)
     import_job.status = 'finished'
     import_job.track_file = track_file
     if import_job.audio_file:
         # it's imported on the track, we don't need it anymore
         import_job.audio_file.delete()
     import_job.save()
-
+    logger.info(
+        '[Import Job %s] job finished',
+        import_job.pk)
     return track_file
 
 
+def update_album_cover(album, track_file, replace=False):
+    if album.cover and not replace:
+        return
+
+    if track_file:
+        # maybe the file has a cover embedded?
+        try:
+            metadata = track_file.get_metadata()
+        except FileNotFoundError:
+            metadata = None
+        if metadata:
+            cover = metadata.get_picture('cover_front')
+            if cover:
+                # best case scenario, cover is embedded in the track
+                logger.info(
+                    '[Album %s] Using cover embedded in file',
+                    album.pk)
+                return album.get_image(data=cover)
+        if track_file.source and track_file.source.startswith('file://'):
+            # let's look for a cover in the same directory
+            path = os.path.dirname(track_file.source.replace('file://', '', 1))
+            logger.info(
+                '[Album %s] scanning covers from %s',
+                album.pk,
+                path)
+            cover = get_cover_from_fs(path)
+            if cover:
+                return album.get_image(data=cover)
+    if not album.mbid:
+        return
+    try:
+        logger.info(
+            '[Album %s] Fetching cover from musicbrainz release %s',
+            album.pk,
+            str(album.mbid))
+        return album.get_image()
+    except ResponseError as exc:
+        logger.warning(
+            '[Album %s] cannot fetch cover from musicbrainz: %s',
+            album.pk,
+            str(exc))
+
+
+IMAGE_TYPES = [
+    ('jpg', 'image/jpeg'),
+    ('png', 'image/png'),
+]
+
+def get_cover_from_fs(dir_path):
+    if os.path.exists(dir_path):
+        for e, m in IMAGE_TYPES:
+            cover_path = os.path.join(dir_path, 'cover.{}'.format(e))
+            if not os.path.exists(cover_path):
+                logger.debug('Cover %s does not exists', cover_path)
+                continue
+            with open(cover_path, 'rb') as c:
+                logger.info('Found cover at %s', cover_path)
+                return {
+                    'mimetype': m,
+                    'content': c.read(),
+                }
+
+
+
 @celery.app.task(name='ImportJob.run', bind=True)
 @celery.require_instance(
     models.ImportJob.objects.filter(
         status__in=['pending', 'errored']),
     'import_job')
 def import_job_run(self, import_job, replace=False, use_acoustid=False):
-    def mark_errored():
+    def mark_errored(exc):
+        logger.error('[Import Job %s] Error during import: %s', str(exc))
         import_job.status = 'errored'
         import_job.save(update_fields=['status'])
 
@@ -167,9 +271,9 @@ def import_job_run(self, import_job, replace=False, use_acoustid=False):
             try:
                 self.retry(exc=exc, countdown=30, max_retries=3)
             except:
-                mark_errored()
+                mark_errored(exc)
                 raise
-        mark_errored()
+        mark_errored(exc)
         raise
 
 
diff --git a/api/tests/music/cover.jpg b/api/tests/music/cover.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..71911bf48766c7181518c1070911019fbb00b1fc
GIT binary patch
literal 107
zcmWm0!3~2z3<c5e0G91tzzYq~2?wf2LPE+ZkYWt`4x@=*{IQ|=RJF~k<+c*$j#bQ5
rR4tF$(vVd9(hsA1am&*@`TV}ejwB!uQ9&GFxOZ_wh=3K}bBXH#zJm|u

literal 0
HcmV?d00001

diff --git a/api/tests/music/cover.png b/api/tests/music/cover.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f56c8ac2aa42bb85f38529fcf59d509c724957
GIT binary patch
literal 379
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo`I;1l9nb^8Br0Ye~{(b&_)
zF{C2y?S)3597Dr`zbnNxTez6ncq9xG4m2>1GB5)nfsvnqF_+an6cl2fu6{1-oD!M<
DR3TKT

literal 0
HcmV?d00001

diff --git a/api/tests/music/sample.flac b/api/tests/music/sample.flac
index 6eff1c06e43f6f536c2d810d0d059cc6af319f5e..fe3ec6e4a270da0ff0a3f1ca677da4990ddb0ea5 100644
GIT binary patch
literal 91522
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
MbJ1gCRFhl(3xb&ctN;K2

delta 293
zcmZoV&3e#hg08w7F9QREPhwe`skxr1nVzA6p*BzeBp4Fp=<Mwm>g(hhWNSFlSznkR
zDCpuC;%aMTU|^wZU<yPNi!{~sfx-bn{w|@;K!uJuiFpdX`K382sYTX~B_)~3rNs(C
z`NhT76F;Bbe3@|)qq-qby{n(Qr=Kfc^^=z{Z?SX)ne7_n<{#t>RP2>soT1=Wl$u(c
zY8{lHl$odCmYJ8FZS9zoT3no%mr|6k;GADnl9`ujy?F-<6XV3$lFW?^3fm7RF#cfP
Vej$PJB~j#bpvqO#ccw6&1OVeLVa)&l

diff --git a/api/tests/music/test_metadata.py b/api/tests/music/test_metadata.py
index 9f9c93984..326f18324 100644
--- a/api/tests/music/test_metadata.py
+++ b/api/tests/music/test_metadata.py
@@ -58,6 +58,20 @@ def test_can_get_metadata_from_id3_mp3_file(field, value):
     assert data.get(field) == value
 
 
+@pytest.mark.parametrize('name', ['test.mp3', 'sample.flac'])
+def test_can_get_pictures(name):
+    path = os.path.join(DATA_DIR, name)
+    data = metadata.Metadata(path)
+
+    pictures = data.get('pictures')
+    assert len(pictures) == 1
+    cover_data = data.get_picture('cover_front')
+    assert cover_data['mimetype'].startswith('image/')
+    assert len(cover_data['content']) > 0
+    assert type(cover_data['content']) == bytes
+    assert type(cover_data['description']) == str
+
+
 @pytest.mark.parametrize('field,value', [
     ('title', '999,999'),
     ('artist', 'Nine Inch Nails'),
diff --git a/api/tests/music/test_models.py b/api/tests/music/test_models.py
index e926d07fa..feb68ea33 100644
--- a/api/tests/music/test_models.py
+++ b/api/tests/music/test_models.py
@@ -110,3 +110,11 @@ def test_track_get_file_size_in_place(factories):
         in_place=True, source='file://{}'.format(path))
 
     assert tf.get_file_size() == 297745
+
+
+def test_album_get_image_content(factories):
+    album = factories['music.Album']()
+    album.get_image(data={'content': b'test', 'mimetype':'image/jpeg'})
+    album.refresh_from_db()
+
+    assert album.cover.read() == b'test'
diff --git a/api/tests/music/test_tasks.py b/api/tests/music/test_tasks.py
index dfe649be0..77245e204 100644
--- a/api/tests/music/test_tasks.py
+++ b/api/tests/music/test_tasks.py
@@ -56,6 +56,7 @@ def test_import_batch_run(factories, mocker):
     mocked_job_run.assert_called_once_with(import_job_id=job.pk)
 
 
+@pytest.mark.skip('Acoustid is disabled')
 def test_import_job_can_run_with_file_and_acoustid(
         artists, albums, tracks, preferences, factories, mocker):
     preferences['providers_acoustid__api_key'] = 'test'
@@ -183,3 +184,73 @@ def test_import_job_can_be_errored(factories, mocker, preferences):
 
     assert job.track_file is None
     assert job.status == 'errored'
+
+
+def test__do_import_calls_update_album_cover_if_no_cover(factories, mocker):
+    path = os.path.join(DATA_DIR, 'test.ogg')
+    album = factories['music.Album'](cover='')
+    track = factories['music.Track'](album=album)
+
+    mocker.patch(
+        'funkwhale_api.providers.audiofile.tasks.import_track_data_from_path',
+        return_value=track)
+
+    mocked_update = mocker.patch(
+        'funkwhale_api.music.tasks.update_album_cover')
+
+    job = factories['music.FileImportJob'](
+        audio_file__path=path, track_file=None)
+
+    tasks.import_job_run(import_job_id=job.pk)
+
+    mocked_update.assert_called_once_with(album, track.files.first())
+
+
+def test_update_album_cover_mbid(factories, mocker):
+    album = factories['music.Album'](cover='')
+
+    mocked_get = mocker.patch('funkwhale_api.music.models.Album.get_image')
+    tasks.update_album_cover(album=album, track_file=None)
+
+    mocked_get.assert_called_once_with()
+
+
+def test_update_album_cover_file_data(factories, mocker):
+    path = os.path.join(DATA_DIR, 'test.mp3')
+    album = factories['music.Album'](cover='', mbid=None)
+    tf = factories['music.TrackFile'](track__album=album)
+
+    mocked_get = mocker.patch('funkwhale_api.music.models.Album.get_image')
+    mocker.patch(
+        'funkwhale_api.music.metadata.Metadata.get_picture',
+        return_value={'hello': 'world'})
+    tasks.update_album_cover(album=album, track_file=tf)
+    md = data = tf.get_metadata()
+    mocked_get.assert_called_once_with(
+        data={'hello': 'world'})
+
+
+@pytest.mark.parametrize('ext,mimetype', [
+    ('jpg', 'image/jpeg'),
+    ('png', 'image/png'),
+])
+def test_update_album_cover_file_cover_separate_file(
+        ext, mimetype, factories, mocker):
+    mocker.patch('funkwhale_api.music.tasks.IMAGE_TYPES', [(ext, mimetype)])
+    path = os.path.join(DATA_DIR, 'test.mp3')
+    image_path = os.path.join(DATA_DIR, 'cover.{}'.format(ext))
+    with open(image_path, 'rb') as f:
+        image_content = f.read()
+    album = factories['music.Album'](cover='', mbid=None)
+    tf = factories['music.TrackFile'](
+        track__album=album,
+        source='file://' + image_path)
+
+    mocked_get = mocker.patch('funkwhale_api.music.models.Album.get_image')
+    mocker.patch(
+        'funkwhale_api.music.metadata.Metadata.get_picture',
+        return_value=None)
+    tasks.update_album_cover(album=album, track_file=tf)
+    md = data = tf.get_metadata()
+    mocked_get.assert_called_once_with(
+        data={'mimetype': mimetype, 'content': image_content})
diff --git a/changes/changelog.d/219.enhancement b/changes/changelog.d/219.enhancement
new file mode 100644
index 000000000..fec9a07ac
--- /dev/null
+++ b/changes/changelog.d/219.enhancement
@@ -0,0 +1 @@
+Can now use album covers from flac/mp3 metadata and separate file in track directory  (#219)
diff --git a/changes/changelog.d/231.bugfix b/changes/changelog.d/231.bugfix
new file mode 100644
index 000000000..0b37b6274
--- /dev/null
+++ b/changes/changelog.d/231.bugfix
@@ -0,0 +1,50 @@
+We now fetch album covers regardless of the import methods (#231)
+
+Smarter album cover importer
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In earlier versions, covers where only imported when launching a YouTube import.
+Starting from this release, covers will be imported regardless of the import mode
+(file upload, youtube-dl, CLI, in-place...). Funkwhale will look for covers
+in the following order:
+
+1. In the imported file itself (FLAC/MP3 only)
+2. In a cover.jpg or cover.png in the file directory
+3. By fetching cover art from Musibrainz, assuming the file is tagged correctly
+
+This will only work for newly imported tracks and albums though. In the future,
+we may offer an option to refetch album covers from the interface, but in the
+meantime, you can use the following snippet:
+
+.. code-block:: python
+
+    # Store this in /tmp/update_albums.py
+    from funkwhale_api.music.models import Album, TrackFile
+    from funkwhale_api.music.tasks import update_album_cover
+
+    albums_without_covers = Album.objects.filter(cover='')
+    total = albums_without_covers.count()
+    print('Found {} albums without cover'.format(total))
+    for i, album in enumerate(albums_without_covers.iterator()):
+        print('[{}/{}] Fetching cover for {}...'.format(i+1, total, album.title))
+        f = TrackFile.objects.filter(track__album=album).filter(source__startswith='file://').first()
+        update_album_cover(album, track_file=f)
+
+Then launch it::
+
+    # docker setups
+    cat /tmp/update_albums.py | docker-compose run --rm api python manage.py shell -i python
+
+    # non-docker setups
+    source /srv/funkwhale/load_env
+    source /srv/funkwhale/virtualenv/bin/activate
+    cat /tmp/update_albums.py | python manage.py shell -i python
+
+    # cleanup
+    rm /tmp/update_albums.py
+
+.. note::
+
+    Depending on your number of albums, the previous snippet may take some time
+    to execute. You can interrupt it at any time using ctrl-c and relaunch it later,
+    as it's idempotent.
diff --git a/docs/importing-music.rst b/docs/importing-music.rst
index 4d256604b..b190dff36 100644
--- a/docs/importing-music.rst
+++ b/docs/importing-music.rst
@@ -76,6 +76,15 @@ configuration options to ensure the webserver can serve them properly:
 
     Thus, be especially careful when you manipulate the source files.
 
+Album covers
+^^^^^^^^^^^^
+
+Whenever possible, Funkwhale will import album cover, with the following precedence:
+
+1. It will use the cover embedded in the audio files themeselves, if any (Flac/MP3 only)
+2. It will use a cover.jpg or a cover.png file from the imported track directory, if any
+3. It will fectch cover art from musicbrainz, assuming the file is tagged correctly
+
 Getting demo tracks
 ^^^^^^^^^^^^^^^^^^^
 

From 73bde2fc9e5e21fa42ed3d5b47ad33be58718b5e Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 2 Jun 2018 18:11:15 +0200
Subject: [PATCH 57/57] Version bump and changelog for 0.14

---
 CHANGELOG                           | 204 ++++++++++++++++++++++++++++
 api/funkwhale_api/__init__.py       |   2 +-
 changes/changelog.d/106.bugfix      |   1 -
 changes/changelog.d/164.enhancement |   2 -
 changes/changelog.d/179.bugfix      |   1 -
 changes/changelog.d/207.bugfix      |   1 -
 changes/changelog.d/213.bugfix      |   9 --
 changes/changelog.d/214.bugfix      |   1 -
 changes/changelog.d/216.enhancement |   1 -
 changes/changelog.d/218.bugfix      |   2 -
 changes/changelog.d/219.enhancement |   1 -
 changes/changelog.d/220.bugfix      |   1 -
 changes/changelog.d/223.feature     |  10 --
 changes/changelog.d/224.enhancement |  30 ----
 changes/changelog.d/225.bugfix      |   1 -
 changes/changelog.d/226.bugfix      |   1 -
 changes/changelog.d/227.bugfix      |   1 -
 changes/changelog.d/228.feature     |   3 -
 changes/changelog.d/229.bugfix      |   1 -
 changes/changelog.d/230.enhancement |  22 ---
 changes/changelog.d/231.bugfix      |  50 -------
 changes/changelog.d/236.feature     |   2 -
 changes/changelog.d/240.bugfix      |   1 -
 changes/changelog.d/241.enhancement |   1 -
 changes/changelog.d/249.doc         |  26 ----
 changes/changelog.d/251.doc         |   1 -
 changes/changelog.d/258.enhancement |   1 -
 changes/changelog.d/260.enhancement |   2 -
 changes/changelog.d/acoustid.misc   |   1 -
 29 files changed, 205 insertions(+), 175 deletions(-)
 delete mode 100644 changes/changelog.d/106.bugfix
 delete mode 100644 changes/changelog.d/164.enhancement
 delete mode 100644 changes/changelog.d/179.bugfix
 delete mode 100644 changes/changelog.d/207.bugfix
 delete mode 100644 changes/changelog.d/213.bugfix
 delete mode 100644 changes/changelog.d/214.bugfix
 delete mode 100644 changes/changelog.d/216.enhancement
 delete mode 100644 changes/changelog.d/218.bugfix
 delete mode 100644 changes/changelog.d/219.enhancement
 delete mode 100644 changes/changelog.d/220.bugfix
 delete mode 100644 changes/changelog.d/223.feature
 delete mode 100644 changes/changelog.d/224.enhancement
 delete mode 100644 changes/changelog.d/225.bugfix
 delete mode 100644 changes/changelog.d/226.bugfix
 delete mode 100644 changes/changelog.d/227.bugfix
 delete mode 100644 changes/changelog.d/228.feature
 delete mode 100644 changes/changelog.d/229.bugfix
 delete mode 100644 changes/changelog.d/230.enhancement
 delete mode 100644 changes/changelog.d/231.bugfix
 delete mode 100644 changes/changelog.d/236.feature
 delete mode 100644 changes/changelog.d/240.bugfix
 delete mode 100644 changes/changelog.d/241.enhancement
 delete mode 100644 changes/changelog.d/249.doc
 delete mode 100644 changes/changelog.d/251.doc
 delete mode 100644 changes/changelog.d/258.enhancement
 delete mode 100644 changes/changelog.d/260.enhancement
 delete mode 100644 changes/changelog.d/acoustid.misc

diff --git a/CHANGELOG b/CHANGELOG
index c53714488..283bcfcfb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,210 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.14 (2018-06-02)
+-----------------
+
+Upgrade instructions are available at
+  https://docs.funkwhale.audio/upgrading.html
+
+Features:
+
+- Admins can now configure default permissions that will be granted to all
+  registered users (#236)
+- Files management interface for users with "library" permission (#223)
+- New action table component for quick and efficient batch actions (#228) This
+  is implemented on the federated tracks pages, but will be included in other
+  pages as well depending on the feedback.
+
+
+Enhancements:
+
+- Added a new "upload" permission that allows user to launch import and view
+  their own imports (#230)
+- Added Support for OggTheora in import.
+- Autoremove media files on model instance deletion (#241)
+- Can now import a whole remote library at once thanks to new Action Table
+  component (#164)
+- Can now use album covers from flac/mp3 metadata and separate file in track
+  directory (#219)
+- Implemented getCovertArt in Subsonic API to serve album covers (#258)
+- Implemented scrobble endpoint of subsonic API, listenings are now tracked
+  correctly from third party apps that use this endpoint (#260)
+- Retructured music API to increase performance and remove useless endpoints
+  (#224)
+
+
+Bugfixes:
+
+- Consistent constraints/checks for URL size (#207)
+- Display proper total number of tracks on radio detail (#225)
+- Do not crash on flac import if musicbrainz tags are missing (#214)
+- Empty save button in radio builder (#226)
+- Ensure anonymous users can use the app if the instance is configured
+  accordingly (#229)
+- Ensure inactive users cannot get auth tokens (#218) This was already the case
+  bug we missed some checks
+- File-upload import now supports Flac files (#213)
+- File-upload importer should now work properly, assuming files are tagged
+  (#106)
+- Fixed a few broken translations strings (#227)
+- Fixed broken ordering in front-end lists (#179)
+- Fixed ignored page_size paremeter on artist and favorites list (#240)
+- Read ID3Tag Tracknumber from TRCK (#220)
+- We now fetch album covers regardless of the import methods (#231)
+
+Documentation:
+
+- Added missing subsonic configuration block in deployment vhost files (#249)
+- Moved upgrade doc under install doc in TOC (#251)
+
+
+Other:
+
+- Removed acoustid support, as the integration was buggy and error-prone (#106)
+
+
+Files management interface
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This is the first bit of an ongoing work that will span several releases, to
+bring more powerful library management features to Funkwhale. This iteration
+includes a basic file management interface where users with the "library"
+permission can list and search available files, order them using
+various criterias (size, bitrate, duration...) and delete them.
+
+New "upload" permission
+^^^^^^^^^^^^^^^^^^^^^^^
+
+This new permission is helpful if you want to give upload/import rights
+to some users, but don't want them to be able to manage the library as a whole:
+although there are no controls yet for managing library in the fron-end,
+subsequent release will introduce management interfaces for artists, files,
+etc.
+
+Because of that, users with the "library" permission will have much more power,
+and will also be able to remove content from the platform. On the other hand,
+users with the "upload" permission will only have the ability to add new
+content.
+
+Also, this release also includes a new feature called "default permissions":
+those are permissions that are granted to every users on the platform.
+On public/open instances, this will play well with the "upload" permission
+since everyone will be able to contribute to the instance library without
+an admin giving the permission to every single user.
+
+Smarter album cover importer
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In earlier versions, covers where only imported when launching a YouTube import.
+Starting from this release, covers will be imported regardless of the import mode
+(file upload, youtube-dl, CLI, in-place...). Funkwhale will look for covers
+in the following order:
+
+1. In the imported file itself (FLAC/MP3 only)
+2. In a cover.jpg or cover.png in the file directory
+3. By fetching cover art from Musibrainz, assuming the file is tagged correctly
+
+This will only work for newly imported tracks and albums though. In the future,
+we may offer an option to refetch album covers from the interface, but in the
+meantime, you can use the following snippet:
+
+.. code-block:: python
+
+    # Store this in /tmp/update_albums.py
+    from funkwhale_api.music.models import Album, TrackFile
+    from funkwhale_api.music.tasks import update_album_cover
+
+    albums_without_covers = Album.objects.filter(cover='')
+    total = albums_without_covers.count()
+    print('Found {} albums without cover'.format(total))
+    for i, album in enumerate(albums_without_covers.iterator()):
+        print('[{}/{}] Fetching cover for {}...'.format(i+1, total, album.title))
+        f = TrackFile.objects.filter(track__album=album).filter(source__startswith='file://').first()
+        update_album_cover(album, track_file=f)
+
+Then launch it::
+
+    # docker setups
+    cat /tmp/update_albums.py | docker-compose run --rm api python manage.py shell -i python
+
+    # non-docker setups
+    source /srv/funkwhale/load_env
+    source /srv/funkwhale/virtualenv/bin/activate
+    cat /tmp/update_albums.py | python manage.py shell -i python
+
+    # cleanup
+    rm /tmp/update_albums.py
+
+.. note::
+
+    Depending on your number of albums, the previous snippet may take some time
+    to execute. You can interrupt it at any time using ctrl-c and relaunch it later,
+    as it's idempotent.
+
+Music API changes
+^^^^^^^^^^^^^^^^^
+
+This release includes an API break. Even though the API is advertised
+as unstable, and not documented, here is a brief explanation of the change in
+case you are using the API in a client or in a script. Summary of the changes:
+
+- ``/api/v1/artists`` does not includes a list of tracks anymore. It was to heavy
+  to return all of this data all the time. You can get all tracks for an
+  artist using ``/api/v1/tracks?artist=artist_id``
+- Additionally, ``/api/v1/tracks`` now support an ``album`` filter to filter
+  tracks matching an album
+- ``/api/v1/artists/search``, ``/api/v1/albums/search`` and ``/api/v1/tracks/search``
+  endpoints are removed. Use ``/api/v1/{artists|albums|tracks}/?q=yourquery``
+  instead. It's also more powerful, since you can combine search with other
+  filters and ordering options.
+- ``/api/v1/requests/import-requests/search`` endpoint is removed as well.
+  Use ``/api/v1/requests/import-requests/?q=yourquery``
+  instead. It's also more powerful, since you can combine search with other
+  filters and ordering options.
+
+Of course, the front-end was updated to work with the new API, so this should
+not impact end-users in any way, apart from slight performance gains.
+
+.. note::
+
+    The API is still not stable and may evolve again in the future. API freeze
+    will come at a later point.
+
+Flac files imports via upload
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You have nothing to do to benefit from this, however, since Flac files
+tend to be a lot bigger than other files, you may want to increase the
+``client_max_body_size`` value in your Nginx configuration if you plan
+to upload flac files.
+
+Missing subsonic configuration bloc in vhost files
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Because of a missing bloc in the sample Nginx and Apache configurations,
+instances that were deployed after the 0.13 release are likely to be unable
+to answer to Subsonic clients (the missing bits were properly documented
+in the changelog).
+
+Ensure you have the following snippets in your Nginx or Apache configuration
+if you plan to use the Subsonic API.
+
+Nginx::
+
+    location /rest/ {
+        include /etc/nginx/funkwhale_proxy.conf;
+        proxy_pass   http://funkwhale-api/api/subsonic/rest/;
+    }
+
+Apache2::
+
+    <Location "/rest">
+        ProxyPass ${funkwhale-api}/api/subsonic/rest
+        ProxyPassReverse ${funkwhale-api}/api/subsonic/rest
+     </Location>
+
+
 0.13 (2018-05-19)
 -----------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index b0d7cc517..0896aba8a 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.13'
+__version__ = '0.14'
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/changes/changelog.d/106.bugfix b/changes/changelog.d/106.bugfix
deleted file mode 100644
index ff0f61609..000000000
--- a/changes/changelog.d/106.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-File-upload importer should now work properly, assuming files are tagged (#106)
diff --git a/changes/changelog.d/164.enhancement b/changes/changelog.d/164.enhancement
deleted file mode 100644
index ceea6c2b8..000000000
--- a/changes/changelog.d/164.enhancement
+++ /dev/null
@@ -1,2 +0,0 @@
-Can now import a whole remote library at once thanks to new Action Table
-component (#164)
diff --git a/changes/changelog.d/179.bugfix b/changes/changelog.d/179.bugfix
deleted file mode 100644
index ac6c489e2..000000000
--- a/changes/changelog.d/179.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken ordering in front-end lists (#179)
diff --git a/changes/changelog.d/207.bugfix b/changes/changelog.d/207.bugfix
deleted file mode 100644
index edab45cdf..000000000
--- a/changes/changelog.d/207.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Consistent constraints/checks for URL size (#207)
diff --git a/changes/changelog.d/213.bugfix b/changes/changelog.d/213.bugfix
deleted file mode 100644
index d6ff593b9..000000000
--- a/changes/changelog.d/213.bugfix
+++ /dev/null
@@ -1,9 +0,0 @@
-File-upload import now supports Flac files (#213)
-
-Flac files imports via upload
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You have nothing to do to benefit from this, however, since Flac files
-tend to be a lot bigger than other files, you may want to increase the
-``client_max_body_size`` value in your Nginx configuration if you plan
-to upload flac files.
diff --git a/changes/changelog.d/214.bugfix b/changes/changelog.d/214.bugfix
deleted file mode 100644
index f2f36c4af..000000000
--- a/changes/changelog.d/214.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not crash on flac import if musicbrainz tags are missing (#214)
diff --git a/changes/changelog.d/216.enhancement b/changes/changelog.d/216.enhancement
deleted file mode 100644
index 0ed9dec48..000000000
--- a/changes/changelog.d/216.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added Support for OggTheora in import.
diff --git a/changes/changelog.d/218.bugfix b/changes/changelog.d/218.bugfix
deleted file mode 100644
index f754d7ca4..000000000
--- a/changes/changelog.d/218.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Ensure inactive users cannot get auth tokens (#218)
-This was already the case bug we missed some checks
diff --git a/changes/changelog.d/219.enhancement b/changes/changelog.d/219.enhancement
deleted file mode 100644
index fec9a07ac..000000000
--- a/changes/changelog.d/219.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Can now use album covers from flac/mp3 metadata and separate file in track directory  (#219)
diff --git a/changes/changelog.d/220.bugfix b/changes/changelog.d/220.bugfix
deleted file mode 100644
index 1913df1bd..000000000
--- a/changes/changelog.d/220.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Read ID3Tag Tracknumber from TRCK (#220)
diff --git a/changes/changelog.d/223.feature b/changes/changelog.d/223.feature
deleted file mode 100644
index c2f104ba5..000000000
--- a/changes/changelog.d/223.feature
+++ /dev/null
@@ -1,10 +0,0 @@
-Files management interface for users with "library" permission (#223)
-
-Files management interface
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This is the first bit of an ongoing work that will span several releases, to
-bring more powerful library management features to Funkwhale. This iteration
-includes a basic file management interface where users with the "library"
-permission can list and search available files, order them using
-various criterias (size, bitrate, duration...) and delete them.
diff --git a/changes/changelog.d/224.enhancement b/changes/changelog.d/224.enhancement
deleted file mode 100644
index 43c2e88c0..000000000
--- a/changes/changelog.d/224.enhancement
+++ /dev/null
@@ -1,30 +0,0 @@
-Retructured music API to increase performance and remove useless endpoints (#224)
-
-Music API changes
-^^^^^^^^^^^^^^^^^
-
-This release includes an API break. Even though the API is advertised
-as unstable, and not documented, here is a brief explanation of the change in
-case you are using the API in a client or in a script. Summary of the changes:
-
-- ``/api/v1/artists`` does not includes a list of tracks anymore. It was to heavy
-  to return all of this data all the time. You can get all tracks for an
-  artist using ``/api/v1/tracks?artist=artist_id``
-- Additionally, ``/api/v1/tracks`` now support an ``album`` filter to filter
-  tracks matching an album
-- ``/api/v1/artists/search``, ``/api/v1/albums/search`` and ``/api/v1/tracks/search``
-  endpoints are removed. Use ``/api/v1/{artists|albums|tracks}/?q=yourquery``
-  instead. It's also more powerful, since you can combine search with other
-  filters and ordering options.
-- ``/api/v1/requests/import-requests/search`` endpoint is removed as well.
-  Use ``/api/v1/requests/import-requests/?q=yourquery``
-  instead. It's also more powerful, since you can combine search with other
-  filters and ordering options.
-
-Of course, the front-end was updated to work with the new API, so this should
-not impact end-users in any way, apart from slight performance gains.
-
-.. note::
-
-    The API is still not stable and may evolve again in the future. API freeze
-    will come at a later point.
diff --git a/changes/changelog.d/225.bugfix b/changes/changelog.d/225.bugfix
deleted file mode 100644
index d14c7b9a5..000000000
--- a/changes/changelog.d/225.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Display proper total number of tracks on radio detail (#225)
diff --git a/changes/changelog.d/226.bugfix b/changes/changelog.d/226.bugfix
deleted file mode 100644
index 18d448c23..000000000
--- a/changes/changelog.d/226.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Empty save button in radio builder (#226)
diff --git a/changes/changelog.d/227.bugfix b/changes/changelog.d/227.bugfix
deleted file mode 100644
index 5e67d186d..000000000
--- a/changes/changelog.d/227.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a few broken translations strings (#227)
diff --git a/changes/changelog.d/228.feature b/changes/changelog.d/228.feature
deleted file mode 100644
index 548c1927e..000000000
--- a/changes/changelog.d/228.feature
+++ /dev/null
@@ -1,3 +0,0 @@
-New action table component for quick and efficient batch actions (#228)
-This is implemented on the federated tracks pages, but will be included
-in other pages as well depending on the feedback.
diff --git a/changes/changelog.d/229.bugfix b/changes/changelog.d/229.bugfix
deleted file mode 100644
index 118ed6af2..000000000
--- a/changes/changelog.d/229.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure anonymous users can use the app if the instance is configured accordingly (#229)
diff --git a/changes/changelog.d/230.enhancement b/changes/changelog.d/230.enhancement
deleted file mode 100644
index 3d8c4176f..000000000
--- a/changes/changelog.d/230.enhancement
+++ /dev/null
@@ -1,22 +0,0 @@
-Added a new "upload" permission that allows user to launch import and view
-their own imports (#230)
-
-New "upload" permission
-^^^^^^^^^^^^^^^^^^^^^^^
-
-This new permission is helpful if you want to give upload/import rights
-to some users, but don't want them to be able to manage the library as a whole:
-although there are no controls yet for managing library in the fron-end,
-subsequent release will introduce management interfaces for artists, files,
-etc.
-
-Because of that, users with the "library" permission will have much more power,
-and will also be able to remove content from the platform. On the other hand,
-users with the "upload" permission will only have the ability to add new
-content.
-
-Also, this release also includes a new feature called "default permissions":
-those are permissions that are granted to every users on the platform.
-On public/open instances, this will play well with the "upload" permission
-since everyone will be able to contribute to the instance library without
-an admin giving the permission to every single user.
diff --git a/changes/changelog.d/231.bugfix b/changes/changelog.d/231.bugfix
deleted file mode 100644
index 0b37b6274..000000000
--- a/changes/changelog.d/231.bugfix
+++ /dev/null
@@ -1,50 +0,0 @@
-We now fetch album covers regardless of the import methods (#231)
-
-Smarter album cover importer
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In earlier versions, covers where only imported when launching a YouTube import.
-Starting from this release, covers will be imported regardless of the import mode
-(file upload, youtube-dl, CLI, in-place...). Funkwhale will look for covers
-in the following order:
-
-1. In the imported file itself (FLAC/MP3 only)
-2. In a cover.jpg or cover.png in the file directory
-3. By fetching cover art from Musibrainz, assuming the file is tagged correctly
-
-This will only work for newly imported tracks and albums though. In the future,
-we may offer an option to refetch album covers from the interface, but in the
-meantime, you can use the following snippet:
-
-.. code-block:: python
-
-    # Store this in /tmp/update_albums.py
-    from funkwhale_api.music.models import Album, TrackFile
-    from funkwhale_api.music.tasks import update_album_cover
-
-    albums_without_covers = Album.objects.filter(cover='')
-    total = albums_without_covers.count()
-    print('Found {} albums without cover'.format(total))
-    for i, album in enumerate(albums_without_covers.iterator()):
-        print('[{}/{}] Fetching cover for {}...'.format(i+1, total, album.title))
-        f = TrackFile.objects.filter(track__album=album).filter(source__startswith='file://').first()
-        update_album_cover(album, track_file=f)
-
-Then launch it::
-
-    # docker setups
-    cat /tmp/update_albums.py | docker-compose run --rm api python manage.py shell -i python
-
-    # non-docker setups
-    source /srv/funkwhale/load_env
-    source /srv/funkwhale/virtualenv/bin/activate
-    cat /tmp/update_albums.py | python manage.py shell -i python
-
-    # cleanup
-    rm /tmp/update_albums.py
-
-.. note::
-
-    Depending on your number of albums, the previous snippet may take some time
-    to execute. You can interrupt it at any time using ctrl-c and relaunch it later,
-    as it's idempotent.
diff --git a/changes/changelog.d/236.feature b/changes/changelog.d/236.feature
deleted file mode 100644
index 379f9648e..000000000
--- a/changes/changelog.d/236.feature
+++ /dev/null
@@ -1,2 +0,0 @@
-Admins can now configure default permissions that will be granted to all
-registered users (#236)
diff --git a/changes/changelog.d/240.bugfix b/changes/changelog.d/240.bugfix
deleted file mode 100644
index 69e8048b8..000000000
--- a/changes/changelog.d/240.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed ignored page_size paremeter on artist and favorites list (#240)
diff --git a/changes/changelog.d/241.enhancement b/changes/changelog.d/241.enhancement
deleted file mode 100644
index 00c84c497..000000000
--- a/changes/changelog.d/241.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Autoremove media files on model instance deletion (#241)
diff --git a/changes/changelog.d/249.doc b/changes/changelog.d/249.doc
deleted file mode 100644
index df0fbb7d1..000000000
--- a/changes/changelog.d/249.doc
+++ /dev/null
@@ -1,26 +0,0 @@
-Added missing subsonic configuration block in deployment vhost files (#249)
-
-Missing subsonic configuration bloc in vhost files
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Because of a missing bloc in the sample Nginx and Apache configurations,
-instances that were deployed after the 0.13 release are likely to be unable
-to answer to Subsonic clients (the missing bits were properly documented
-in the changelog).
-
-Ensure you have the following snippets in your Nginx or Apache configuration
-if you plan to use the Subsonic API.
-
-Nginx::
-
-    location /rest/ {
-        include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api/api/subsonic/rest/;
-    }
-
-Apache2::
-
-    <Location "/rest">
-        ProxyPass ${funkwhale-api}/api/subsonic/rest
-        ProxyPassReverse ${funkwhale-api}/api/subsonic/rest
-     </Location>
diff --git a/changes/changelog.d/251.doc b/changes/changelog.d/251.doc
deleted file mode 100644
index d54b1137a..000000000
--- a/changes/changelog.d/251.doc
+++ /dev/null
@@ -1 +0,0 @@
-Moved upgrade doc under install doc in TOC (#251)
diff --git a/changes/changelog.d/258.enhancement b/changes/changelog.d/258.enhancement
deleted file mode 100644
index 28f05c01b..000000000
--- a/changes/changelog.d/258.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Implemented getCovertArt in Subsonic API to serve album covers (#258)
\ No newline at end of file
diff --git a/changes/changelog.d/260.enhancement b/changes/changelog.d/260.enhancement
deleted file mode 100644
index 8d6503473..000000000
--- a/changes/changelog.d/260.enhancement
+++ /dev/null
@@ -1,2 +0,0 @@
-Implemented scrobble endpoint of subsonic API, listenings are now tracked
-correctly from third party apps that use this endpoint (#260)
diff --git a/changes/changelog.d/acoustid.misc b/changes/changelog.d/acoustid.misc
deleted file mode 100644
index 7fc34febe..000000000
--- a/changes/changelog.d/acoustid.misc
+++ /dev/null
@@ -1 +0,0 @@
-Removed acoustid support, as the integration was buggy and error-prone (#106)