From 29921b0d9a5a5a719669c4772dcafa4ab3c786e1 Mon Sep 17 00:00:00 2001 From: AnInternetTroll Date: Tue, 2 Jun 2020 08:29:45 +0100 Subject: modified: .gitignore modified: .vscode/settings.json modified: bot.py modified: cogs/admin.py modified: cogs/general.py modified: cogs/help.py modified: cogs/player.py modified: cogs/src.py modified: cogs/trans.py modified: cogs/utils.py modified: custom_commands.json modified: main.py --- cogs/player.py | 286 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 143 insertions(+), 143 deletions(-) mode change 100644 => 100755 cogs/player.py (limited to 'cogs/player.py') diff --git a/cogs/player.py b/cogs/player.py old mode 100644 new mode 100755 index d7d2302..6a91318 --- a/cogs/player.py +++ b/cogs/player.py @@ -1,144 +1,144 @@ -import asyncio -import discord -import youtube_dl -from discord.ext import commands -from discord.ext import tasks -from pathlib import Path - -# Straight up copied from -# https://github.com/Rapptz/discord.py/blob/master/examples/basic_voice.py - -# Suppress noise about console usage from errors -youtube_dl.utils.bug_reports_message = lambda: '' - - -ytdl_format_options = { - 'format': 'bestaudio/best', - 'outtmpl': '%(extractor)s-%(id)s-%(title)s.%(ext)s', - 'restrictfilenames': True, - 'noplaylist': True, - 'nocheckcertificate': True, - 'ignoreerrors': False, - 'logtostderr': False, - 'quiet': True, - 'no_warnings': True, - 'default_search': 'auto', - 'source_address': '0.0.0.0' # bind to ipv4 since ipv6 addresses cause issues sometimes -} - -ffmpeg_options = { - 'options': '-vn' -} - -ytdl = youtube_dl.YoutubeDL(ytdl_format_options) - - -class YTDLSource(discord.PCMVolumeTransformer): - def __init__(self, source, *, data, volume=0.5): - super().__init__(source, volume) - - self.data = data - - self.title = data.get('title') - self.url = data.get('url') - - @classmethod - async def from_url(cls, url, *, loop=None, stream=False): - loop = loop or asyncio.get_event_loop() - data = await loop.run_in_executor(None, lambda: ytdl.extract_info(url, download=not stream)) - - if 'entries' in data: - # take first item from a playlist - data = data['entries'][0] - - filename = data['url'] if stream else ytdl.prepare_filename(data) - return cls(discord.FFmpegPCMAudio(filename, **ffmpeg_options), data=data) - - -class Player(commands.Cog): - def __init__(self, bot): - self.bot = bot - self.cleanup.start() - - async def is_in_vc(ctx): - try: - return ctx.author.voice.channel - except AttributeError: - return False - - @commands.check(is_in_vc) - @commands.command() - async def join(self, ctx, *, channel: discord.VoiceChannel): - """Joins a voice channel""" - - if ctx.voice_client is not None: - return await ctx.voice_client.move_to(channel) - - await channel.connect() - @commands.command() - async def play(self, ctx, *, query): - """Plays a file from the local filesystem""" - - source = discord.PCMVolumeTransformer(discord.FFmpegPCMAudio(query)) - ctx.voice_client.play(source, after=lambda e: print('Player error: %s' % e) if e else None) - - await ctx.send('Now playing: {}'.format(query)) - @commands.command() - async def yt(self, ctx, *, url): - """Plays from a url (almost anything youtube_dl supports)""" - - async with ctx.typing(): - player = await YTDLSource.from_url(url, loop=self.bot.loop) - ctx.voice_client.play(player, after=lambda e: print('Player error: %s' % e) if e else None) - - await ctx.send('Now playing: {}'.format(player.title)) - - @commands.command() - async def stream(self, ctx, *, url): - """Streams from a url (same as yt, but doesn't predownload)""" - - async with ctx.typing(): - player = await YTDLSource.from_url(url, loop=self.bot.loop, stream=True) - ctx.voice_client.play(player, after=lambda e: print('Player error: %s' % e) if e else None) - - await ctx.send('Now playing: {}'.format(player.title)) - - @commands.check(is_in_vc) - @commands.command() - async def volume(self, ctx, volume: int): - """Changes the player's volume""" - - if ctx.voice_client is None: - return await ctx.send("Not connected to a voice channel.") - - ctx.voice_client.source.volume = volume / 100 - await ctx.send("Changed volume to {}%".format(volume)) - - @commands.check(is_in_vc) - @commands.command() - async def stop(self, ctx): - """Stops and disconnects the bot from voice""" - - await ctx.voice_client.disconnect() - - @play.before_invoke - @yt.before_invoke - @stream.before_invoke - async def ensure_voice(self, ctx): - if ctx.voice_client is None: - if ctx.author.voice: - await ctx.author.voice.channel.connect() - else: - await ctx.send("You are not connected to a voice channel.") - raise commands.CommandError("Author not connected to a voice channel.") - elif ctx.voice_client.is_playing(): - ctx.voice_client.stop() - - @tasks.loop(hours=10.0) - async def cleanup(self): - for p in Path(".").glob("youtube*"): - p.unlink() - - -def setup(bot): +import asyncio +import discord +import youtube_dl +from discord.ext import commands +from discord.ext import tasks +from pathlib import Path + +# Straight up copied from +# https://github.com/Rapptz/discord.py/blob/master/examples/basic_voice.py + +# Suppress noise about console usage from errors +youtube_dl.utils.bug_reports_message = lambda: '' + + +ytdl_format_options = { + 'format': 'bestaudio/best', + 'outtmpl': '%(extractor)s-%(id)s-%(title)s.%(ext)s', + 'restrictfilenames': True, + 'noplaylist': True, + 'nocheckcertificate': True, + 'ignoreerrors': False, + 'logtostderr': False, + 'quiet': True, + 'no_warnings': True, + 'default_search': 'auto', + 'source_address': '0.0.0.0' # bind to ipv4 since ipv6 addresses cause issues sometimes +} + +ffmpeg_options = { + 'options': '-vn' +} + +ytdl = youtube_dl.YoutubeDL(ytdl_format_options) + + +class YTDLSource(discord.PCMVolumeTransformer): + def __init__(self, source, *, data, volume=0.5): + super().__init__(source, volume) + + self.data = data + + self.title = data.get('title') + self.url = data.get('url') + + @classmethod + async def from_url(cls, url, *, loop=None, stream=False): + loop = loop or asyncio.get_event_loop() + data = await loop.run_in_executor(None, lambda: ytdl.extract_info(url, download=not stream)) + + if 'entries' in data: + # take first item from a playlist + data = data['entries'][0] + + filename = data['url'] if stream else ytdl.prepare_filename(data) + return cls(discord.FFmpegPCMAudio(filename, **ffmpeg_options), data=data) + + +class Player(commands.Cog): + def __init__(self, bot): + self.bot = bot + self.cleanup.start() + + async def is_in_vc(ctx): + try: + return ctx.author.voice.channel + except AttributeError: + return False + + @commands.check(is_in_vc) + @commands.command() + async def join(self, ctx, *, channel: discord.VoiceChannel): + """Joins a voice channel""" + + if ctx.voice_client is not None: + return await ctx.voice_client.move_to(channel) + + await channel.connect() + @commands.command() + async def play(self, ctx, *, query): + """Plays a file from the local filesystem""" + + source = discord.PCMVolumeTransformer(discord.FFmpegPCMAudio(query)) + ctx.voice_client.play(source, after=lambda e: print('Player error: %s' % e) if e else None) + + await ctx.send('Now playing: {}'.format(query)) + @commands.command() + async def yt(self, ctx, *, url): + """Plays from a url (almost anything youtube_dl supports)""" + + async with ctx.typing(): + player = await YTDLSource.from_url(url, loop=self.bot.loop) + ctx.voice_client.play(player, after=lambda e: print('Player error: %s' % e) if e else None) + + await ctx.send('Now playing: {}'.format(player.title)) + + @commands.command() + async def stream(self, ctx, *, url): + """Streams from a url (same as yt, but doesn't predownload)""" + + async with ctx.typing(): + player = await YTDLSource.from_url(url, loop=self.bot.loop, stream=True) + ctx.voice_client.play(player, after=lambda e: print('Player error: %s' % e) if e else None) + + await ctx.send('Now playing: {}'.format(player.title)) + + @commands.check(is_in_vc) + @commands.command() + async def volume(self, ctx, volume: int): + """Changes the player's volume""" + + if ctx.voice_client is None: + return await ctx.send("Not connected to a voice channel.") + + ctx.voice_client.source.volume = volume / 100 + await ctx.send("Changed volume to {}%".format(volume)) + + @commands.check(is_in_vc) + @commands.command() + async def stop(self, ctx): + """Stops and disconnects the bot from voice""" + + await ctx.voice_client.disconnect() + + @play.before_invoke + @yt.before_invoke + @stream.before_invoke + async def ensure_voice(self, ctx): + if ctx.voice_client is None: + if ctx.author.voice: + await ctx.author.voice.channel.connect() + else: + await ctx.send("You are not connected to a voice channel.") + raise commands.CommandError("Author not connected to a voice channel.") + elif ctx.voice_client.is_playing(): + ctx.voice_client.stop() + + @tasks.loop(hours=10.0) + async def cleanup(self): + for p in Path(".").glob("youtube*"): + p.unlink() + + +def setup(bot): bot.add_cog(Player(bot)) \ No newline at end of file -- cgit v1.2.3