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

Protect against results being None

Browse Source
This commit is contained in:
Parker M. 2024-12-15 22:44:38 -06:00
parent 2399336f6f
commit 78ebd84275
Signed by: parker
GPG Key ID: 505ED36FC12B5D5E
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/cogs/play.py
View File

@ -63,7 +63,7 @@ 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.tracks or results.load_type in ( if not (results and results.tracks) or results.load_type in (
LoadType.EMPTY, LoadType.EMPTY,
LoadType.ERROR, LoadType.ERROR,
): ):
@ -71,7 +71,9 @@ class Play(commands.Cog):
ytmsearch = f"ytmsearch:{query}" ytmsearch = f"ytmsearch:{query}"
results = await player.node.get_tracks(ytmsearch) results = await player.node.get_tracks(ytmsearch)
# If YouTube Music returned nothing # If YouTube Music returned nothing
if not results.tracks or results.load_type in ( if not (
results and results.tracks
) or results.load_type in (
LoadType.EMPTY, LoadType.EMPTY,
LoadType.ERROR, LoadType.ERROR,
): ):
@ -82,7 +84,7 @@ 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.tracks or results.load_type in ( if not (results and results.tracks) or results.load_type in (
LoadType.EMPTY, LoadType.EMPTY,
LoadType.ERROR, LoadType.ERROR,
): ):

4
code/utils/ai_recommendations.py
View File

@ -62,14 +62,14 @@ 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.tracks or results.load_type in ( if not (results and results.tracks) or results.load_type in (
LoadType.EMPTY, LoadType.EMPTY,
LoadType.ERROR, 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.tracks or results.load_type in ( if not (results and results.tracks) or results.load_type in (
LoadType.EMPTY, LoadType.EMPTY,
LoadType.ERROR, LoadType.ERROR,
): ):

8
code/utils/custom_sources.py
View File

@ -30,7 +30,7 @@ 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.tracks or results.load_type in ( if not (results and results.tracks) or results.load_type in (
LoadType.EMPTY, LoadType.EMPTY,
LoadType.ERROR, LoadType.ERROR,
): ):
@ -38,14 +38,16 @@ class CustomAudioTrack(DeferredAudioTrack):
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.tracks or results.load_type in ( if not (results and results.tracks) or results.load_type in (
LoadType.EMPTY, LoadType.EMPTY,
LoadType.ERROR, 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)
if not results.tracks or results.load_type in ( if not (
results and results.tracks
) or results.load_type in (
LoadType.EMPTY, LoadType.EMPTY,
LoadType.ERROR, LoadType.ERROR,
): ):