github/supysonic
1
0
Fork 0
mirror of https://github.com/spl0k/supysonic.git synced 2024-11-10 04:02:17 +00:00
Code Issues Releases Wiki Activity

Porting supysonic.api.search

Browse Source
This commit is contained in:
Alban Féron 2022-12-30 16:41:00 +01:00
parent 8b93e0bc6e
commit dd2ef2ffeb
No known key found for this signature in database
GPG Key ID: 8CE0313646D16165
2 changed files with 89 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
supysonic/api/search.py
View File

@ -28,22 +28,32 @@ def old_search():
min_date = datetime.fromtimestamp(newer_than)
if artist:
query = select(
t.folder.parent
for t in Track
if artist in t.folder.parent.name and t.folder.parent.created > min_date
Child = Folder.alias()
query = (
Folder.select()
.join(Child, on=Child.parent == Folder.id)
.join(Track, on=Track.folder == Child.id)
.where(Folder.name.contains(artist), Folder.created > min_date)
.distinct()
)
elif album:
query = select(
t.folder
for t in Track
if album in t.folder.name and t.folder.created > min_date
query = (
Folder.select()
.join(Track, on=Track.folder)
.where(Folder.name.contains(album), Folder.created > min_date)
.distinct()
)
elif title:
query = Track.select(lambda t: title in t.title and t.created > min_date)
query = Track.select().where(
Track.title.contains(title), Track.created > min_date
)
elif anyf:
folders = Folder.select(lambda f: anyf in f.name and f.created > min_date)
tracks = Track.select(lambda t: anyf in t.title and t.created > min_date)
folders = Folder.select().where(
Folder.name.contains(anyf), Folder.created > min_date
)
tracks = Track.select().where(
Track.title.contains(anyf), Track.created > min_date
)
res = folders[offset : offset + count]
fcount = folders.count()
if offset + count > fcount:
@ -114,18 +124,30 @@ def new_search():
song_offset = int(song_offset) if song_offset else 0
root = get_root_folder(mfid)
artists = select(t.folder.parent for t in Track if query in t.folder.parent.name)
albums = select(t.folder for t in Track if query in t.folder.name)
songs = Track.select(lambda t: query in t.title)
Child = Folder.alias()
artists = (
Folder.select()
.join(Child, on=Child.parent == Folder.id)
.join(Track, on=Track.folder == Child.id)
.where(Folder.name.contains(query))
.distinct()
)
albums = (
Folder.select()
.join(Track, on=Track.folder)
.where(Folder.name.contains(query))
.distinct()
)
songs = Track.select().where(Track.title.contains(query))
if root is not None:
artists = artists.where(lambda t: t.root_folder == root)
albums = albums.where(lambda t: t.root_folder == root)
songs = songs.where(lambda t: t.root_folder == root)
artists = artists.where(Track.root_folder == root)
albums = albums.where(Track.root_folder == root)
songs = songs.where(Track.root_folder == root)
artists = artists.limit(artist_count, artist_offset)
albums = albums.limit(album_count, album_offset)
songs = songs.limit(song_count, song_offset)
artists = artists.limit(artist_count).offset(artist_offset)
albums = albums.limit(album_count).offset(album_offset)
songs = songs.limit(song_count).offset(song_offset)
return request.formatter(
"searchResult2",
@ -174,18 +196,18 @@ def search_id3():
song_offset = int(song_offset) if song_offset else 0
root = get_root_folder(mfid)
artists = Artist.select(lambda a: query in a.name)
albums = Album.select(lambda a: query in a.name)
songs = Track.select(lambda t: query in t.title)
artists = Artist.select().where(Artist.name.contains(query))
albums = Album.select().where(Album.name.contains(query))
songs = Track.select().where(Track.title.contains(query))
if root is not None:
artists = artists.where(lambda a: root in a.tracks.root_folder)
albums = albums.where(lambda a: root in a.tracks.root_folder)
songs = songs.where(lambda t: t.root_folder == root)
artists = artists.join(Track).where(Track.root_folder == root)
albums = albums.join(Track).where(Track.root_folder == root)
songs = songs.where(Track.root_folder == root)
artists = artists.limit(artist_count, artist_offset)
albums = albums.limit(album_count, album_offset)
songs = songs.limit(song_count, song_offset)
artists = artists.limit(artist_count).offset(artist_offset)
albums = albums.limit(album_count).offset(album_offset)
songs = songs.limit(song_count).offset(song_offset)
return request.formatter(
"searchResult3",

21
tests/api/test_search.py
View File

@ -8,8 +8,6 @@
import time
import unittest
from pony.orm import db_session, commit
from supysonic.db import Folder, Artist, Album, Track
from .apitestbase import ApiTestBase
@ -19,29 +17,30 @@ class SearchTestCase(ApiTestBase):
def setUp(self):
super().setUp()
with db_session:
root = Folder(root=True, name="Root folder", path="tests/assets")
Folder(root=True, name="Empty", path="/tmp")
root = Folder.create(root=True, name="Root folder", path="tests/assets")
Folder.create(root=True, name="Empty", path="/tmp")
for letter in "ABC":
folder = Folder(
folder = Folder.create(
name=letter + "rtist",
path="tests/assets/{}rtist".format(letter),
root=False,
parent=root,
)
artist = Artist(name=letter + "rtist")
artist = Artist.create(name=letter + "rtist")
for lether in "AB":
afolder = Folder(
afolder = Folder.create(
name=letter + lether + "lbum",
path="tests/assets/{0}rtist/{0}{1}lbum".format(letter, lether),
root=False,
parent=folder,
)
album = Album(name=letter + lether + "lbum", artist=artist)
album = Album.create(name=letter + lether + "lbum", artist=artist)
for num, song in enumerate(["One", "Two", "Three"]):
Track(
Track.create(
disc=1,
number=num,
title=song,
@ -57,8 +56,6 @@ class SearchTestCase(ApiTestBase):
folder=afolder,
)
commit()
self.assertEqual(Folder.select().count(), 11)
self.assertEqual(Artist.select().count(), 3)
self.assertEqual(Album.select().count(), 6)