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

Merge fix.

Browse Source
This commit is contained in:
Will Tekulve 2016-05-12 21:24:32 -04:00
parent 2f46605bf6
commit 0d92adf055
2 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cogs/audio.py
View File

@ -21,6 +21,12 @@ __version__ = "0.0.1"
log = logging.getLogger("red.audio")
log.setLevel(logging.DEBUG)
__author__ = "tekulvw"
__version__ = "0.0.1"
log = logging.getLogger("red.audio")
log.setLevel(logging.DEBUG)
try:
import youtube_dl
except:
@ -184,12 +190,10 @@ class Downloader(threading.Thread):
video = self._yt.extract_info(self.url, download=False,
process=False)
else:
self.url = self.url[9:]
yt_id = self._yt.extract_info(self.url,
download=False)["entries"][0]["id"] # Should handle errors here.
self.url = "https://youtube.com/watch?v={}".format(yt_id)
video = self._yt.extract_info(self.url, download=False,
process=False)
self.url = "https://youtube.com/watch?v={}".format(
video["entries"][0]["id"])
self.song = Song(**video)
@ -447,6 +451,14 @@ class Audio:
return song
def _list_local_playlists(self):
ret = []
for thing in os.listdir(self.local_playlist_path):
if os.path.isdir(os.path.join(self.local_playlist_path, thing)):
ret.append(thing)
log.debug("local playlists:\n\t{}".format(ret))
return ret
def _is_queue_playlist(self, server):
if server.id not in self.queue:
return False
@ -475,9 +487,11 @@ class Audio:
except:
pass
path = "data/audio/playlists"
old_playlists = [f[:-4] for f in os.listdir(path) if f.endswith(".txt")]
old_playlists = [f[:-4] for f in os.listdir(path)
if f.endswith(".txt")]
path = os.path.join(path, server)
new_playlists = [f[:-4] for f in os.listdir(path) if f.endswith(".txt")]
new_playlists = [f[:-4] for f in os.listdir(path)
if f.endswith(".txt")]
return list(set(old_playlists + new_playlists))
def _list_local_playlists(self):
@ -608,7 +622,7 @@ class Audio:
assert type(server) is discord.Server
log.debug('starting to play on "{}"'.format(server.name))
if self._valid_playable_url(url) or "[SEARCH:]" in url:
if self._valid_playable_url(url):
song = await self._guarantee_downloaded(server, url)
local = False
else: # Assume local
@ -1025,10 +1039,16 @@ class Audio:
author = ctx.message.author
voice_channel = author.voice_channel
# Checking if playing in current server
if self.is_playing(server):
await self.bot.say("I'm already playing a song on this server!")
return # TODO: Possibly execute queue?
# Checking already connected, will join if not
caller = inspect.currentframe().f_back.f_code.co_name
if not self.voice_connected(server):
try:
can_connect = self.has_connect_perm(author, server)
@ -1046,19 +1066,13 @@ class Audio:
await self._stop_and_disconnect(server)
await self._join_voice_channel(voice_channel)
# Checking if playing in current server
if self.is_playing(server):
await self.bot.say("I'm already playing a song on this server!")
return # TODO: Possibly execute queue?
# If not playing, spawn a downloader if it doesn't exist and begin
# downloading the next song
if self.currently_downloading(server):
await self.bot.say("I'm already downloading a file!")
return
if caller != "yt_search":
if not self._valid_playable_url(url):
await self.bot.say("That's not a valid URL.")
@ -1102,13 +1116,13 @@ class Audio:
@commands.command(pass_context=True, no_pm=True)
async def sing(self, ctx):
"""Makes Red sing one of her songs"""
ids = ("zGTkAVsrfg8", "cGMWL8cOeAU", "vFrjMq4aL-g", "WROI5WYBU_A",
ids = ("zGTkAVsrfg8", "cGMWL8cOeAU", "vFrjMq4aL-g", "WROI5WYBU_A",
"41tIUr_ex3g", "f9O2Rjn1azc")
url = "https://www.youtube.com/watch?v={}".format(choice(ids))
await self.play.callback(self, ctx, url)
@commands.command(name="yt", pass_context=True, no_pm=True)
async def yt_search(self, ctx, *, search_terms : str):
async def yt_search(self, ctx, *, search_terms: str):
"""Searches and plays a video from YouTube"""
await self.play.callback(self, ctx, search_terms)
@ -1229,6 +1243,7 @@ class Audio:
server, name))
if caller == "playlist_start_mix":
shuffle(playlist.playlist)
self._play_playlist(server, playlist)
await self.bot.say("Playlist queued.")
else:
@ -1358,8 +1373,9 @@ class Audio:
song = self.queue[server.id]["NOW_PLAYING"]
if song:
msg = ("\n**Title:** {}\n**Author:** {}\n**Uploader:** {}\n"
"**Views:** {}\n\n<{}>".format(song.title, song.creator,
song.uploader, song.view_count, song.webpage_url))
"**Views:** {}\n\n<{}>".format(
song.title, song.creator, song.view_count,
song.webpage_url))
await self.bot.say(msg.replace("**Author:** None\n", ""))
else:
await self.bot.say("I don't know what this song is either.")
@ -1452,8 +1468,8 @@ class Audio:
ret[setting] = self.settings[setting]
if setting.lower() == "volume" and ret[setting] <= 1:
ret[setting] *= 100
#^This will make it so that only users with an outdated config will
#have their volume set * 100. In theory.
# ^This will make it so that only users with an outdated config will
# have their volume set * 100. In theory.
self.save_settings()
return ret

1
cogs/mod.py
View File

@ -6,6 +6,7 @@ from __main__ import send_cmd_help, settings
import os
import logging
class Mod:
"""Moderation tools."""