From ead61bbabd6ceb7dae4f3b4b100716d8f9ebdb63 Mon Sep 17 00:00:00 2001 From: white <122345776@umail.ucc.ie> Date: Thu, 6 Mar 2025 17:17:32 +0000 Subject: [PATCH] FEAT: Added vods to search bar (needs to be integrated with search bar --- web_server/blueprints/search_bar.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/web_server/blueprints/search_bar.py b/web_server/blueprints/search_bar.py index e853e7c..b4f3631 100644 --- a/web_server/blueprints/search_bar.py +++ b/web_server/blueprints/search_bar.py @@ -56,7 +56,7 @@ def search_results(): users = db.fetchall("SELECT user_id, username, is_live FROM users") for u in users: key = u.get("username") - score = rank_results(query, key) + score = rank_results(query.lower(), key.lower()) u["score"] = score if score < 2: res_dict.append(u) @@ -74,15 +74,29 @@ def search_results(): for s in streams: key = s.get("username") - score = rank_results(query, key) + score = rank_results(query.lower(), key.lower()) s["score"] = score if score < 2: res_dict.append(s) streams = sorted(res_dict, key=lambda d: d["score"]) streams = streams[:4] + # 3 VODs + res_dict = [] + vods = db.fetchall("""SELECT v.vod_id, v.title, u.user_id, u.username + FROM vods as v JOIN users as u + ON v.user_id = u.user_id""") + for v in vods: + key = v.get("title") + score = rank_results(query.lower(), key.lower()) + v["score"] = score + if score < 2: + res_dict.append(v) + vods = sorted(res_dict, key=lambda d: d["score"]) + vods = vods[:4] + db.close_connection() - print(query, streams, users, categories, flush=True) + print(query, streams, users, categories, vods, flush=True) - return jsonify({"streams": streams, "categories": categories, "users": users}) \ No newline at end of file + return jsonify({"streams": streams, "categories": categories, "users": users, "vods": vods}) \ No newline at end of file