Upload 7 files

databases.py

@@ -341,45 +341,52 @@ def get_audiodescription(sha1sum: str, version: str) -> Optional[sqlite3.Row]:
 
 
 def get_videos_from_audiodescriptions() -> List[Dict[str, Any]]:
-    """Retorna vídeos disponibles segons audiodescriptions.db.
+    """Retorna vídeos disponibles segons audiodescriptions.db i videos.db.
 
-    Llegeix demo/temp/db/audiodescriptions.db i retorna una llista de
-    diccionaris amb claus com a mínim: sha1sum i video_name.
-
-    - Si la taula té columna video_name, es fa DISTINCT(sha1sum, video_name).
-    - Si no la té, es fa DISTINCT(sha1sum) i s'utilitza sha1sum com a
-      video_name de manera per defecte.
+    1) Llegeix demo/temp/db/audiodescriptions.db i obté els DISTINCT sha1sum.
+    2) Per a cada sha1sum, mira a demo/temp/db/videos.db quin és el video_name.
+       Si no el troba, fa servir el sha1sum com a fallback.
     """
 
+    sha1_list: List[str] = []
     try:
         with _connect_audiodescriptions_db() as conn:
             cur = conn.cursor()
-
-            # Detectar si existeix la columna video_name
-            cols = [r[1] for r in cur.execute("PRAGMA table_info(audiodescriptions)")]
-            has_video_name = "video_name" in cols
-
-            if has_video_name:
-                cur.execute("SELECT DISTINCT sha1sum, video_name FROM audiodescriptions")
-                rows = cur.fetchall()
-                result: List[Dict[str, Any]] = []
-                for r in rows:
-                    sha1 = r["sha1sum"]
-                    vname = r["video_name"] or r["sha1sum"]
-                    result.append({"sha1sum": sha1, "video_name": vname})
-                return result
-            else:
-                cur.execute("SELECT DISTINCT sha1sum FROM audiodescriptions")
-                rows = cur.fetchall()
-                result = []
-                for r in rows:
-                    sha1 = r["sha1sum"]
-                    result.append({"sha1sum": sha1, "video_name": sha1})
-                return result
+            cur.execute("SELECT DISTINCT sha1sum FROM audiodescriptions")
+            rows = cur.fetchall()
+            sha1_list = [str(r["sha1sum"]) for r in rows if r["sha1sum"]]
     except sqlite3.OperationalError:
         # Taula o BD encara no creada
         return []
 
+    if not sha1_list:
+        return []
+
+    # Map sha1sum -> video_name utilitzant videos.db
+    result: List[Dict[str, Any]] = []
+    try:
+        with _connect_videos_db() as vconn:
+            vcur = vconn.cursor()
+            for sha1 in sha1_list:
+                try:
+                    row = vcur.execute(
+                        "SELECT video_name FROM videos WHERE sha1sum = ? LIMIT 1",
+                        (sha1,),
+                    ).fetchone()
+                    if row is not None and row["video_name"]:
+                        vname = str(row["video_name"])
+                    else:
+                        vname = sha1
+                except sqlite3.OperationalError:
+                    vname = sha1
+
+                result.append({"sha1sum": sha1, "video_name": vname})
+    except sqlite3.OperationalError:
+        # Si videos.db no existeix o té un esquema incompatible, fem servir sha1 com a nom
+        result = [{"sha1sum": sha1, "video_name": sha1} for sha1 in sha1_list]
+
+    return result
+
 
 def get_audiodescription_history(sha1sum: str, version: str) -> list[sqlite3.Row]:
     """Retorna només la darrera fila d'audiodescriptions per sha1sum+version.