Upload 6 files

databases.py

@@ -251,12 +251,12 @@ def get_accessible_videos_with_sha1(session_id: str | None) -> List[Dict[str, An
     retorna diccionaris amb almenys les claus: video_name i sha1sum.
     """
 
-    # 1) Vídeos públics (segons camp privacy; fallback a visibility per compatibilitat)
+    # 1) Vídeos públics (segons camp visibility actual de la taula videos)
     public_rows: Dict[str, Dict[str, Any]] = {}
     with _connect_videos_db() as vconn:
         try:
             for row in vconn.execute(
-                "SELECT video_name, sha1sum FROM videos WHERE COALESCE(privacy, visibility) = 'public'"
+                "SELECT video_name, sha1sum FROM videos WHERE visibility = 'public'"
             ):
                 key = row["video_name"] or row["sha1sum"]
                 public_rows[key] = {"video_name": row["video_name"], "sha1sum": row["sha1sum"]}

page_modules/analyze_audiodescriptions.py

@@ -123,6 +123,13 @@ def render_analyze_audiodescriptions_page(api, permissions: Dict[str, bool]) ->
     session_id = st.session_state.get("session_id")
     accessible_rows = get_accessible_videos_with_sha1(session_id)
 
+    # DEBUG: llistar parelles <sha1sum, video_name> extretes de videos.db
+    try:
+        debug_pairs = [(row.get("sha1sum"), row.get("video_name")) for row in accessible_rows]
+        print(f"[DEBUG] accessible_rows (sha1sum, video_name) des de videos.db: {debug_pairs}")
+    except Exception as e:
+        print(f"[DEBUG] Error preparant debug_pairs: {e}")
+
     if not accessible_rows:
         st.info("No hi ha cap vídeo disponible per analitzar amb la sessió actual.")
         st.stop()
@@ -130,6 +137,16 @@ def render_analyze_audiodescriptions_page(api, permissions: Dict[str, bool]) ->
     # Base de media: demo/temp/media/<sha1sum>
     base_media_dir = Path(__file__).resolve().parent.parent / "temp" / "media"
 
+    # DEBUG: llistar subcarpetes actuals sota demo/temp/media
+    try:
+        if base_media_dir.exists():
+            media_subdirs = [p.name for p in sorted(base_media_dir.iterdir()) if p.is_dir()]
+        else:
+            media_subdirs = []
+        print(f"[DEBUG] Subcarpetes a {base_media_dir}: {media_subdirs}")
+    except Exception as e:
+        print(f"[DEBUG] Error llistant subcarpetes de media: {e}")
+
     if "current_video" not in st.session_state:
         st.session_state.current_video = None
 

page_modules/validation.py

@@ -8,17 +8,7 @@ from typing import Dict
 
 import streamlit as st
 
-
-def _build_candidates(runtime_videos: Path) -> Path:
-    candidates = [
-        runtime_videos,
-        Path(__file__).resolve().parent.parent / "videos",
-        Path.cwd() / "videos",
-    ]
-    for candidate in candidates:
-        if candidate.exists():
-            return candidate
-    return candidates[0]
+from databases import get_accessible_videos_with_sha1
 
 
 def render_validation_page(
@@ -35,34 +25,42 @@ def render_validation_page(
 
     tab_videos, tab_ads = st.tabs(["📹 Validar Vídeos", "🎬 Validar Audiodescripcions"])
 
-    base_dir = _build_candidates(runtime_videos)
-    if not base_dir.exists():
-        st.info("📝 No s'ha trobat la carpeta **videos**. Crea-la i afegeix-hi subcarpetes amb els teus vídeos.")
-        st.stop()
+    # Llista de vídeos accessibles des de demo/temp/videos.db
+    session_id = st.session_state.get("session_id")
+    accessible_rows = get_accessible_videos_with_sha1(session_id)
+
+    # Base de media: demo/temp/media/<sha1sum>
+    base_media_dir = Path(__file__).resolve().parent.parent / "temp" / "media"
 
     with tab_videos:
         st.subheader("📹 Validar Vídeos Pujats")
 
         video_folders = []
-        for folder in sorted(base_dir.iterdir()):
-            if folder.is_dir() and folder.name != "completed":
-                video_files = list(folder.glob("*.mp4")) + list(folder.glob("*.avi")) + list(folder.glob("*.mov"))
-                if video_files:
-                    mod_time = folder.stat().st_mtime
-                    fecha = datetime.fromtimestamp(mod_time).strftime("%Y-%m-%d %H:%M")
-                    video_folders.append(
-                        {
-                            "name": folder.name,
-                            "path": str(folder),
-                            "created_at": fecha,
-                            "video_files": video_files,
-                        }
-                    )
+        for row in accessible_rows:
+            sha1 = row["sha1sum"]
+            video_name = row["video_name"] or row["sha1sum"]
+            folder = base_media_dir / sha1
+            if not folder.exists() or not folder.is_dir():
+                continue
+            video_files = list(folder.glob("*.mp4")) + list(folder.glob("*.avi")) + list(folder.glob("*.mov"))
+            if not video_files:
+                continue
+            mod_time = folder.stat().st_mtime
+            fecha = datetime.fromtimestamp(mod_time).strftime("%Y-%m-%d %H:%M")
+            video_folders.append(
+                {
+                    "sha1sum": sha1,
+                    "video_name": video_name,
+                    "path": str(folder),
+                    "created_at": fecha,
+                    "video_files": video_files,
+                }
+            )
 
         if not video_folders:
             st.info("📝 No hi ha vídeos pujats pendents de validació.")
         else:
-            opciones_video = [f"{video['name']} - {video['created_at']}" for video in video_folders]
+            opciones_video = [f"{video['video_name']} - {video['created_at']}" for video in video_folders]
             seleccion = st.selectbox(
                 "Selecciona un vídeo per validar:",
                 opciones_video,
@@ -77,7 +75,7 @@ def render_validation_page(
 
                 with col1:
                     st.markdown("### 📹 Informació del Vídeo")
-                    st.markdown(f"**Nom:** {video_seleccionat['name']}")
+                    st.markdown(f"**Nom:** {video_seleccionat['video_name']}")
                     st.markdown(f"**Data:** {video_seleccionat['created_at']}")
                     st.markdown(f"**Arxius:** {len(video_seleccionat['video_files'])} vídeos trobats")
 
@@ -94,9 +92,9 @@ def render_validation_page(
                     col_btn1, col_btn2 = st.columns(2)
 
                     with col_btn1:
-                        if st.button("✅ Acceptar", type="primary", key=f"accept_video_{video_seleccionat['name']}"):
+                        if st.button("✅ Acceptar", type="primary", key=f"accept_video_{video_seleccionat['sha1sum']}"):
                             success = compliance_client.record_validator_decision(
-                                document_id=f"video_{video_seleccionat['name']}",
+                                document_id=f"video_{video_seleccionat['video_name']}",
                                 validator_email=f"{username}@veureu.local",
                                 decision="acceptat",
                                 comments=f"Vídeo validat per {username}",
@@ -107,9 +105,9 @@ def render_validation_page(
                                 st.error("❌ Error registrant el veredicte")
 
                     with col_btn2:
-                        if st.button("❌ Rebutjar", type="secondary", key=f"reject_video_{video_seleccionat['name']}" ):
+                        if st.button("❌ Rebutjar", type="secondary", key=f"reject_video_{video_seleccionat['video_name']}"):
                             success = compliance_client.record_validator_decision(
-                                document_id=f"video_{video_seleccionat['name']}",
+                                document_id=f"video_{video_seleccionat['video_name']}",
                                 validator_email=f"{username}@veureu.local",
                                 decision="rebutjat",
                                 comments=f"Vídeo rebutjat per {username}",
@@ -123,31 +121,35 @@ def render_validation_page(
         st.subheader("🎬 Validar Audiodescripcions")
 
         videos_con_ad = []
-        if base_dir.exists():
-            for folder in sorted(base_dir.iterdir()):
-                if folder.is_dir() and folder.name != "completed":
-                    for subfolder_name in ["MoE", "Salamandra"]:
-                        subfolder = folder / subfolder_name
-                        if subfolder.exists():
-                            ad_files = list(subfolder.glob("*_ad.txt")) + list(subfolder.glob("*_ad.srt"))
-                            if ad_files:
-                                mod_time = folder.stat().st_mtime
-                                fecha = datetime.fromtimestamp(mod_time).strftime("%Y-%m-%d %H:%M")
-                                videos_con_ad.append(
-                                    {
-                                        "name": folder.name,
-                                        "path": str(folder),
-                                        "created_at": fecha,
-                                        "ad_files": ad_files,
-                                        "ad_folder": str(subfolder),
-                                    }
-                                )
+        for row in accessible_rows:
+            sha1 = row["sha1sum"]
+            video_name = row["video_name"] or row["sha1sum"]
+            folder = base_media_dir / sha1
+            if not folder.exists() or not folder.is_dir():
+                continue
+            for subfolder_name in ["MoE", "Salamandra"]:
+                subfolder = folder / subfolder_name
+                if subfolder.exists():
+                    ad_files = list(subfolder.glob("*_ad.txt")) + list(subfolder.glob("*_ad.srt"))
+                    if ad_files:
+                        mod_time = folder.stat().st_mtime
+                        fecha = datetime.fromtimestamp(mod_time).strftime("%Y-%m-%d %H:%M")
+                        videos_con_ad.append(
+                            {
+                                "sha1sum": sha1,
+                                "video_name": video_name,
+                                "path": str(folder),
+                                "created_at": fecha,
+                                "ad_files": ad_files,
+                                "ad_folder": str(subfolder),
+                            }
+                        )
 
         if not videos_con_ad:
             st.info("📝 No hi ha audiodescripcions pendents de validació.")
         else:
             videos_ad_ordenats = sorted(videos_con_ad, key=lambda x: x["created_at"], reverse=True)
-            opciones_ad = [f"{video['name']} - {video['created_at']}" for video in videos_ad_ordenats]
+            opciones_ad = [f"{video['video_name']} - {video['created_at']}" for video in videos_ad_ordenats]
 
             seleccion_ad = st.selectbox(
                 "Selecciona una audiodescripció per validar:",
@@ -163,7 +165,7 @@ def render_validation_page(
 
                 with col1:
                     st.markdown("### 🎬 Informació de l'Audiodescripció")
-                    st.markdown(f"**Vídeo:** {video_seleccionat['name']}")
+                    st.markdown(f"**Vídeo:** {video_seleccionat['video_name']}")
                     st.markdown(f"**Data:** {video_seleccionat['created_at']}")
                     st.markdown(f"**Carpeta:** {Path(video_seleccionat['ad_folder']).name}")
                     st.markdown(f"**Arxius:** {len(video_seleccionat['ad_files'])} audiodescripcions trobades")
@@ -185,9 +187,9 @@ def render_validation_page(
                     col_btn1, col_btn2 = st.columns(2)
 
                     with col_btn1:
-                        if st.button("✅ Acceptar", type="primary", key=f"accept_ad_{video_seleccionat['name']}"):
+                        if st.button("✅ Acceptar", type="primary", key=f"accept_ad_{video_seleccionat['sha1sum']}"):
                             success = compliance_client.record_validator_decision(
-                                document_id=f"ad_{video_seleccionat['name']}",
+                                document_id=f"ad_{video_seleccionat['video_name']}",
                                 validator_email=f"{username}@veureu.local",
                                 decision="acceptat",
                                 comments=f"Audiodescripció validada per {username}",
@@ -198,9 +200,9 @@ def render_validation_page(
                                 st.error("❌ Error registrant el veredicte")
 
                     with col_btn2:
-                        if st.button("❌ Rebutjar", type="secondary", key=f"reject_ad_{video_seleccionat['name']}" ):
+                        if st.button("❌ Rebutjar", type="secondary", key=f"reject_ad_{video_seleccionat['sha1sum']}"):
                             success = compliance_client.record_validator_decision(
-                                document_id=f"ad_{video_seleccionat['name']}",
+                                document_id=f"ad_{video_seleccionat['video_name']}",
                                 validator_email=f"{username}@veureu.local",
                                 decision="rebutjat",
                                 comments=f"Audiodescripció rebutjada per {username}",