CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-07 03:38:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

!play and !queue now accept search terms

Browse Source
This commit is contained in:
Twentysix 2016-03-13 05:28:05 +01:00
parent f5e343b0e3
commit a43b972dc3
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
cogs/audio.py
View File

@ -40,7 +40,8 @@ youtube_dl_options = {
'ignoreerrors': True, 'ignoreerrors': True,
'quiet': True, 'quiet': True,
'no_warnings': True, 'no_warnings': True,
'outtmpl': "data/audio/cache/%(id)s"} 'outtmpl': "data/audio/cache/%(id)s",
'default_search' : 'auto'}
class Audio: class Audio:
"""Music streaming.""" """Music streaming."""
@ -63,15 +64,22 @@ class Audio:
"https://www.youtube.com/watch?v=41tIUr_ex3g", "https://www.youtube.com/watch?v=f9O2Rjn1azc"] "https://www.youtube.com/watch?v=41tIUr_ex3g", "https://www.youtube.com/watch?v=f9O2Rjn1azc"]
@commands.command(pass_context=True, no_pm=True) @commands.command(pass_context=True, no_pm=True)
async def play(self, ctx, link : str): async def play(self, ctx, *link : str):
"""Plays link """Plays videos (links/search terms)
""" """
if self.downloader["DOWNLOADING"]: if self.downloader["DOWNLOADING"]:
await self.bot.say("I'm already downloading a track.") await self.bot.say("I'm already downloading a track.")
return return
msg = ctx.message msg = ctx.message
if await self.check_voice(msg.author, msg): if await self.check_voice(msg.author, msg):
if self.is_playlist_valid([link]): # reusing a function if link != ():
link = " ".join(link)
if "http" not in link or "www." not in link:
link = "[SEARCH:]" + link
else:
if not self.is_playlist_valid([link]):
await self.bot.say("Invalid link.")
return
if await self.is_alone_or_admin(msg): if await self.is_alone_or_admin(msg):
self.queue = [] self.queue = []
self.current = -1 self.current = -1
@ -79,13 +87,14 @@ class Audio:
self.queue.append(link) self.queue.append(link)
self.music_player.paused = False self.music_player.paused = False
self.music_player.stop() self.music_player.stop()
await self.bot.say("Playing requested link...")
else: else:
self.playlist = [] self.playlist = []
self.current = -1 self.current = -1
if not self.queue: await self.bot.say("The link has been put into queue.") if not self.queue: await self.bot.say("The link has been put into queue.")
self.queue.append(link) self.queue.append(link)
else: else:
await self.bot.say("That link is not allowed.") await self.bot.say("You need to add a link or search terms.")
@commands.command(aliases=["title"]) @commands.command(aliases=["title"])
async def song(self): async def song(self):
@ -266,16 +275,23 @@ class Audio:
if self.bot.voice: await self.bot.voice.disconnect() if self.bot.voice: await self.bot.voice.disconnect()
@commands.command(name="queue", pass_context=True, no_pm=True) #check that author is in the same channel as the bot @commands.command(name="queue", pass_context=True, no_pm=True) #check that author is in the same channel as the bot
async def _queue(self, ctx, link : str=None): async def _queue(self, ctx, *link : str):
"""Add link to queue """Add links or search terms to queue
Shows queue list if no links are provided. Shows queue list if no links are provided.
""" """
if not link: if link == ():
queue_list = await self.queue_titles() queue_list = await self.queue_titles()
await self.bot.say("Videos in queue: \n" + queue_list + "\n\nType queue <link> to add a link to the queue.") await self.bot.say("Videos in queue: \n" + queue_list + "\n\nType queue <link> to add a link or search terms to the queue.")
elif await self.check_voice(ctx.message.author, ctx.message) and self.is_playlist_valid([link]): elif await self.check_voice(ctx.message.author, ctx.message):
if not self.playlist: if not self.playlist:
link = " ".join(link)
if "http" not in link or "." not in link:
link = "[SEARCH:]" + link
else:
if not self.is_playlist_valid([link]):
await self.bot.say("Invalid link.")
return
self.queue.append(link) self.queue.append(link)
msg = ctx.message msg = ctx.message
result = await self.get_song_metadata(link) result = await self.get_song_metadata(link)
@ -508,7 +524,7 @@ class Audio:
async def play_video(self, link): async def play_video(self, link):
self.downloader = {"DONE" : False, "TITLE" : False, "ID" : False, "URL": False, "DURATION" : False, "DOWNLOADING" : False} self.downloader = {"DONE" : False, "TITLE" : False, "ID" : False, "URL": False, "DURATION" : False, "DOWNLOADING" : False}
if "https://" in link or "http://" in link: if "https://" in link or "http://" in link or "[SEARCH:]" in link:
path = "data/audio/cache/" path = "data/audio/cache/"
t = threading.Thread(target=self.get_video, args=(link,self,)) t = threading.Thread(target=self.get_video, args=(link,self,))
t.start() t.start()
@ -593,7 +609,12 @@ class Audio:
try: try:
self.downloader["DOWNLOADING"] = True self.downloader["DOWNLOADING"] = True
yt = youtube_dl.YoutubeDL(youtube_dl_options) yt = youtube_dl.YoutubeDL(youtube_dl_options)
v = yt.extract_info(url, download=False) if "[SEARCH:]" not in url:
v = yt.extract_info(url, download=False)
else:
url = url.replace("[SEARCH:]", "")
url = "https://youtube.com/watch?v=" + yt.extract_info(url, download=False)["entries"][0]["id"]
v = yt.extract_info(url, download=False)
if v["duration"] > self.settings["MAX_LENGTH"]: raise MaximumLength("Track exceeded maximum length. See help audioset maxlength") if v["duration"] > self.settings["MAX_LENGTH"]: raise MaximumLength("Track exceeded maximum length. See help audioset maxlength")
if not os.path.isfile("data/audio/cache/" + v["id"]): if not os.path.isfile("data/audio/cache/" + v["id"]):
v = yt.extract_info(url, download=True) v = yt.extract_info(url, download=True)