From 17c4a92f77c728c6b179a260f5ee13d941ce0c93 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Thu, 30 Nov 2023 19:38:25 +0100 Subject: [PATCH] lint Part-of: --- .../contrib/listenbrainz/funkwhale_ready.py | 21 ------------------- .../contrib/listenbrainz/tasks.py | 7 +++---- api/funkwhale_api/favorites/views.py | 3 +-- api/tests/conftest.py | 12 ++++++++++- api/tests/contrib/listenbrainz/test_tasks.py | 3 ++- changes/changelog.d/2079.enhancement | 1 + 6 files changed, 18 insertions(+), 29 deletions(-) create mode 100644 changes/changelog.d/2079.enhancement diff --git a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py index 64b1b34ad..250019d00 100644 --- a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py +++ b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py @@ -4,13 +4,6 @@ from django.utils import timezone import funkwhale_api import pylistenbrainz -<<<<<<< HEAD -======= -from config import plugins -from django.utils import timezone - -from . import tasks ->>>>>>> bf0c861a0 (implement listening and favorite sync with listenbrainz) from .funkwhale_startup import PLUGIN from funkwhale_api.history import models as history_models @@ -25,17 +18,10 @@ def submit_listen(listening, conf, **kwargs): logger = PLUGIN["logger"] logger.info("Submitting listen to ListenBrainz") -<<<<<<< HEAD client = liblistenbrainz.ListenBrainz() client.set_auth_token(user_token) listen = get_listen(listening.track) -======= - - listen = get_listen(listening.track) - client = pylistenbrainz.ListenBrainz() - client.set_auth_token(user_token) ->>>>>>> bf0c861a0 (implement listening and favorite sync with listenbrainz) client.submit_single_listen(listen) @@ -65,19 +51,13 @@ def get_listen(track): if upload: additional_info["duration"] = upload.duration -<<<<<<< HEAD return liblistenbrainz.Listen( -======= - return pylistenbrainz.Listen( ->>>>>>> bf0c861a0 (implement listening and favorite sync with listenbrainz) track_name=track.title, artist_name=track.artist.name, listened_at=int(timezone.now()), release_name=release_name, additional_info=additional_info, ) -<<<<<<< HEAD -======= @plugins.register_hook(plugins.FAVORITE_CREATED, PLUGIN) @@ -152,4 +132,3 @@ def sync_favorites_from_listenbrainz(user, conf): ) except history_models.Listening.DoesNotExist: tasks.import_listenbrainz_favorites(user, user_name, last_ts) ->>>>>>> bf0c861a0 (implement listening and favorite sync with listenbrainz) diff --git a/api/funkwhale_api/contrib/listenbrainz/tasks.py b/api/funkwhale_api/contrib/listenbrainz/tasks.py index a498bb380..a61a2c864 100644 --- a/api/funkwhale_api/contrib/listenbrainz/tasks.py +++ b/api/funkwhale_api/contrib/listenbrainz/tasks.py @@ -1,13 +1,12 @@ import datetime import pylistenbrainz -from config import plugins from django.utils import timezone - -from funkwhale_api.users import models -from funkwhale_api.taskapp import celery +from config import plugins from funkwhale_api.history import models as history_models from funkwhale_api.music import models as music_models +from funkwhale_api.taskapp import celery +from funkwhale_api.users import models @celery.app.task(name="listenbrainz.trigger_listening_sync_with_listenbrainz") diff --git a/api/funkwhale_api/favorites/views.py b/api/funkwhale_api/favorites/views.py index 4edae860f..1fecf3e5a 100644 --- a/api/funkwhale_api/favorites/views.py +++ b/api/funkwhale_api/favorites/views.py @@ -1,11 +1,10 @@ -from config import plugins - from django.db.models import Prefetch from drf_spectacular.utils import extend_schema from rest_framework import mixins, status, viewsets from rest_framework.decorators import action from rest_framework.response import Response +from config import plugins from funkwhale_api.activity import record from funkwhale_api.common import fields, permissions from funkwhale_api.music import utils as music_utils diff --git a/api/tests/conftest.py b/api/tests/conftest.py index d241db5a7..0d5be2b79 100644 --- a/api/tests/conftest.py +++ b/api/tests/conftest.py @@ -27,7 +27,7 @@ from funkwhale_api.activity import record from funkwhale_api.federation import actors from funkwhale_api.moderation import mrf from funkwhale_api.music import licenses - +from funkwhale_api.contrib import listenbrainz from . import utils as test_utils pytest_plugins = "aiohttp.pytest_plugin" @@ -277,6 +277,16 @@ def disabled_musicbrainz(mocker): ) +# @pytest.fixture() +# def disabled_listenbrainz(mocker): +# # we ensure no listenbrainz requests gets out +# yield mocker.patch.object( +# listenbrainz.client.ListenBrainzClient, +# "_submit", +# return_value=None, +# ) + + @pytest.fixture(autouse=True) def r_mock(requests_mock): """ diff --git a/api/tests/contrib/listenbrainz/test_tasks.py b/api/tests/contrib/listenbrainz/test_tasks.py index b53ee02a6..7f9ee04df 100644 --- a/api/tests/contrib/listenbrainz/test_tasks.py +++ b/api/tests/contrib/listenbrainz/test_tasks.py @@ -1,7 +1,8 @@ import datetime -import pytest import pylistenbrainz +import pytest + from funkwhale_api.contrib.listenbrainz import tasks from funkwhale_api.history import models as history_models diff --git a/changes/changelog.d/2079.enhancement b/changes/changelog.d/2079.enhancement new file mode 100644 index 000000000..6c9cf7e31 --- /dev/null +++ b/changes/changelog.d/2079.enhancement @@ -0,0 +1 @@ +Add favorite and listening sync ith Listenbrainz (#2079)