christofsteel/syng
christofsteel/syng
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed ytsearch a bit more and fixed missing metainfo for direct yt links

Browse source
This commit is contained in:
Christoph Stahl 2024-11-18 13:42:09 +01:00
parent 838f91d480
commit b37dd9f75b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
syng/sources/youtube.py
View file

@ -57,7 +57,7 @@ class YouTube:
return return
if self._infos is None: if self._infos is None:
raise RuntimeError(f'Extraction not possible for "{url}"') raise RuntimeError(f'Extraction not possible for "{url}"')
self.length = self._infos["duration"] self.length = int(self._infos["duration"])
self._title = self._infos["title"] self._title = self._infos["title"]
self._author = self._infos["channel"] self._author = self._infos["channel"]
self.watch_url = url self.watch_url = url
@ -129,9 +129,11 @@ class Search:
:param channel: The channel to search in. :param channel: The channel to search in.
:type channel: Optional[str] :type channel: Optional[str]
""" """
sp = "EgIQAQ==" # This is a magic string, that tells youtube to search for videos sp = "EgIQAfABAQ==" # This is a magic string, that tells youtube to search for videos
if channel is None: if channel is None:
query_url = f"https://youtube.com/results?{urlencode({'search_query': query})}" query_url = (
f"https://youtube.com/results?{urlencode({'search_query': query, 'sp': sp})}"
)
else: else:
if channel[0] == "/": if channel[0] == "/":
channel = channel[1:] channel = channel[1:]
@ -142,7 +144,7 @@ class Search:
results = YoutubeDL( results = YoutubeDL(
{ {
"extract_flat": True, "extract_flat": True,
"quiet": False, "quiet": True,
"playlist_items": ",".join(map(str, range(1, 51))), "playlist_items": ",".join(map(str, range(1, 51))),
} }
).extract_info( ).extract_info(
@ -377,8 +379,7 @@ class YoutubeSource(Source):
Video metadata should be read on the client to avoid banning Video metadata should be read on the client to avoid banning
the server. the server.
""" """
if entry.incomplete_data: if entry.incomplete_data or None in (entry.artist, entry.title):
print(f"Looking up {entry.ident}")
youtube_video: YouTube = await asyncio.to_thread(YouTube, entry.ident) youtube_video: YouTube = await asyncio.to_thread(YouTube, entry.ident)
return { return {
"duration": youtube_video.length, "duration": youtube_video.length,