Update app.py

app.py

@@ -42,7 +42,6 @@ def youtube_search(query, upload_date, video_type, duration, sort_by, max_result
     params = {
         "part": "snippet",
         "q": query,
-        "type": "video",
         "maxResults": 50,
         "order": sort_by
     }
@@ -54,7 +53,7 @@ def youtube_search(query, upload_date, video_type, duration, sort_by, max_result
             params["publishedAfter"] = published_after
 
     if video_type and video_type != "All":
-        params["type"] = video_type.lower()  # API expects lowercase values
+        params["type"] = video_type.lower()
 
     if duration:
         duration_mapping = {
@@ -76,11 +75,31 @@ def youtube_search(query, upload_date, video_type, duration, sort_by, max_result
 
             results = response.json().get("items", [])
             for result in results:
-                video_info = {
-                    'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
-                    'video_id': result["id"]["videoId"],
-                    'title': result["snippet"]["title"]
-                }
+                # Determine the type of the result and extract the correct ID
+                if result["id"]["kind"] == "youtube#video":
+                    video_info = {
+                        'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
+                        'id': result["id"]["videoId"],
+                        'title': result["snippet"]["title"],
+                        'type': "video"
+                    }
+                elif result["id"]["kind"] == "youtube#channel":
+                    video_info = {
+                        'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
+                        'id': result["id"]["channelId"],
+                        'title': result["snippet"]["title"],
+                        'type': "channel"
+                    }
+                elif result["id"]["kind"] == "youtube#playlist":
+                    video_info = {
+                        'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
+                        'id': result["id"]["playlistId"],
+                        'title': result["snippet"]["title"],
+                        'type': "playlist"
+                    }
+                else:
+                    continue  # Skip if it's an unknown type
+                
                 all_results.append(video_info)
 
             if 'nextPageToken' not in response.json() or len(all_results) >= max_results:
@@ -94,26 +113,16 @@ def youtube_search(query, upload_date, video_type, duration, sort_by, max_result
         print(f"Error during YouTube API request: {e}")
         return []
 
-def show_video(video_url):
-    video_id = None
-    patterns = [
-        r"youtube\.com/watch\?v=([^\&\?\/]+)",
-        r"youtube\.com/embed/([^\&\?\/]+)",
-        r"youtube\.com/v/([^\&\?\/]+)",
-        r"youtu\.be/([^\&\?\/]+)"
-    ]
-
-    for pattern in patterns:
-        match = re.search(pattern, video_url)
-        if match:
-            video_id = match.group(1)
-            break
-
-    if not video_id:
+def show_video(video_id, video_type):
+    if video_type == "video":
+        embed_url = f"https://www.youtube.com/embed/{video_id}"
+    elif video_type == "channel":
+        embed_url = f"https://www.youtube.com/channel/{video_id}"
+    elif video_type == "playlist":
+        embed_url = f"https://www.youtube.com/playlist?list={video_id}"
+    else:
         return "Invalid YouTube URL. Please enter a valid YouTube video link."
 
-    embed_url = f"https://www.youtube.com/embed/{video_id}"
-
     html_code = f'''
     <iframe width="100%" height="562" src="{embed_url}" 
     frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" 
@@ -177,25 +186,27 @@ with gr.Blocks(css="""
         search_results = youtube_search(query, upload_date, video_type, duration, sort_by)
         gallery_items = []
         video_ids = []
+        video_types = []
         for item in search_results:
             image_url = item['thumbnail_url']
             title = item['title']
             caption = f"{title}"
             gallery_items.append((image_url, caption))
-            video_ids.append(item['video_id'])
-        return gallery_items, video_ids
+            video_ids.append(item['id'])
+            video_types.append(item['type'])
+        return gallery_items, video_ids, video_types
 
-    def on_video_select(evt: gr.SelectData, video_ids):
+    def on_video_select(evt: gr.SelectData, video_ids, video_types):
         index = evt.index
         selected_video_id = video_ids[index]
-        video_url = f"https://www.youtube.com/watch?v={selected_video_id}"
-        return video_url
+        selected_video_type = video_types[index]
+        return selected_video_id, selected_video_type
 
-    def play_video(video_url):
-        return show_video(video_url)
+    def play_video(video_id, video_type):
+        return show_video(video_id, video_type)
 
     search_button.click(update_search_results, inputs=[search_query_input, upload_date_input, video_type_input, duration_input, sort_by_input], outputs=[search_output, video_ids_state])
-    search_output.select(on_video_select, inputs=video_ids_state, outputs=selected_video_link)
-    play_video_button.click(play_video, inputs=selected_video_link, outputs=video_output)
+    search_output.select(on_video_select, inputs=[video_ids_state, gr.State()], outputs=[selected_video_link, gr.State()])
+    play_video_button.click(play_video, inputs=[selected_video_link, gr.State()], outputs=video_output)
 
 demo.launch()