Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andy Craze
funkwhale
Commits
37ff297f
Verified
Commit
37ff297f
authored
5 years ago
by
Eliot Berriot
Browse files
Options
Downloads
Patches
Plain Diff
See #170: can now filter playlists by track, artist and album
parent
27801ce5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
api/funkwhale_api/playlists/filters.py
+16
-0
16 additions, 0 deletions
api/funkwhale_api/playlists/filters.py
api/tests/playlists/test_filters.py
+29
-0
29 additions, 0 deletions
api/tests/playlists/test_filters.py
with
45 additions
and
0 deletions
api/funkwhale_api/playlists/filters.py
+
16
−
0
View file @
37ff297f
...
...
@@ -2,6 +2,7 @@ from django.db.models import Count
from
django_filters
import
rest_framework
as
filters
from
funkwhale_api.common
import
filters
as
common_filters
from
funkwhale_api.music
import
models
as
music_models
from
funkwhale_api.music
import
utils
from
.
import
models
...
...
@@ -10,6 +11,21 @@ from . import models
class
PlaylistFilter
(
filters
.
FilterSet
):
q
=
filters
.
CharFilter
(
field_name
=
"
_
"
,
method
=
"
filter_q
"
)
playable
=
filters
.
BooleanFilter
(
field_name
=
"
_
"
,
method
=
"
filter_playable
"
)
track
=
filters
.
ModelChoiceFilter
(
"
playlist_tracks__track
"
,
queryset
=
music_models
.
Track
.
objects
.
all
(),
distinct
=
True
,
)
album
=
filters
.
ModelChoiceFilter
(
"
playlist_tracks__track__album
"
,
queryset
=
music_models
.
Album
.
objects
.
all
(),
distinct
=
True
,
)
artist
=
filters
.
ModelChoiceFilter
(
"
playlist_tracks__track__artist
"
,
queryset
=
music_models
.
Artist
.
objects
.
all
(),
distinct
=
True
,
)
scope
=
common_filters
.
ActorScopeFilter
(
actor_field
=
"
user__actor
"
,
distinct
=
True
)
class
Meta
:
...
...
This diff is collapsed.
Click to expand it.
api/tests/playlists/test_filters.py
0 → 100644
+
29
−
0
View file @
37ff297f
from
funkwhale_api.playlists
import
filters
from
funkwhale_api.playlists
import
models
def
test_playlist_filter_track
(
factories
,
queryset_equal_list
):
plt
=
factories
[
"
playlists.PlaylistTrack
"
]()
factories
[
"
playlists.PlaylistTrack
"
]()
qs
=
models
.
Playlist
.
objects
.
all
()
filterset
=
filters
.
PlaylistFilter
({
"
track
"
:
plt
.
track
.
pk
},
queryset
=
qs
)
assert
filterset
.
qs
==
[
plt
.
playlist
]
def
test_playlist_filter_album
(
factories
,
queryset_equal_list
):
plt
=
factories
[
"
playlists.PlaylistTrack
"
]()
factories
[
"
playlists.PlaylistTrack
"
]()
qs
=
models
.
Playlist
.
objects
.
all
()
filterset
=
filters
.
PlaylistFilter
({
"
album
"
:
plt
.
track
.
album
.
pk
},
queryset
=
qs
)
assert
filterset
.
qs
==
[
plt
.
playlist
]
def
test_playlist_filter_artist
(
factories
,
queryset_equal_list
):
plt
=
factories
[
"
playlists.PlaylistTrack
"
]()
factories
[
"
playlists.PlaylistTrack
"
]()
qs
=
models
.
Playlist
.
objects
.
all
()
filterset
=
filters
.
PlaylistFilter
({
"
artist
"
:
plt
.
track
.
artist
.
pk
},
queryset
=
qs
)
assert
filterset
.
qs
==
[
plt
.
playlist
]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment