Upgraded celery to 4.1, added endpoint logic for fingerprinting audio files

api/funkwhale_api/providers/acoustid/__init__.py

@@ -0,0 +1,27 @@
+import acoustid
+
+from dynamic_preferences.registries import global_preferences_registry
+
+
+class Client(object):
+    def __init__(self, api_key):
+        self.api_key = api_key
+
+    def match(self, file_path):
+        return acoustid.match(self.api_key, file_path, parse=False)
+
+    def get_best_match(self, file_path):
+        results = self.match(file_path=file_path)
+        MIN_SCORE_FOR_MATCH = 0.8
+        try:
+            rows = results['results']
+        except KeyError:
+            return
+        for row in rows:
+            if row['score'] >= MIN_SCORE_FOR_MATCH:
+                return row
+
+
+def get_acoustid_client():
+    manager = global_preferences_registry.manager()
+    return Client(api_key=manager['providers_acoustid__api_key'])

api/funkwhale_api/providers/acoustid/dynamic_preferences_registry.py

@@ -0,0 +1,13 @@
+from dynamic_preferences.types import StringPreference, Section
+from dynamic_preferences.registries import global_preferences_registry
+
+acoustid = Section('providers_acoustid')
+
+
+@global_preferences_registry.register
+class APIKey(StringPreference):
+    section = acoustid
+    name = 'api_key'
+    default = ''
+    verbose_name = 'Acoustid API key'
+    help_text = 'The API key used to query AcoustID. Get one at https://acoustid.org/new-application.'

api/funkwhale_api/providers/audiofile/tasks.py

@@ -1,20 +1,20 @@
+import acoustid
 import os
 import datetime
 from django.core.files import File
 
 from funkwhale_api.taskapp import celery
+from funkwhale_api.providers.acoustid import get_acoustid_client
 from funkwhale_api.music import models, metadata
 
 
-@celery.app.task(name='audiofile.from_path')
-def from_path(path):
+def import_metadata_without_musicbrainz(path):
     data = metadata.Metadata(path)
     artist = models.Artist.objects.get_or_create(
         name__iexact=data.get('artist'),
         defaults={
             'name': data.get('artist'),
             'mbid': data.get('musicbrainz_artistid', None),
-
         },
     )[0]
 
@@ -39,11 +39,33 @@ def from_path(path):
             'mbid': data.get('musicbrainz_recordingid', None),
         },
     )[0]
+    return track
+
+
+def import_metadata_with_musicbrainz(path):
+    pass
+
+@celery.app.task(name='audiofile.from_path')
+def from_path(path):
+    acoustid_track_id = None
+    try:
+        client = get_acoustid_client()
+        result = client.get_best_match(path)
+        acoustid_track_id = result['id']
+    except acoustid.WebServiceError:
+        track = import_metadata_without_musicbrainz(path)
+    except (TypeError, KeyError):
+        track = import_metadata_without_musicbrainz(path)
+    else:
+        track, created = models.Track.get_or_create_from_api(
+            mbid=result['recordings'][0]['id']
+        )
 
     if track.files.count() > 0:
         raise ValueError('File already exists for track {}'.format(track.pk))
 
-    track_file = models.TrackFile(track=track)
+    track_file = models.TrackFile(
+        track=track, acoustid_track_id=acoustid_track_id)
     track_file.audio_file.save(
         os.path.basename(path),
         File(open(path, 'rb'))