Datasets:

12Parker

/

python-migrations

like 0

Raptor123471/DingoLingo

Raptor123471__DingoLingo-29

7f240327378e1aab157aed6ee9185674c15926ad

diff --git a/config/config.py b/config/config.py --- a/config/config.py +++ b/config/config.py @@ -8,6 +8,8 @@ SUPPORTED_EXTENSIONS = ('.webm', '.mp4', '.mp3', '.avi', '.wav', '.m4v', '.ogg', '.mov') +MAX_SONG_PRELOAD = 5 #maximum of 25 + COOKIE_PATH = "/config/cookies/cookies.txt" STARTUP_MESSAGE = "Starting Bot..." diff --git a/musicbot/audiocontroller.py b/musicbot/audiocontroller.py --- a/musicbot/audiocontroller.py +++ b/musicbot/audiocontroller.py @@ -1,5 +1,8 @@ import discord -import youtube_dlc +import youtube_dl + +import asyncio +import concurrent.futures from musicbot import linkutils from musicbot import utils @@ -67,12 +70,12 @@ def next_song(self, error): async def play_song(self, song): """Plays a song object""" - if song.origin == linkutils.Origins.Playlist: + if song.info.title == None: if song.host == linkutils.Sites.Spotify: - conversion = await self.search_youtube(linkutils.convert_spotify(song.info.webpage_url)) + conversion = self.search_youtube(await linkutils.convert_spotify(song.info.webpage_url)) song.info.webpage_url = conversion - downloader = youtube_dlc.YoutubeDL( + downloader = youtube_dl.YoutubeDL( {'format': 'bestaudio', 'title': True, "cookiefile": config.COOKIE_PATH}) r = downloader.extract_info( song.info.webpage_url, download=False) @@ -94,6 +97,11 @@ async def play_song(self, song): self.guild.voice_client.source) self.voice_client.source.volume = float(self.volume) / 100.0 + self.playlist.playque.popleft() + + for song in list(self.playlist.playque)[:config.MAX_SONG_PRELOAD]: + asyncio.ensure_future(self.preload(song)) + async def process_song(self, track): """Adds the track to the playlist instance and plays it, if it is the first song""" @@ -102,11 +110,9 @@ async def process_song(self, track): if is_playlist != linkutils.Playlist_Types.Unknown: - queue_scan = len(self.playlist.playque) - await self.process_playlist(is_playlist, track) - if queue_scan == 0: + if self.current_song == None: await self.play_song(self.playlist.playque[0]) print("Playing {}".format(track)) @@ -118,22 +124,22 @@ async def process_song(self, track): if linkutils.get_url(track) is not None: return None - track = await self.search_youtube(track) + track = self.search_youtube(track) if host == linkutils.Sites.Spotify: - title = linkutils.convert_spotify(track) - track = await self.search_youtube(title) + title = await linkutils.convert_spotify(track) + track = self.search_youtube(title) if host == linkutils.Sites.YouTube: track = track.split("&list=")[0] try: - downloader = youtube_dlc.YoutubeDL( + downloader = youtube_dl.YoutubeDL( {'format': 'bestaudio', 'title': True, "cookiefile": config.COOKIE_PATH}) r = downloader.extract_info( track, download=False) except: - downloader = youtube_dlc.YoutubeDL( + downloader = youtube_dl.YoutubeDL( {'title': True, "cookiefile": config.COOKIE_PATH}) r = downloader.extract_info( track, download=False) @@ -148,7 +154,7 @@ async def process_song(self, track): 'title'), duration=r.get('duration'), webpage_url=r.get('webpage_url'), thumbnail=thumbnail) self.playlist.add(song) - if len(self.playlist.playque) == 1: + if self.current_song == None: print("Playing {}".format(track)) await self.play_song(song) @@ -171,7 +177,7 @@ async def process_playlist(self, playlist_type, url): "cookiefile": config.COOKIE_PATH } - with youtube_dlc.YoutubeDL(options) as ydl: + with youtube_dl.YoutubeDL(options) as ydl: r = ydl.extract_info(url, download=False) for entry in r['entries']: @@ -185,7 +191,7 @@ async def process_playlist(self, playlist_type, url): self.playlist.add(song) if playlist_type == linkutils.Playlist_Types.Spotify_Playlist: - links = linkutils.get_spotify_playlist(url) + links = await linkutils.get_spotify_playlist(url) for link in links: song = Song(linkutils.Origins.Playlist, linkutils.Sites.Spotify, webpage_url=link) @@ -196,7 +202,7 @@ async def process_playlist(self, playlist_type, url): 'format': 'bestaudio/best', 'extract_flat': True } - with youtube_dlc.YoutubeDL(options) as ydl: + with youtube_dl.YoutubeDL(options) as ydl: r = ydl.extract_info(url, download=False) for entry in r['entries']: @@ -208,7 +214,38 @@ async def process_playlist(self, playlist_type, url): self.playlist.add(song) - async def search_youtube(self, title): + for song in list(self.playlist.playque)[:config.MAX_SONG_PRELOAD]: + asyncio.ensure_future(self.preload(song)) + + async def preload(self, song): + + if song.info.title != None: + return + + def down(song): + + if song.host == linkutils.Sites.Spotify: + song.info.webpage_url = self.search_youtube(song.info.title) + + downloader = youtube_dl.YoutubeDL( + {'format': 'bestaudio', 'title': True, "cookiefile": config.COOKIE_PATH}) + r = downloader.extract_info( + song.info.webpage_url, download=False) + song.base_url = r.get('url') + song.info.uploader = r.get('uploader') + song.info.title = r.get('title') + song.info.duration = r.get('duration') + song.info.webpage_url = r.get('webpage_url') + song.info.thumbnail = r.get('thumbnails')[0]['url'] + + if song.host == linkutils.Sites.Spotify: + song.info.title = await linkutils.convert_spotify(song.info.webpage_url) + + loop = asyncio.get_event_loop() + executor = concurrent.futures.ThreadPoolExecutor(max_workers=config.MAX_SONG_PRELOAD) + await asyncio.wait(fs={loop.run_in_executor(executor, down, song)}, return_when=asyncio.ALL_COMPLETED) + + def search_youtube(self, title): """Searches youtube for the video title and returns the first results video link""" # if title is already a link @@ -222,7 +259,7 @@ async def search_youtube(self, title): "cookiefile": config.COOKIE_PATH } - with youtube_dlc.YoutubeDL(options) as ydl: + with youtube_dl.YoutubeDL(options) as ydl: r = ydl.extract_info(title, download=False) videocode = r['entries'][0]['id'] diff --git a/musicbot/commands/general.py b/musicbot/commands/general.py --- a/musicbot/commands/general.py +++ b/musicbot/commands/general.py @@ -115,7 +115,7 @@ async def _change_channel(self, ctx): async def _ping(self, ctx): await ctx.send("Pong") - @commands.command(name='setting', description=config.HELP_SHUFFLE_LONG, help=config.HELP_SETTINGS_SHORT, aliases=['settings', 'set', 'st']) + @commands.command(name='setting', description=config.HELP_SHUFFLE_LONG, help=config.HELP_SETTINGS_SHORT, aliases=['settings', 'set']) @has_permissions(administrator=True) async def _settings(self, ctx, *args): diff --git a/musicbot/commands/music.py b/musicbot/commands/music.py --- a/musicbot/commands/music.py +++ b/musicbot/commands/music.py @@ -1,13 +1,14 @@ import discord from discord.ext import commands +import asyncio + from musicbot import utils from musicbot import linkutils from config import config from musicbot.commands.general import General -import requests import datetime @@ -21,7 +22,7 @@ class Music(commands.Cog): def __init__(self, bot): self.bot = bot - @commands.command(name='play', description=config.HELP_YT_LONG, help=config.HELP_YT_SHORT, aliases=['p', 'yt', 'P', 'pl']) + @commands.command(name='play', description=config.HELP_YT_LONG, help=config.HELP_YT_SHORT, aliases=['p', 'yt', 'pl']) async def _play_song(self, ctx, *, track: str): if(await utils.is_connected(ctx) == None): @@ -47,7 +48,7 @@ async def _play_song(self, ctx, *, track: str): if song.origin == linkutils.Origins.Default: - if len(audiocontroller.playlist.playque) == 1: + if audiocontroller.current_song != None and len(audiocontroller.playlist.playque) == 0: await ctx.send(embed=song.info.format_output(config.SONGINFO_NOW_PLAYING)) else: await ctx.send(embed=song.info.format_output(config.SONGINFO_QUEUE_ADDED)) @@ -55,7 +56,7 @@ async def _play_song(self, ctx, *, track: str): elif song.origin == linkutils.Origins.Playlist: await ctx.send(config.SONGINFO_PLAYLIST_QUEUED) - @commands.command(name='loop', description=config.HELP_LOOP_LONG, help=config.HELP_LOOP_SHORT, aliases=['l', 'L']) + @commands.command(name='loop', description=config.HELP_LOOP_LONG, help=config.HELP_LOOP_SHORT, aliases=['l']) async def _loop(self, ctx): current_guild = utils.get_guild(self.bot, ctx.message) @@ -93,6 +94,9 @@ async def _shuffle(self, ctx): audiocontroller.playlist.shuffle() await ctx.send("Shuffled queue :twisted_rightwards_arrows:") + for song in list(audiocontroller.playlist.playque)[:config.MAX_SONG_PRELOAD]: + asyncio.ensure_future(audiocontroller.preload(song)) + @commands.command(name='pause', description=config.HELP_PAUSE_LONG, help=config.HELP_PAUSE_SHORT) async def _pause(self, ctx): current_guild = utils.get_guild(self.bot, ctx.message) @@ -108,7 +112,7 @@ async def _pause(self, ctx): current_guild.voice_client.pause() await ctx.send("Playback Paused :pause_button:") - @commands.command(name='queue', description=config.HELP_QUEUE_LONG, help=config.HELP_QUEUE_SHORT, aliases=['playlist', 'q', 'Q']) + @commands.command(name='queue', description=config.HELP_QUEUE_LONG, help=config.HELP_QUEUE_SHORT, aliases=['playlist', 'q']) async def _queue(self, ctx): current_guild = utils.get_guild(self.bot, ctx.message) @@ -124,13 +128,17 @@ async def _queue(self, ctx): playlist = utils.guild_to_audiocontroller[current_guild].playlist + #Embeds are limited to 25 fields + if config.MAX_SONG_PRELOAD > 25: + config.MAX_SONG_PRELOAD = 25 + embed = discord.Embed(title=":scroll: Queue [{}]".format( len(playlist.playque)), color=config.EMBED_COLOR, inline=False) counter = 1 - for song in list(playlist.playque)[:10]: + for song in list(playlist.playque)[:config.MAX_SONG_PRELOAD]: if song.info.title is None: - embed.add_field(name="{}.".format(str(counter)), value="[(PL) | {}]({})".format( + embed.add_field(name="{}.".format(str(counter)), value="[{}]({})".format( song.info.webpage_url, song.info.webpage_url), inline=False) else: embed.add_field(name="{}.".format(str(counter)), value="[{}]({})".format( @@ -139,7 +147,7 @@ async def _queue(self, ctx): await ctx.send(embed=embed) - @commands.command(name='stop', description=config.HELP_STOP_LONG, help=config. HELP_STOP_SHORT) + @commands.command(name='stop', description=config.HELP_STOP_LONG, help=config. HELP_STOP_SHORT, aliases=['st']) async def _stop(self, ctx): current_guild = utils.get_guild(self.bot, ctx.message) @@ -154,7 +162,7 @@ async def _stop(self, ctx): await utils.guild_to_audiocontroller[current_guild].stop_player() await ctx.send("Stopped all sessions :octagonal_sign:") - @commands.command(name='skip', description=config.HELP_SKIP_LONG, help=config.HELP_SKIP_SHORT, aliases=['s', 'S']) + @commands.command(name='skip', description=config.HELP_SKIP_LONG, help=config.HELP_SKIP_SHORT, aliases=['s']) async def _skip(self, ctx): current_guild = utils.get_guild(self.bot, ctx.message) diff --git a/musicbot/linkutils.py b/musicbot/linkutils.py --- a/musicbot/linkutils.py +++ b/musicbot/linkutils.py @@ -1,4 +1,4 @@ -import requests +import aiohttp import re from bs4 import BeautifulSoup from enum import Enum @@ -15,6 +15,12 @@ except: api = False +url_regex = re.compile( + "http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+") + +session = aiohttp.ClientSession( + headers={'User-Agent': 'python-requests/2.20.0'}) + def clean_sclink(track): if track.startswith("https://m."): @@ -24,25 +30,25 @@ def clean_sclink(track): return track -def convert_spotify(url): - regex = re.compile( - "http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+") +async def convert_spotify(url): - if re.search(regex, url): - result = regex.search(url) + if re.search(url_regex, url): + result = url_regex.search(url) url = result.group(0) - page = requests.get(url) - soup = BeautifulSoup(page.content, 'html.parser') + async with session.get(url) as response: - title = soup.find('title') - title = title.string - title = title.replace(', a song by', '').replace(' on Spotify', '') + page = await response.text() + soup = BeautifulSoup(page, 'html.parser') + + title = soup.find('title') + title = title.string + title = title.replace('Spotify – ', '') - return title + return title -def get_spotify_playlist(url): +async def get_spotify_playlist(url): """Return Spotify_Playlist class""" code = url.split('/')[4].split('?')[0] @@ -92,11 +98,10 @@ def get_spotify_playlist(url): if config.SPOTIFY_ID != "" or config.SPOTIFY_SECRET != "": print("ERROR: Check spotify CLIENT_ID and SECRET") - headers = { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36"} + async with session.get(url) as response: + page = await response.text() - page = requests.get(url, headers=headers) - soup = BeautifulSoup(page.content, 'html.parser') + soup = BeautifulSoup(page, 'html.parser') results = soup.find_all(property="music:song", attrs={"content": True}) @@ -157,7 +162,7 @@ def identify_url(url): if "https://open.spotify.com/track" in url: return Sites.Spotify - if "https://open.spotify.com/playlist"in url or "https://open.spotify.com/album" in url: + if "https://open.spotify.com/playlist" in url or "https://open.spotify.com/album" in url: return Sites.Spotify_Playlist if "bandcamp.com/track/" in url: @@ -183,7 +188,7 @@ def identify_playlist(url): if "playlist?list=" in url: return Playlist_Types.YouTube_Playlist - if "https://open.spotify.com/playlist"in url or "https://open.spotify.com/album" in url: + if "https://open.spotify.com/playlist" in url or "https://open.spotify.com/album" in url: return Playlist_Types.Spotify_Playlist if "bandcamp.com/album/" in url: diff --git a/musicbot/playlist.py b/musicbot/playlist.py --- a/musicbot/playlist.py +++ b/musicbot/playlist.py @@ -33,7 +33,7 @@ def next(self): if len(self.playque) == 0: return None - song_played = self.playque.popleft() + song_played = self.playque[0] if self.loop == True: if song_played != "Dummy": diff --git a/musicbot/songinfo.py b/musicbot/songinfo.py --- a/musicbot/songinfo.py +++ b/musicbot/songinfo.py @@ -1,6 +1,7 @@ import discord from discord.ext import commands from config import config +import datetime class Song(): @@ -22,8 +23,7 @@ def __init__(self, uploader, title, duration, webpage_url, thumbnail): def format_output(self, playtype): - embed = discord.Embed(title=":musical_note: __**{}**__ :musical_note:".format( - self.title), description="***{}***".format(playtype), url=self.webpage_url, color=config.EMBED_COLOR) + embed = discord.Embed(title=playtype, description="[{}]({})".format(self.title, self.webpage_url), color=config.EMBED_COLOR) if self.thumbnail is not None: embed.set_thumbnail(url=self.thumbnail) @@ -31,11 +31,9 @@ def format_output(self, playtype): embed.add_field(name=config.SONGINFO_UPLOADER, value=self.uploader, inline=False) - print(self.duration) - if self.duration is not None: embed.add_field(name=config.SONGINFO_DURATION, - value="{}{}".format(self.duration, config.SONGINFO_SECONDS), inline=False) + value="{}".format(str(datetime.timedelta(seconds=self.duration))), inline=False) else: embed.add_field(name=config.SONGINFO_DURATION, value=config.SONGINFO_UNKNOWN_DURATION , inline=False) diff --git a/musicbot/utils.py b/musicbot/utils.py --- a/musicbot/utils.py +++ b/musicbot/utils.py @@ -49,7 +49,6 @@ async def connect_to_channel(guild, dest_channel_name, ctx, switch=False, defaul async def is_connected(ctx): try: voice_channel = ctx.guild.voice_client.channel - print(voice_channel) return voice_channel except: return None diff --git a/run.py b/run.py --- a/run.py +++ b/run.py @@ -13,7 +13,7 @@ initial_extensions = ['musicbot.commands.music', 'musicbot.commands.general', 'musicbot.plugins.button'] -bot = commands.Bot(command_prefix=config.BOT_PREFIX, pm_help=True) +bot = commands.Bot(command_prefix=config.BOT_PREFIX, pm_help=True, case_insensitive=True) if __name__ == '__main__':

