MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure distinct is applied on all playable_by querysets

This commit is contained in:
Eliot Berriot 2018-10-21 19:58:05 +02:00
parent 439d4fd6b3
commit 8c5924d6e3
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/funkwhale_api/music/models.py
View File

@ -135,9 +135,9 @@ class ArtistQuerySet(models.QuerySet):
def playable_by(self, actor, include=True): def playable_by(self, actor, include=True):
tracks = Track.objects.playable_by(actor, include) tracks = Track.objects.playable_by(actor, include)
if include: if include:
return self.filter(tracks__in=tracks) return self.filter(tracks__in=tracks).distinct()
else: else:
return self.exclude(tracks__in=tracks) return self.exclude(tracks__in=tracks).distinct()
class Artist(APIModelMixin): class Artist(APIModelMixin):
@ -203,9 +203,9 @@ class AlbumQuerySet(models.QuerySet):
def playable_by(self, actor, include=True): def playable_by(self, actor, include=True):
tracks = Track.objects.playable_by(actor, include) tracks = Track.objects.playable_by(actor, include)
if include: if include:
return self.filter(tracks__in=tracks) return self.filter(tracks__in=tracks).distinct()
else: else:
return self.exclude(tracks__in=tracks) return self.exclude(tracks__in=tracks).distinct()
class Album(APIModelMixin): class Album(APIModelMixin):
@ -399,9 +399,9 @@ class TrackQuerySet(models.QuerySet):
def playable_by(self, actor, include=True): def playable_by(self, actor, include=True):
files = Upload.objects.playable_by(actor, include) files = Upload.objects.playable_by(actor, include)
if include: if include:
return self.filter(uploads__in=files) return self.filter(uploads__in=files).distinct()
else: else:
return self.exclude(uploads__in=files) return self.exclude(uploads__in=files).distinct()
def annotate_duration(self): def annotate_duration(self):
first_upload = Upload.objects.filter(track=models.OuterRef("pk")).order_by("pk") first_upload = Upload.objects.filter(track=models.OuterRef("pk")).order_by("pk")
@ -557,8 +557,8 @@ class UploadQuerySet(models.QuerySet):
libraries = Library.objects.viewable_by(actor) libraries = Library.objects.viewable_by(actor)
if include: if include:
return self.filter(library__in=libraries, import_status="finished") return self.filter(library__in=libraries, import_status="finished").distinct()
return self.exclude(library__in=libraries, import_status="finished") return self.exclude(library__in=libraries, import_status="finished").distinct()
def local(self, include=True): def local(self, include=True):
return self.exclude(library__actor__user__isnull=include) return self.exclude(library__actor__user__isnull=include)

8
api/funkwhale_api/playlists/models.py
View File

@ -51,9 +51,9 @@ class PlaylistQuerySet(models.QuerySet):
def playable_by(self, actor, include=True): def playable_by(self, actor, include=True):
plts = PlaylistTrack.objects.playable_by(actor, include) plts = PlaylistTrack.objects.playable_by(actor, include)
if include: if include:
return self.filter(playlist_tracks__in=plts) return self.filter(playlist_tracks__in=plts).distinct()
else: else:
return self.exclude(playlist_tracks__in=plts) return self.exclude(playlist_tracks__in=plts).distinct()
class Playlist(models.Model): class Playlist(models.Model):
@ -167,9 +167,9 @@ class PlaylistTrackQuerySet(models.QuerySet):
def playable_by(self, actor, include=True): def playable_by(self, actor, include=True):
tracks = music_models.Track.objects.playable_by(actor, include) tracks = music_models.Track.objects.playable_by(actor, include)
if include: if include:
return self.filter(track__pk__in=tracks) return self.filter(track__pk__in=tracks).distinct()
else: else:
return self.exclude(track__pk__in=tracks) return self.exclude(track__pk__in=tracks).distinct()
class PlaylistTrack(models.Model): class PlaylistTrack(models.Model):