Desacoblar playlists de sessions i afegir slow jams
This commit is contained in:
@@ -1,10 +1,5 @@
|
||||
from fastapi import Request
|
||||
from fastapi.responses import HTMLResponse
|
||||
from folkugat_web.model.pagines import Pages
|
||||
from folkugat_web.services import playlists as playlists_service
|
||||
from folkugat_web.services import sessions as sessions_service
|
||||
from folkugat_web.services.temes import query as query_service
|
||||
from folkugat_web.services.temes import search as search_service
|
||||
from folkugat_web.templates import templates
|
||||
|
||||
|
||||
|
||||
30
folkugat_web/fragments/sessio/notes.py
Normal file
30
folkugat_web/fragments/sessio/notes.py
Normal file
@@ -0,0 +1,30 @@
|
||||
from fastapi import Request
|
||||
from folkugat_web.services import sessions as sessions_service
|
||||
from folkugat_web.templates import templates
|
||||
|
||||
|
||||
def notes(request: Request, session_id: int, logged_in: bool):
|
||||
session = sessions_service.get_session(session_id=session_id)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/notes.html",
|
||||
{
|
||||
"request": request,
|
||||
"logged_in": logged_in,
|
||||
"session_id": session_id,
|
||||
"session": session,
|
||||
"notes": session.notes if session and session.notes else "",
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def notes_editor(request: Request, session_id: int):
|
||||
session = sessions_service.get_session(session_id=session_id)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/notes_editor.html",
|
||||
{
|
||||
"request": request,
|
||||
"session_id": session_id,
|
||||
"notes": session.notes if session and session.notes else "",
|
||||
"max": max,
|
||||
}
|
||||
)
|
||||
@@ -9,8 +9,7 @@ def pagina(request: Request, session_id: int, logged_in: bool):
|
||||
session = sessions_service.get_session(session_id=session_id)
|
||||
if not session:
|
||||
raise HTTPException(status_code=404, detail="Could not find session")
|
||||
playlist = playlists_service.get_playlist(session_id=session_id)
|
||||
playlist = playlists_service.add_temes_to_playlist(playlist)
|
||||
session = sessions_service.add_playlists_to_session(session=session)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/pagina.html",
|
||||
{
|
||||
@@ -19,7 +18,6 @@ def pagina(request: Request, session_id: int, logged_in: bool):
|
||||
"Pages": Pages,
|
||||
"session_id": session_id,
|
||||
"session": session,
|
||||
"playlist": playlist,
|
||||
"date_names": sessions_service.get_date_names,
|
||||
}
|
||||
)
|
||||
|
||||
@@ -1,169 +0,0 @@
|
||||
from fastapi import Request
|
||||
from fastapi.responses import HTMLResponse
|
||||
from folkugat_web.model.pagines import Pages
|
||||
from folkugat_web.services import playlists as playlists_service
|
||||
from folkugat_web.services import sessions as sessions_service
|
||||
from folkugat_web.services.temes import query as query_service
|
||||
from folkugat_web.services.temes import search as search_service
|
||||
from folkugat_web.templates import templates
|
||||
|
||||
|
||||
def add_set(request: Request, session_id: int, logged_in: bool):
|
||||
new_set = playlists_service.add_set(session_id=session_id)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/set_entry.html",
|
||||
{
|
||||
"request": request,
|
||||
"logged_in": logged_in,
|
||||
"new_entry": True,
|
||||
"session_id": session_id,
|
||||
"set_id": new_set.id,
|
||||
"set_entry": new_set,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def get_set(request: Request, session_id: int, set_id: int, logged_in: bool):
|
||||
set_entry = playlists_service.get_set(session_id=session_id, set_id=set_id)
|
||||
if set_entry:
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/set_entry.html",
|
||||
{
|
||||
"request": request,
|
||||
"logged_in": logged_in,
|
||||
"new_entry": True,
|
||||
"session_id": session_id,
|
||||
"set_id": set_id,
|
||||
"set_entry": set_entry,
|
||||
}
|
||||
)
|
||||
else:
|
||||
return HTMLResponse()
|
||||
|
||||
|
||||
def delete_set(session_id: int, set_id: int):
|
||||
playlists_service.delete_set(session_id=session_id, set_id=set_id)
|
||||
return HTMLResponse()
|
||||
|
||||
|
||||
def add_tema(request: Request, session_id: int, set_id: int, logged_in: bool):
|
||||
new_tema = playlists_service.add_tema(session_id=session_id, set_id=set_id)
|
||||
playlists_service.add_tema_to_tema_in_set(new_tema)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/tema_editor.html",
|
||||
{
|
||||
"request": request,
|
||||
"logged_in": logged_in,
|
||||
"session_id": session_id,
|
||||
"set_id": set_id,
|
||||
"tema_entry": new_tema,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def get_tema(request: Request, session_id: int, set_id: int, entry_id: int, logged_in: bool):
|
||||
tema_entry = playlists_service.get_tema(entry_id=entry_id)
|
||||
playlists_service.add_tema_to_tema_in_set(tema_entry)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/tema_entry.html",
|
||||
{
|
||||
"request": request,
|
||||
"logged_in": logged_in,
|
||||
"session_id": session_id,
|
||||
"set_id": set_id,
|
||||
"tema_entry": tema_entry,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def get_tema_editor(request: Request, session_id: int, set_id: int, entry_id: int, logged_in: bool):
|
||||
tema_entry = playlists_service.get_tema(entry_id=entry_id)
|
||||
playlists_service.add_tema_to_tema_in_set(tema_entry)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/tema_editor.html",
|
||||
{
|
||||
"request": request,
|
||||
"logged_in": logged_in,
|
||||
"session_id": session_id,
|
||||
"set_id": set_id,
|
||||
"tema_entry": tema_entry,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def delete_tema(session_id: int, set_id: int, entry_id: int):
|
||||
playlists_service.delete_tema(entry_id=entry_id)
|
||||
if not playlists_service.get_set(session_id=session_id, set_id=set_id):
|
||||
headers = {
|
||||
"HX-Trigger": f"reload-set-{set_id}"
|
||||
}
|
||||
else:
|
||||
headers = {}
|
||||
return HTMLResponse(headers=headers)
|
||||
|
||||
|
||||
def busca_tema(
|
||||
request: Request,
|
||||
session_id: int,
|
||||
set_id: int,
|
||||
entry_id: int,
|
||||
query: str,
|
||||
):
|
||||
n_results = 4
|
||||
suggestions = []
|
||||
if not query:
|
||||
# If there is no query, suggest tunes commonly played together
|
||||
set_entry = playlists_service.get_set(
|
||||
session_id=session_id,
|
||||
set_id=set_id,
|
||||
)
|
||||
if set_entry:
|
||||
tema_ids = {tema_in_set.tema_id
|
||||
for tema_in_set in set_entry.temes
|
||||
if tema_in_set and tema_in_set.tema_id is not None}
|
||||
commonly_played_tema_ids = {
|
||||
cpt.tema.id
|
||||
for tema_id in tema_ids
|
||||
for cpt in playlists_service.get_commonly_played_temes(tema_id)
|
||||
if cpt.tema.id is not None
|
||||
} - tema_ids
|
||||
suggestions = query_service.get_temes_by_ids(
|
||||
tema_ids=list(commonly_played_tema_ids)
|
||||
)
|
||||
if len(suggestions) >= n_results:
|
||||
suggestions = suggestions[:n_results]
|
||||
elif not suggestions:
|
||||
suggestions = search_service.busca_temes(
|
||||
query=query,
|
||||
properties=[],
|
||||
hidden=True,
|
||||
limit=n_results,
|
||||
offset=0,
|
||||
)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/tema_results.html",
|
||||
{
|
||||
"request": request,
|
||||
"session_id": session_id,
|
||||
"set_id": set_id,
|
||||
"entry_id": entry_id,
|
||||
"results": suggestions,
|
||||
"query": query,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def set_tema(request: Request, logged_in: bool, session_id: int, set_id: int, entry_id: int, tema_id: int | None):
|
||||
playlists_service.set_tema(session_id=session_id, set_id=set_id, entry_id=entry_id, tema_id=tema_id)
|
||||
tema_entry = playlists_service.get_tema(entry_id=entry_id)
|
||||
playlists_service.add_tema_to_tema_in_set(tema_entry)
|
||||
return templates.TemplateResponse(
|
||||
"fragments/sessio/tema_entry.html",
|
||||
{
|
||||
"request": request,
|
||||
"logged_in": logged_in,
|
||||
"session_id": session_id,
|
||||
"set_id": set_id,
|
||||
"tema_entry": tema_entry,
|
||||
}
|
||||
)
|
||||
Reference in New Issue
Block a user