mathics/Mathics

mathics__Mathics-863

b32f7f844a4a9c62662da0a8dbab8fa72222e6c8

diff --git a/mathics/builtin/graphs.py b/mathics/builtin/graphs.py --- a/mathics/builtin/graphs.py +++ b/mathics/builtin/graphs.py @@ -5,7 +5,7 @@ Graphs """ -# uses GraphViz, if it's installed in your PATH (see pydotplus.graphviz.find_graphviz and http://www.graphviz.org). +# uses GraphViz, if it's installed in your PATH (see pydot.graphviz.find_graphviz and http://www.graphviz.org). from __future__ import unicode_literals from __future__ import absolute_import @@ -43,14 +43,13 @@ def _shell_layout(G): def _generic_layout(G, warn): try: - import pydotplus - - if pydotplus.graphviz.find_graphviz(): - return nx.nx_pydot.graphviz_layout(G, prog='dot') + import pydot except ImportError: pass + else: + return nx.nx_pydot.graphviz_layout(G, prog='dot') - warn('Could not find pydotplus/dot; graph layout quality might be low.') + warn('Could not find pydot; graph layout quality might be low.') return nx.drawing.fruchterman_reingold_layout(G, pos=None, k=1.0) @@ -70,7 +69,10 @@ def _path_layout(G, root): if not neighbors: break - v = next(neighbors) if isgenerator(neighbors) else neighbors[0] + try: + v = next(neighbors) if isgenerator(neighbors) else neighbors[0] + except StopIteration: + break neighbors = G.neighbors(v) if k == 0: @@ -162,7 +164,7 @@ def _pos_into_box(vertices, pos, min_box, max_box): zx = (x0 + x1) / 2 zy = (y0 + y1) / 2 - s = 1.0 / max((x1 - x0) / dx, (y1 - y0) / dy) + s = 1.0 / max(max(x1 - x0, 1) / dx, (max(y1 - y0, 1)) / dy) for k, p in pos.items(): x, y = p new_pos[k] = (cx + (x - zx) * s, cy + (y - zy) * s) diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -69,9 +69,10 @@ "sympy>=1.6, < 1.7", "django >= 1.8, < 1.12", "mpmath>=1.1.0", + "palettable", # For bar charts, and portable, no-proprietary color palletes + "pydot", # For graphs "python-dateutil", "colorama", - "palettable", ] if not ((not is_PyPy and sys.version_info >= (3, 8)) or (is_PyPy and sys.version_info >= (3, 6))):

project-alice-assistant/ProjectAlice

project-alice-assistant__ProjectAlice-201

81259c6a188faed224b572035195caa0c67816da

"diff --git a/ProjectAliceConsole.py b/ProjectAliceConsole.py\n--- a/ProjectAliceConsole.py\n+++ b/P(...TRUNCATED)

"diff --git a/tests/unittests/base/model/test_AliceSkill.py b/tests/unittests/base/model/test_AliceS(...TRUNCATED)

BiznetGIO/RESTKnot

BiznetGIO__RESTKnot-126

068b0616f0a7b839449138cbebf6f53471b2b2da

"diff --git a/agent/dnsagent/cli.py b/agent/dnsagent/cli.py\ndeleted file mode 100644\n--- a/agent/d(...TRUNCATED)

"diff --git a/api/tests/integration/conftest.py b/api/tests/integration/conftest.py\n--- a/api/tests(...TRUNCATED)

teamsempo/SempoBlockchain

teamsempo__SempoBlockchain-130

0b6ca1cac5009818a00ede1f973ddb8b8d8025a7

"diff --git a/app/server/__init__.py b/app/server/__init__.py\n--- a/app/server/__init__.py\n+++ b/a(...TRUNCATED)

SpockBotMC/SpockBot

SpockBotMC__SpockBot-81

c0cf152824695a03d1c5a358e807c452e2d8bce9

"diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -12,7 +12,7 @@\n url='http(...TRUNCATED)

bcgov/TheOrgBook

bcgov__TheOrgBook-547

bf9fe23fb88fd75e36f5fd600152042599af97e9

"diff --git a/APISpec/gen/urls.py b/APISpec/gen/urls.py\n--- a/APISpec/gen/urls.py\n+++ b/APISpec/ge(...TRUNCATED)

Tiiiger/bert_score

Tiiiger__bert_score-16

8781157cd18816bf94cedd0a819119c19431cbcb

"diff --git a/bert_score/__init__.py b/bert_score/__init__.py\n--- a/bert_score/__init__.py\n+++ b/b(...TRUNCATED)

"diff --git a/tests/__init__.py b/tests/__init__.py\nnew file mode 100644\ndiff --git a/tests/test_b(...TRUNCATED)

mlsecproject/combine

mlsecproject__combine-103

d662493af9f6ee7bc36c5509c277f93980009bec

"diff --git a/baler.py b/baler.py\n--- a/baler.py\n+++ b/baler.py\n@@ -1,21 +1,21 @@\n import Config(...TRUNCATED)

ctlearn-project/ctlearn

ctlearn-project__ctlearn-29

9842660d4293a485652ccfe48725fda3d5be9e33

"diff --git a/ctalearn/data.py b/ctalearn/data.py\ndeleted file mode 100644\n--- a/ctalearn/data.py\(...TRUNCATED)

"diff --git a/misc/test_metadata.py b/misc/test_metadata.py\ndeleted file mode 100644\n--- a/misc/te(...TRUNCATED)