diff --git a/api/config/plugins.py b/api/config/plugins.py index 3603d652d..3d3810f90 100644 --- a/api/config/plugins.py +++ b/api/config/plugins.py @@ -286,7 +286,7 @@ def install_dependencies(deps): return logger.info("Installing plugins dependencies %s", deps) pip_path = os.path.join(os.path.dirname(sys.executable), "pip") - subprocess.check_call([pip_path, "install"] + deps) + subprocess.check_call([pip_path, "install", "--upgrade"] + deps) def background_task(name): diff --git a/api/funkwhale_api/cli/plugins.py b/api/funkwhale_api/cli/plugins.py index bcc10786f..bb3bf5b7e 100644 --- a/api/funkwhale_api/cli/plugins.py +++ b/api/funkwhale_api/cli/plugins.py @@ -31,4 +31,4 @@ def pip_install(deps, target): if not deps: return pip_path = os.path.join(os.path.dirname(sys.executable), "pip") - subprocess.check_call([pip_path, "install", "-t", target] + deps) + subprocess.check_call([pip_path, "install", "--upgrade", "-t", target] + deps) diff --git a/api/funkwhale_api/music/admin.py b/api/funkwhale_api/music/admin.py index dec75f484..e86d0eb6e 100644 --- a/api/funkwhale_api/music/admin.py +++ b/api/funkwhale_api/music/admin.py @@ -77,7 +77,7 @@ class UploadAdmin(admin.ModelAdmin): "acoustid_track_id", "track__title", "track__album__title", - "track__artist__name", + "track__artist_credit__artist__name", ] list_filter = ["mimetype", "import_status", "library__privacy_level"] diff --git a/api/funkwhale_api/music/fake_data.py b/api/funkwhale_api/music/fake_data.py index 9f74c1f72..496c7fe96 100644 --- a/api/funkwhale_api/music/fake_data.py +++ b/api/funkwhale_api/music/fake_data.py @@ -11,6 +11,7 @@ from funkwhale_api.favorites import factories as favorites_factories from funkwhale_api.federation import factories as federation_factories from funkwhale_api.history import factories as history_factories from funkwhale_api.music import factories as music_factories +from funkwhale_api.music import models as music_models from funkwhale_api.playlists import factories as playlist_factories from funkwhale_api.users import models, serializers @@ -63,7 +64,12 @@ def create_data(super_user_name=None): track=upload.track, actor=upload.library.actor ) - print("Created fid", upload.track.fid) + if artist_credit := music_models.ArtistCredit.objects.filter(artist__name="vald"): + artist_credit = artist_credit[0] + else: + artist_credit = music_factories.ArtistCreditFactory(artist__name="vald") + + music_factories.TrackFactory(title="shoot un ministre", artist_credit=artist_credit) playlist = playlist_factories.PlaylistFactory( name="playlist test public",