parker/guava
parker/guava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expand conditional checks for results, tracks, and load_type

Browse Source
This commit is contained in:
Parker M. 2024-12-18 17:42:23 -06:00
parent a0b6a5b43c
commit 235254257e
Signed by: parker
GPG Key ID: 505ED36FC12B5D5E
3 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
code/cogs/play.py
View File

@ -63,9 +63,15 @@ class Play(commands.Cog):
dzsearch = f"dzsearch:{query}" dzsearch = f"dzsearch:{query}"
results = await player.node.get_tracks(dzsearch) results = await player.node.get_tracks(dzsearch)
# If Deezer returned nothing # If Deezer returned nothing
if not (results and results.tracks) or results.load_type in ( if (
LoadType.EMPTY, not results
LoadType.ERROR, or not results.tracks
or not results.load_type
or results.load_type
in (
LoadType.EMPTY,
LoadType.ERROR,
)
): ):
if YOUTUBE_SUPPORT: if YOUTUBE_SUPPORT:
ytmsearch = f"ytmsearch:{query}" ytmsearch = f"ytmsearch:{query}"
@ -84,9 +90,15 @@ class Play(commands.Cog):
results = await player.node.get_tracks(query) results = await player.node.get_tracks(query)
# If there are no results found, set results/embed to None, handled further down # If there are no results found, set results/embed to None, handled further down
if not (results and results.tracks) or results.load_type in ( if (
LoadType.EMPTY, not results
LoadType.ERROR, or not results.tracks
or not results.load_type
or results.load_type
in (
LoadType.EMPTY,
LoadType.ERROR,
)
): ):
results, embed = None, None results, embed = None, None

24
code/utils/ai_recommendations.py
View File

@ -62,16 +62,28 @@ async def add_song_recommendations(
ytsearch = f"ytsearch:{song} by {artist} audio" ytsearch = f"ytsearch:{song} by {artist} audio"
results = await player.node.get_tracks(ytsearch) results = await player.node.get_tracks(ytsearch)
if not (results and results.tracks) or results.load_type in ( if (
LoadType.EMPTY, not results
LoadType.ERROR, or not results.tracks
or not results.load_type
or results.load_type
in (
LoadType.EMPTY,
LoadType.ERROR,
)
): ):
dzsearch = f"dzsearch:{song}" dzsearch = f"dzsearch:{song}"
results = await player.node.get_tracks(dzsearch) results = await player.node.get_tracks(dzsearch)
if not (results and results.tracks) or results.load_type in ( if (
LoadType.EMPTY, not results
LoadType.ERROR, or not results.tracks
or not results.load_type
or results.load_type
in (
LoadType.EMPTY,
LoadType.ERROR,
)
): ):
continue continue

24
code/utils/custom_sources.py
View File

@ -30,17 +30,29 @@ class CustomAudioTrack(DeferredAudioTrack):
): # Load our 'actual' playback track using the metadata from this one. ): # Load our 'actual' playback track using the metadata from this one.
dzsearch = f"dzsearch:{self.title} {self.author}" dzsearch = f"dzsearch:{self.title} {self.author}"
results = await client.get_tracks(dzsearch) results = await client.get_tracks(dzsearch)
if not (results and results.tracks) or results.load_type in ( if (
LoadType.EMPTY, not results
LoadType.ERROR, or not results.tracks
or not results.load_type
or results.load_type
in (
LoadType.EMPTY,
LoadType.ERROR,
)
): ):
if YOUTUBE_SUPPORT: if YOUTUBE_SUPPORT:
ytmsearch = f"ytmsearch:{self.title} {self.author}" ytmsearch = f"ytmsearch:{self.title} {self.author}"
results = await client.get_tracks(ytmsearch) results = await client.get_tracks(ytmsearch)
if not (results and results.tracks) or results.load_type in ( if (
LoadType.EMPTY, not results
LoadType.ERROR, or not results.tracks
or not results.load_type
or results.load_type
in (
LoadType.EMPTY,
LoadType.ERROR,
)
): ):
ytsearch = f"ytsearch:{self.title} {self.author} audio" ytsearch = f"ytsearch:{self.title} {self.author} audio"
results = await client.get_tracks(ytsearch) results = await client.get_tracks(ytsearch)