Desacoblar playlists de sessions i afegir slow jams

folkugat_web/api/routes/__init__.py

@@ -1,14 +1,15 @@
 from folkugat_web.api.router import get_router
 
-from . import auth, index, sessio, sessions, tema, temes
+from . import auth, index, playlist, sessio, sessions, tema, temes
 
 router = get_router()
 
+router.include_router(auth.router)
+router.include_router(index.router)
+router.include_router(playlist.router)
 router.include_router(sessio.router)
 router.include_router(sessions.router)
 router.include_router(tema.router)
 router.include_router(temes.router)
-router.include_router(auth.router)
-router.include_router(index.router)
 
 __all__ = ["router"]

folkugat_web/api/routes/playlist/__init__.py

@@ -0,0 +1,9 @@
+from folkugat_web.api.router import get_router
+
+from . import playlist, set_page
+
+router = get_router()
+router.include_router(set_page.router)
+router.include_router(playlist.router)
+
+__all__ = ["router"]

folkugat_web/api/routes/playlist/playlist.py

@@ -2,141 +2,139 @@ from typing import Annotated
 
 from fastapi import Form, Request
 from folkugat_web.api.router import get_router
-from folkugat_web.fragments import live
-from folkugat_web.fragments.sessio import playlist
+from folkugat_web.fragments import playlist
 from folkugat_web.services import auth
 from folkugat_web.services.temes import write as temes_service
-from folkugat_web.templates import templates
 
 router = get_router()
 
 
-@router.post("/api/sessio/{session_id}/playlist/set")
+@router.post("/api/playlist/{playlist_id}/set")
 def add_set(
     request: Request,
     logged_in: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
 ):
     return playlist.add_set(
         request=request,
-        session_id=session_id,
+        playlist_id=playlist_id,
         logged_in=logged_in,
     )
 
 
-@router.get("/api/sessio/{session_id}/playlist/set/{set_id}")
+@router.get("/api/playlist/{playlist_id}/set/{set_id}")
 def get_set(
     request: Request,
     logged_in: auth.LoggedIn,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
 ):
     return playlist.get_set(
         request=request,
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         logged_in=logged_in,
     )
 
 
-@router.delete("/api/sessio/{session_id}/playlist/set/{set_id}")
+@router.delete("/api/playlist/{playlist_id}/set/{set_id}")
 def delete_set(
     _: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
 ):
     return playlist.delete_set(
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
     )
 
 
-@router.post("/api/sessio/{session_id}/playlist/set/{set_id}")
+@router.post("/api/playlist/{playlist_id}/set/{set_id}")
 def add_tema(
     request: Request,
     logged_in: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
 ):
     return playlist.add_tema(
         request=request,
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         logged_in=logged_in,
     )
 
 
-@router.get("/api/sessio/{session_id}/playlist/set/{set_id}/tema/{entry_id}")
+@router.get("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}")
 def get_tema(
     request: Request,
     logged_in: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
     entry_id: int,
 ):
     return playlist.get_tema(
         request=request,
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         entry_id=entry_id,
         logged_in=logged_in,
     )
 
 
-@router.get("/api/sessio/{session_id}/playlist/set/{set_id}/tema/{entry_id}/editor")
+@router.get("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}/editor")
 def get_tema_editor(
     request: Request,
     logged_in: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
     entry_id: int,
 ):
     return playlist.get_tema_editor(
         request=request,
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         entry_id=entry_id,
         logged_in=logged_in,
     )
 
 
-@router.delete("/api/sessio/{session_id}/playlist/set/{set_id}/tema/{entry_id}")
+@router.delete("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}")
 def delete_tema(
     _: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
     entry_id: int,
 ):
     return playlist.delete_tema(
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         entry_id=entry_id,
     )
 
 
-@router.get("/api/sessio/{session_id}/playlist/set/{set_id}/tema/{entry_id}/busca")
+@router.get("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}/busca")
 def busca_tema(
     request: Request,
     _: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
     entry_id: int,
     query: str,
 ):
     return playlist.busca_tema(
         request=request,
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         entry_id=entry_id,
         query=query,
     )
 
 
