Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Audio] Formatting Sucks ... lets standardize it a little ahead of PR1.5 #3059

Merged
merged 2 commits into from
Oct 17, 2019
Merged

[Audio] Formatting Sucks ... lets standardize it a little ahead of PR1.5 #3059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2525abe
Formatting Sucks ... lets standardize it a little ahead of PR1.5
Drapersniper Oct 15, 2019
18edb6e
Finish applying this logic to other instances where it is relevant + …
Drapersniper Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/audio/3059.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes badly formatted track name.
102 changes: 43 additions & 59 deletions redbot/cogs/audio/audio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,12 @@ async def event_handler(
async def _players_check():
try:
get_single_title = lavalink.active_players()[0].current.title
query = dataclasses.Query.process_input(lavalink.active_players()[0].current.uri)
if get_single_title == "Unknown title":
get_single_title = lavalink.active_players()[0].current.uri
if not get_single_title.startswith("http"):
get_single_title = get_single_title.rsplit("/", 1)[-1]
elif any(
x in lavalink.active_players()[0].current.uri
for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):
elif query.is_local:
get_single_title = "{} - {}".format(
lavalink.active_players()[0].current.author,
lavalink.active_players()[0].current.title,
Expand Down Expand Up @@ -465,14 +463,9 @@ async def _status_check(playing_servers):
)
await notify_channel.send(embed=embed)

if (
any(
x in player.current.uri
for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
)
if player.current
else False
):
query = dataclasses.Query.process_input(player.current.uri)

if query.is_local if player.current else False:
if player.current.title != "Unknown title":
description = "**{} - {}**\n{}".format(
player.current.author,
Expand Down Expand Up @@ -539,10 +532,8 @@ async def _status_check(playing_servers):
message_channel = player.fetch("channel")
if message_channel:
message_channel = self.bot.get_channel(message_channel)
if player.current and any(
x in player.current.uri
for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):
query = dataclasses.Query.process_input(player.current.uri)
if player.current and query.is_local:
query = dataclasses.Query.process_input(player.current.uri)
if player.current.title == "Unknown title":
description = "{}".format(query.track.to_string_hidden())
Expand Down Expand Up @@ -1545,9 +1536,8 @@ async def audiostats(self, ctx: commands.Context):
int((datetime.datetime.utcnow() - connect_start).total_seconds())
)
try:
if any(
x in p.current.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):
query = dataclasses.Query.process_input(p.current.uri)
if query.is_local:
if p.current.title == "Unknown title":
current_title = localtracks.LocalPath(p.current.uri).to_string_hidden()
msg += "{} [`{}`]: **{}**\n".format(
Expand Down Expand Up @@ -1616,7 +1606,8 @@ async def bump(self, ctx: commands.Context, index: int):
bump_song = player.queue[bump_index]
player.queue.insert(0, bump_song)
removed = player.queue.pop(index)
if any(x in removed.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]):
query = dataclasses.Query.process_input(removed.uri)
if query.is_local:
localtrack = dataclasses.LocalPath(removed.uri)
if removed.title != "Unknown title":
description = "**{} - {}**\n{}".format(
Expand Down Expand Up @@ -2186,9 +2177,8 @@ async def now(self, ctx: commands.Context):
dur = "LIVE"
else:
dur = lavalink.utils.format_time(player.current.length)
if any(
x in player.current.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):
query = dataclasses.Query.process_input(player.current.uri)
if query.is_local:
if not player.current.title == "Unknown title":
song = "**{track.author} - {track.title}**\n{uri}\n"
else:
Expand All @@ -2200,10 +2190,7 @@ async def now(self, ctx: commands.Context):
song = song.format(
track=player.current,
uri=dataclasses.LocalPath(player.current.uri).to_string_hidden()
if any(
x in player.current.uri
for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
)
if dataclasses.Query.process_input(player.current.uri).is_local
else player.current.uri,
arrow=arrow,
pos=pos,
Expand Down Expand Up @@ -2314,7 +2301,8 @@ async def pause(self, ctx: commands.Context):

if not player.current:
return await self._embed_msg(ctx, _("Nothing playing."))
if any(x in player.current.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]):
query = dataclasses.Query.process_input(player.current.uri)
if query.is_local:
query = dataclasses.Query.process_input(player.current.uri)
if player.current.title == "Unknown title":
description = "{}".format(query.track.to_string_hidden())
Expand Down Expand Up @@ -2966,9 +2954,8 @@ async def _enqueue_tracks(self, ctx: commands.Context, query: Union[dataclasses.
return await self._embed_msg(
ctx, _("Nothing found. Check your Lavalink logs for details.")
)
if any(
x in single_track.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):
query = dataclasses.Query.process_input(single_track.uri)
if query.is_local:
if single_track.title != "Unknown title":
description = "**{} - {}**\n{}".format(
single_track.author,
Expand Down Expand Up @@ -4005,7 +3992,7 @@ async def _playlist_info(
for track in playlist.tracks:
track_idx = track_idx + 1
query = dataclasses.Query.process_input(track["info"]["uri"])
if any(x in str(query) for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]):
if query.is_local:
if track["info"]["title"] != "Unknown title":
msg += "`{}.` **{} - {}**\n{}{}\n".format(
track_idx,
Expand Down Expand Up @@ -4504,7 +4491,8 @@ async def _playlist_start(
):
log.debug(f"Query is not allowed in {ctx.guild} ({ctx.guild.id})")
continue
if any(x in track.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]):
query = dataclasses.Query.process_input(track.uri)
if query.is_local:
local_path = dataclasses.LocalPath(track.uri)
if not await self._localtracks_check(ctx):
pass
Expand Down Expand Up @@ -5185,10 +5173,9 @@ async def prev(self, ctx: commands.Context):
player.queue.insert(0, bump_song)
player.queue.pop(queue_len)
await player.skip()
if any(
x in player.current.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):
query = dataclasses.Query.process_input(player.current.uri)
query = dataclasses.Query.process_input(player.current.uri)
if query.is_local:

if player.current.title == "Unknown title":
description = "{}".format(query.track.to_string_hidden())
else:
Expand Down Expand Up @@ -5237,10 +5224,10 @@ async def _queue_menu(
dur = "LIVE"
else:
dur = lavalink.utils.format_time(player.current.length)
if any(
x in player.current.uri
for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):

query = dataclasses.Query.process_input(player.current)

if query.is_local:
if player.current.title != "Unknown title":
song = "**{track.author} - {track.title}**\n{uri}\n"
else:
Expand All @@ -5252,10 +5239,7 @@ async def _queue_menu(
song = song.format(
track=player.current,
uri=dataclasses.LocalPath(player.current.uri).to_string_hidden()
if any(
x in player.current.uri
for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
)
if dataclasses.Query.process_input(player.current.uri).is_local
else player.current.uri,
arrow=arrow,
pos=pos,
Expand Down Expand Up @@ -5327,15 +5311,15 @@ async def _build_queue_page(
else:
dur = lavalink.utils.format_time(player.current.length)

if player.current.is_stream:
query = dataclasses.Query.process_input(player.current)

if query.is_stream:
queue_list += _("**Currently livestreaming:**\n")
queue_list += "**[{current.title}]({current.uri})**\n".format(current=player.current)
queue_list += _("Requested by: **{user}**").format(user=player.current.requester)
queue_list += f"\n\n{arrow}`{pos}`/`{dur}`\n\n"

elif any(
x in player.current.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):
elif query.is_local:
if player.current.title != "Unknown title":
queue_list += "\n".join(
(
Expand Down Expand Up @@ -5371,7 +5355,9 @@ async def _build_queue_page(
track_title = track.title
req_user = track.requester
track_idx = i + 1
if any(x in track.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]):
query = dataclasses.Query.process_input(track)

if query.is_local:
if track.title == "Unknown title":
queue_list += f"`{track_idx}.` " + ", ".join(
(
Expand Down Expand Up @@ -5686,7 +5672,8 @@ async def remove(self, ctx: commands.Context, index: int):
)
index -= 1
removed = player.queue.pop(index)
if any(x in removed.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]):
query = dataclasses.Query.process_input(removed.uri)
if query.is_local:
local_path = dataclasses.LocalPath(removed.uri).to_string_hidden()
if removed.title == "Unknown title":
removed_title = local_path
Expand Down Expand Up @@ -5916,9 +5903,8 @@ async def _search_button_action(self, ctx: commands.Context, tracks, emoji, page
except IndexError:
search_choice = tracks[-1]
try:
if any(
x in search_choice.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]
):
query = dataclasses.Query.process_input(search_choice.uri)
if query.is_local:

localtrack = dataclasses.LocalPath(search_choice.uri)
if search_choice.title != "Unknown title":
Expand Down Expand Up @@ -5996,7 +5982,8 @@ async def _build_search_page(ctx: commands.Context, tracks, page_num):
if search_track_num == 0:
search_track_num = 5
try:
if any(x in track.uri for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"]):
query = dataclasses.Query.process_input(track.uri)
if query.is_local:
search_list += "`{0}.` **{1}**\n[{2}]\n".format(
search_track_num,
track.title,
Expand All @@ -6009,10 +5996,7 @@ async def _build_search_page(ctx: commands.Context, tracks, page_num):
except AttributeError:
# query = Query.process_input(track)
track = dataclasses.Query.process_input(track)
if (
any(x in str(track) for x in [f"{os.sep}localtracks", f"localtracks{os.sep}"])
and command != "search"
):
if track.is_local and command != "search":
search_list += "`{}.` **{}**\n".format(
search_track_num, track.to_string_user()
)
Expand Down