Prefer Deezer search
This commit is contained in:
parent
64cfb7b3e0
commit
2b2e390671
@ -52,15 +52,15 @@ async def add_song_recommendations(bot_user, player, number, inputs, retries: in
|
|||||||
for entry in completion.split("\n"):
|
for entry in completion.split("\n"):
|
||||||
song, artist = entry.split(" - ")
|
song, artist = entry.split(" - ")
|
||||||
|
|
||||||
ytsearch = f"ytsearch:{song} {artist} audio"
|
dzsearch = f"dzsearch:{song} {artist}"
|
||||||
results = await player.node.get_tracks(ytsearch)
|
results = await player.node.get_tracks(dzsearch)
|
||||||
|
|
||||||
if not results.tracks or results.load_type in (
|
if not results.tracks or results.load_type in (
|
||||||
LoadType.EMPTY,
|
LoadType.EMPTY,
|
||||||
LoadType.ERROR,
|
LoadType.ERROR,
|
||||||
):
|
):
|
||||||
dzsearch = f"dzsearch:{song} {artist}"
|
ytsearch = f"ytsearch:{song} {artist} audio"
|
||||||
results = await player.node.get_tracks(dzsearch)
|
results = await player.node.get_tracks(ytsearch)
|
||||||
|
|
||||||
if not results.tracks or results.load_type in (
|
if not results.tracks or results.load_type in (
|
||||||
LoadType.EMPTY,
|
LoadType.EMPTY,
|
||||||
|
@ -132,15 +132,15 @@ class Play(commands.Cog):
|
|||||||
|
|
||||||
else:
|
else:
|
||||||
if not url_rx.match(query):
|
if not url_rx.match(query):
|
||||||
ytsearch = f"ytsearch:{query}"
|
dzsearch = f"dzsearch:{query}"
|
||||||
results = await player.node.get_tracks(ytsearch)
|
results = await player.node.get_tracks(dzsearch)
|
||||||
|
|
||||||
if not results.tracks or results.load_type in (
|
if not results.tracks or results.load_type in (
|
||||||
LoadType.EMPTY,
|
LoadType.EMPTY,
|
||||||
LoadType.ERROR,
|
LoadType.ERROR,
|
||||||
):
|
):
|
||||||
dzsearch = f"dzsearch:{query}"
|
ytsearch = f"ytsearch:{query}"
|
||||||
results = await player.node.get_tracks(dzsearch)
|
results = await player.node.get_tracks(ytsearch)
|
||||||
else:
|
else:
|
||||||
results = await player.node.get_tracks(query)
|
results = await player.node.get_tracks(query)
|
||||||
|
|
||||||
|
@ -13,14 +13,14 @@ class CustomAudioTrack(DeferredAudioTrack):
|
|||||||
async def load(
|
async def load(
|
||||||
self, client
|
self, client
|
||||||
): # Load our 'actual' playback track using the metadata from this one.
|
): # Load our 'actual' playback track using the metadata from this one.
|
||||||
scsearch = f"scsearch:{self.title} {self.author}"
|
dzsearch = f"dzsearch:{self.title} {self.author}"
|
||||||
results = await client.get_tracks(scsearch)
|
results = await client.get_tracks(dzsearch)
|
||||||
if not results.tracks or results.load_type in (
|
if not results.tracks or results.load_type in (
|
||||||
LoadType.EMPTY,
|
LoadType.EMPTY,
|
||||||
LoadType.ERROR,
|
LoadType.ERROR,
|
||||||
):
|
):
|
||||||
dzsearch = f"dzsearch:{self.title} {self.author}"
|
ytsearch = f"ytsearch:{self.title} {self.author}"
|
||||||
results = await client.get_tracks(dzsearch)
|
results = await client.get_tracks(ytsearch)
|
||||||
|
|
||||||
if not results.tracks or results.load_type in (
|
if not results.tracks or results.load_type in (
|
||||||
LoadType.EMPTY,
|
LoadType.EMPTY,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user