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

[Audio] Sort local files (#2358)

Browse Source
This commit is contained in:
El Laggron 2019-02-27 06:22:10 +01:00 committed by Toby Harradine
parent 16614168a7
commit 46f9cae0ef
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
redbot/cogs/audio/audio.py
View File

@ -676,11 +676,14 @@ class Audio(commands.Cog):
return return
allowed_files = (".mp3", ".flac", ".ogg") allowed_files = (".mp3", ".flac", ".ogg")
current_folder = os.getcwd() + "/localtracks/{}/".format(folder) current_folder = os.getcwd() + "/localtracks/{}/".format(folder)
folder_list = [ folder_list = sorted(
f (
for f in os.listdir(current_folder) f
if (f.lower().endswith(allowed_files)) and (os.path.isfile(current_folder + f)) for f in os.listdir(current_folder)
] if (f.lower().endswith(allowed_files)) and (os.path.isfile(current_folder + f))
),
key=lambda s: s.casefold(),
)
track_listing = [] track_listing = []
for localtrack_location in folder_list: for localtrack_location in folder_list:
track_listing.append(localtrack_location) track_listing.append(localtrack_location)
@ -699,12 +702,15 @@ class Audio(commands.Cog):
if not await self._localtracks_check(ctx): if not await self._localtracks_check(ctx):
return return
allowed_files = (".mp3", ".flac", ".ogg") allowed_files = (".mp3", ".flac", ".ogg")
folder_list = [ folder_list = sorted(
os.getcwd() + "/localtracks/{}/{}".format(folder, f) (
for f in os.listdir(os.getcwd() + "/localtracks/{}/".format(folder)) os.getcwd() + "/localtracks/{}/{}".format(folder, f)
if (f.lower().endswith(allowed_files)) for f in os.listdir(os.getcwd() + "/localtracks/{}/".format(folder))
and (os.path.isfile(os.getcwd() + "/localtracks/{}/{}".format(folder, f))) if (f.lower().endswith(allowed_files))
] and (os.path.isfile(os.getcwd() + "/localtracks/{}/{}".format(folder, f)))
),
key=lambda s: s.casefold(),
)
track_listing = [] track_listing = []
if ctx.invoked_with == "search": if ctx.invoked_with == "search":
for localtrack_location in folder_list: for localtrack_location in folder_list:
@ -2763,11 +2769,14 @@ class Audio(commands.Cog):
async def _localtracks_folders(self, ctx): async def _localtracks_folders(self, ctx):
if not await self._localtracks_check(ctx): if not await self._localtracks_check(ctx):
return return
localtracks_folders = [ localtracks_folders = sorted(
f (
for f in os.listdir(os.getcwd() + "/localtracks/") f
if not os.path.isfile(os.getcwd() + "/localtracks/" + f) for f in os.listdir(os.getcwd() + "/localtracks/")
] if not os.path.isfile(os.getcwd() + "/localtracks/" + f)
),
key=lambda s: s.casefold(),
)
return localtracks_folders return localtracks_folders
@staticmethod @staticmethod