-@router.put("/api/sessio/{session_id}/playlist/set/{set_id}/tema/{entry_id}")
+@router.put("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}")
 def set_tema(
     request: Request,
     logged_in: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
     entry_id: int,
     tema_id: Annotated[int, Form()],
@@ -144,36 +142,36 @@ def set_tema(
     return playlist.set_tema(
         request=request,
         logged_in=logged_in,
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         entry_id=entry_id,
         tema_id=tema_id,
     )
 
 
-@router.put("/api/sessio/{session_id}/playlist/set/{set_id}/tema/{entry_id}/unknown")
+@router.put("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}/unknown")
 def set_tema_unknown(
     request: Request,
     logged_in: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
     entry_id: int,
 ):
     return playlist.set_tema(
         request=request,
         logged_in=logged_in,
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         entry_id=entry_id,
         tema_id=None,
     )
 
 
-@router.post("/api/sessio/{session_id}/playlist/set/{set_id}/tema/{entry_id}")
+@router.post("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}")
 def set_tema_new(
     request: Request,
     logged_in: auth.RequireLogin,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
     entry_id: int,
     title: Annotated[str, Form()],
@@ -182,7 +180,7 @@ def set_tema_new(
     return playlist.set_tema(
         request=request,
         logged_in=logged_in,
-        session_id=session_id,
+        playlist_id=playlist_id,
         set_id=set_id,
         entry_id=entry_id,
         tema_id=new_tema.id,

folkugat_web/api/routes/playlist/set_page.py

@@ -7,11 +7,11 @@ from folkugat_web.templates import templates
 router = get_router()
 
 
-@router.get("/sessio/{session_id}/set/{set_id}")
+@router.get("/playlist/{playlist_id}/set/{set_id}")
 def page(
     request: Request,
     logged_in: auth.LoggedIn,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
 ):
     return templates.TemplateResponse(
@@ -19,17 +19,22 @@ def page(
         {
             "request": request,
             "page_title": "Folkugat",
-            "content": f"/api/content/sessio/{session_id}/set/{set_id}",
+            "content": f"/api/content/playlist/{playlist_id}/set/{set_id}",
             "logged_in": logged_in,
         }
     )
 
 
-@router.get("/api/content/sessio/{session_id}/set/{set_id}")
+@router.get("/api/content/playlist/{playlist_id}/set/{set_id}")
 async def contingut(
     request: Request,
     logged_in: auth.LoggedIn,
-    session_id: int,
+    playlist_id: int,
     set_id: int,
 ):
-    return await set_page.pagina(request, session_id, set_id, logged_in)
+    return await set_page.pagina(
+        request=request,
+        playlist_id=playlist_id,
+        set_id=set_id,
+        logged_in=logged_in,
+    )

folkugat_web/api/routes/sessio/__init__.py

@@ -1,12 +1,11 @@
 from folkugat_web.api.router import get_router
 
-from . import cartell, index, live, playlist, set_page
+from . import cartell, index, live, notes
 
 router = get_router()
 router.include_router(cartell.router)
 router.include_router(index.router)
 router.include_router(live.router)
-router.include_router(set_page.router)
-router.include_router(playlist.router)
+router.include_router(notes.router)
 
 __all__ = ["router"]

folkugat_web/api/routes/sessio/notes.py

@@ -0,0 +1,47 @@
+import dataclasses
+from typing import Annotated
+
+from fastapi import HTTPException, Request
+from fastapi.params import Form
+from folkugat_web.api.router import get_router
+from folkugat_web.fragments.sessio import notes
+from folkugat_web.services import auth
+from folkugat_web.services import sessions as sessions_service
+
+router = get_router()
+
+
+@router.get("/api/sessio/{session_id}/notes")
+def get_notes(
+    request: Request,
+    logged_in: auth.LoggedIn,
+    session_id: int,
+):
+    return notes.notes(request, session_id, logged_in)
+
+
+@router.get("/api/sessio/{session_id}/notes/editor")
+def get_notes_editor(
+    request: Request,
+    _: auth.RequireLogin,
+    session_id: int,
+):
+    return notes.notes_editor(request, session_id)
+
+
+@router.put("/api/sessio/{session_id}/notes")
+async def set_notes(
+    request: Request,
+    logged_in: auth.RequireLogin,
+    session_id: int,
+    content: Annotated[str, Form()],
+):
+    session = sessions_service.get_session(session_id=session_id)
+    if not session:
+        raise HTTPException(status_code=404, detail="Could not find session")
+    new_session = dataclasses.replace(
+        session,
+        notes=content.strip(),
+    )
+    sessions_service.set_session(new_session)
+    return notes.notes(request, session_id, logged_in)