Merge branch 'feature/acoustid' into 'develop'
Acoustid / File importer See merge request funkwhale/funkwhale!38
No related branches found
No related tags found
Showing
- CHANGELOG 9 additions, 1 deletionCHANGELOG
- api/Dockerfile 2 additions, 2 deletionsapi/Dockerfile
- api/config/api_urls.py 1 addition, 0 deletionsapi/config/api_urls.py
- api/config/settings/common.py 4 additions, 4 deletionsapi/config/settings/common.py
- api/config/settings/local.py 1 addition, 1 deletionapi/config/settings/local.py
- api/config/settings/test.py 2 additions, 2 deletionsapi/config/settings/test.py
- api/docker/Dockerfile.test 1 addition, 0 deletionsapi/docker/Dockerfile.test
- api/funkwhale_api/common/permissions.py 12 additions, 1 deletionapi/funkwhale_api/common/permissions.py
- api/funkwhale_api/music/factories.py 8 additions, 0 deletionsapi/funkwhale_api/music/factories.py
- api/funkwhale_api/music/migrations/0016_trackfile_acoustid_track_id.py 18 additions, 0 deletions..._api/music/migrations/0016_trackfile_acoustid_track_id.py
- api/funkwhale_api/music/migrations/0017_auto_20171227_1728.py 28 additions, 0 deletions...funkwhale_api/music/migrations/0017_auto_20171227_1728.py
- api/funkwhale_api/music/models.py 20 additions, 37 deletionsapi/funkwhale_api/music/models.py
- api/funkwhale_api/music/serializers.py 3 additions, 1 deletionapi/funkwhale_api/music/serializers.py
- api/funkwhale_api/music/tasks.py 102 additions, 0 deletionsapi/funkwhale_api/music/tasks.py
- api/funkwhale_api/music/views.py 38 additions, 6 deletionsapi/funkwhale_api/music/views.py
- api/funkwhale_api/providers/acoustid/__init__.py 27 additions, 0 deletionsapi/funkwhale_api/providers/acoustid/__init__.py
- api/funkwhale_api/providers/acoustid/dynamic_preferences_registry.py 13 additions, 0 deletions...le_api/providers/acoustid/dynamic_preferences_registry.py
- api/funkwhale_api/providers/audiofile/management/commands/import_files.py 48 additions, 8 deletions...i/providers/audiofile/management/commands/import_files.py
- api/funkwhale_api/providers/audiofile/tasks.py 26 additions, 4 deletionsapi/funkwhale_api/providers/audiofile/tasks.py
- api/funkwhale_api/taskapp/celery.py 17 additions, 7 deletionsapi/funkwhale_api/taskapp/celery.py
Loading
Please register or sign in to comment