diff --git a/redbot/core/apis/audio/__init__.py b/redbot/core/apis/audio/__init__.py index a0d8947b1..354bf1fc6 100644 --- a/redbot/core/apis/audio/__init__.py +++ b/redbot/core/apis/audio/__init__.py @@ -1,11 +1,20 @@ -from . import abstract as abstract from . import constants as constants from . import errors as errors -from . import nodes from . import regex as regex -from . import sql as sql -from . import wavelink as wavelink -from .setting_cache import SettingCacheManager as SettingCacheManager -from . import playlists +from ._internal.wavelink.overwrites import ( + LoadType as LoadType, + PlayerStatus as PlayerStatus, + RedClient as RedClient, + RedEqualizer as RedEqualizer, + RedNode as RedNode, + RedPlayer as RedPlayer, + RedTrack as RedTrack, + RedTrackPlaylist as RedTrackPlaylist, + Votes as Votes, +) +from ._internal.wavelink.events import QueueEnd as QueueEnd +from ._internal.playlists.enums import PlaylistScope as PlaylistScope + from . import config from .config import _init as _init + diff --git a/redbot/core/apis/audio/_internal/__init__.py b/redbot/core/apis/audio/_internal/__init__.py new file mode 100644 index 000000000..52141834f --- /dev/null +++ b/redbot/core/apis/audio/_internal/__init__.py @@ -0,0 +1,6 @@ +from . import nodes as nodes +from . import setting_cache as setting_cache +from . import playlists as playlists +from . import sql as sql +from . import wavelink as wavelink +from . import abstract as abstract diff --git a/redbot/core/apis/audio/abstract.py b/redbot/core/apis/audio/_internal/abstract.py similarity index 100% rename from redbot/core/apis/audio/abstract.py rename to redbot/core/apis/audio/_internal/abstract.py diff --git a/redbot/core/apis/audio/nodes/__init__.py b/redbot/core/apis/audio/_internal/nodes/__init__.py similarity index 100% rename from redbot/core/apis/audio/nodes/__init__.py rename to redbot/core/apis/audio/_internal/nodes/__init__.py diff --git a/redbot/core/apis/audio/nodes/connection.py b/redbot/core/apis/audio/_internal/nodes/connection.py similarity index 95% rename from redbot/core/apis/audio/nodes/connection.py rename to redbot/core/apis/audio/_internal/nodes/connection.py index 68ec23255..eeae184d2 100644 --- a/redbot/core/apis/audio/nodes/connection.py +++ b/redbot/core/apis/audio/_internal/nodes/connection.py @@ -4,8 +4,8 @@ import copy import typing from .managed import managed_lavalink_connect_task_event -from .. import constants -from .. import config +from redbot.core.apis.audio import constants +from redbot.core.apis.audio import config if typing.TYPE_CHECKING: from redbot.core.bot import Red diff --git a/redbot/core/apis/audio/nodes/events.py b/redbot/core/apis/audio/_internal/nodes/events.py similarity index 96% rename from redbot/core/apis/audio/nodes/events.py rename to redbot/core/apis/audio/_internal/nodes/events.py index f4eb31ced..e5050ff33 100644 --- a/redbot/core/apis/audio/nodes/events.py +++ b/redbot/core/apis/audio/_internal/nodes/events.py @@ -8,8 +8,8 @@ import wavelink from redbot.core import commands from redbot.core.bot import Red -from ..wavelink.events import QueueEnd -from ..wavelink.overwrites import RedNode +from redbot.core.apis.audio._internal.wavelink.events import QueueEnd +from redbot.core.apis.audio._internal.wavelink import RedNode log = logging.getLogger("red.core.apis.audio.nodes") diff --git a/redbot/core/apis/audio/nodes/managed.py b/redbot/core/apis/audio/_internal/nodes/managed.py similarity index 99% rename from redbot/core/apis/audio/nodes/managed.py rename to redbot/core/apis/audio/_internal/nodes/managed.py index b2679b4e0..bc099ff2d 100644 --- a/redbot/core/apis/audio/nodes/managed.py +++ b/redbot/core/apis/audio/_internal/nodes/managed.py @@ -15,7 +15,7 @@ import aiohttp from tqdm import tqdm from redbot.core import Config -from .. import constants, regex, errors +from redbot.core.apis.audio import constants, regex, errors __all__ = [ "managed_lavalink_connect_task_event", diff --git a/redbot/core/apis/audio/playlists/__init__.py b/redbot/core/apis/audio/_internal/playlists/__init__.py similarity index 100% rename from redbot/core/apis/audio/playlists/__init__.py rename to redbot/core/apis/audio/_internal/playlists/__init__.py diff --git a/redbot/core/apis/audio/playlists/enums.py b/redbot/core/apis/audio/_internal/playlists/enums.py similarity index 100% rename from redbot/core/apis/audio/playlists/enums.py rename to redbot/core/apis/audio/_internal/playlists/enums.py diff --git a/redbot/core/apis/audio/setting_cache/__init__.py b/redbot/core/apis/audio/_internal/setting_cache/__init__.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/__init__.py rename to redbot/core/apis/audio/_internal/setting_cache/__init__.py diff --git a/redbot/core/apis/audio/setting_cache/autodc.py b/redbot/core/apis/audio/_internal/setting_cache/autodc.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/autodc.py rename to redbot/core/apis/audio/_internal/setting_cache/autodc.py diff --git a/redbot/core/apis/audio/setting_cache/autoplay.py b/redbot/core/apis/audio/_internal/setting_cache/autoplay.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/autoplay.py rename to redbot/core/apis/audio/_internal/setting_cache/autoplay.py diff --git a/redbot/core/apis/audio/setting_cache/blacklist_whitelist.py b/redbot/core/apis/audio/_internal/setting_cache/blacklist_whitelist.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/blacklist_whitelist.py rename to redbot/core/apis/audio/_internal/setting_cache/blacklist_whitelist.py diff --git a/redbot/core/apis/audio/setting_cache/channel_restrict.py b/redbot/core/apis/audio/_internal/setting_cache/channel_restrict.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/channel_restrict.py rename to redbot/core/apis/audio/_internal/setting_cache/channel_restrict.py diff --git a/redbot/core/apis/audio/setting_cache/country_code.py b/redbot/core/apis/audio/_internal/setting_cache/country_code.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/country_code.py rename to redbot/core/apis/audio/_internal/setting_cache/country_code.py diff --git a/redbot/core/apis/audio/setting_cache/daily_global_playlist.py b/redbot/core/apis/audio/_internal/setting_cache/daily_global_playlist.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/daily_global_playlist.py rename to redbot/core/apis/audio/_internal/setting_cache/daily_global_playlist.py diff --git a/redbot/core/apis/audio/setting_cache/daily_playlist.py b/redbot/core/apis/audio/_internal/setting_cache/daily_playlist.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/daily_playlist.py rename to redbot/core/apis/audio/_internal/setting_cache/daily_playlist.py diff --git a/redbot/core/apis/audio/setting_cache/dj_roles.py b/redbot/core/apis/audio/_internal/setting_cache/dj_roles.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/dj_roles.py rename to redbot/core/apis/audio/_internal/setting_cache/dj_roles.py diff --git a/redbot/core/apis/audio/setting_cache/dj_status.py b/redbot/core/apis/audio/_internal/setting_cache/dj_status.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/dj_status.py rename to redbot/core/apis/audio/_internal/setting_cache/dj_status.py diff --git a/redbot/core/apis/audio/setting_cache/emptydc.py b/redbot/core/apis/audio/_internal/setting_cache/emptydc.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/emptydc.py rename to redbot/core/apis/audio/_internal/setting_cache/emptydc.py diff --git a/redbot/core/apis/audio/setting_cache/emptydc_timer.py b/redbot/core/apis/audio/_internal/setting_cache/emptydc_timer.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/emptydc_timer.py rename to redbot/core/apis/audio/_internal/setting_cache/emptydc_timer.py diff --git a/redbot/core/apis/audio/setting_cache/emptypause.py b/redbot/core/apis/audio/_internal/setting_cache/emptypause.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/emptypause.py rename to redbot/core/apis/audio/_internal/setting_cache/emptypause.py diff --git a/redbot/core/apis/audio/setting_cache/emptypause_timer.py b/redbot/core/apis/audio/_internal/setting_cache/emptypause_timer.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/emptypause_timer.py rename to redbot/core/apis/audio/_internal/setting_cache/emptypause_timer.py diff --git a/redbot/core/apis/audio/setting_cache/globaldb.py b/redbot/core/apis/audio/_internal/setting_cache/globaldb.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/globaldb.py rename to redbot/core/apis/audio/_internal/setting_cache/globaldb.py diff --git a/redbot/core/apis/audio/setting_cache/globaldb_timeout.py b/redbot/core/apis/audio/_internal/setting_cache/globaldb_timeout.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/globaldb_timeout.py rename to redbot/core/apis/audio/_internal/setting_cache/globaldb_timeout.py diff --git a/redbot/core/apis/audio/setting_cache/jukebox.py b/redbot/core/apis/audio/_internal/setting_cache/jukebox.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/jukebox.py rename to redbot/core/apis/audio/_internal/setting_cache/jukebox.py diff --git a/redbot/core/apis/audio/setting_cache/jukebox_price.py b/redbot/core/apis/audio/_internal/setting_cache/jukebox_price.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/jukebox_price.py rename to redbot/core/apis/audio/_internal/setting_cache/jukebox_price.py diff --git a/redbot/core/apis/audio/setting_cache/local_cache_age.py b/redbot/core/apis/audio/_internal/setting_cache/local_cache_age.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/local_cache_age.py rename to redbot/core/apis/audio/_internal/setting_cache/local_cache_age.py diff --git a/redbot/core/apis/audio/setting_cache/local_cache_level.py b/redbot/core/apis/audio/_internal/setting_cache/local_cache_level.py similarity index 94% rename from redbot/core/apis/audio/setting_cache/local_cache_level.py rename to redbot/core/apis/audio/_internal/setting_cache/local_cache_level.py index 12b598bb5..47ca46572 100644 --- a/redbot/core/apis/audio/setting_cache/local_cache_level.py +++ b/redbot/core/apis/audio/_internal/setting_cache/local_cache_level.py @@ -7,7 +7,7 @@ import discord from redbot.core import Config from redbot.core.bot import Red -from ..abstract import CacheLevel +from redbot.core.apis.audio._internal.abstract import CacheLevel class LocalCacheLevelManager: diff --git a/redbot/core/apis/audio/setting_cache/localpath.py b/redbot/core/apis/audio/_internal/setting_cache/localpath.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/localpath.py rename to redbot/core/apis/audio/_internal/setting_cache/localpath.py diff --git a/redbot/core/apis/audio/setting_cache/lyrics.py b/redbot/core/apis/audio/_internal/setting_cache/lyrics.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/lyrics.py rename to redbot/core/apis/audio/_internal/setting_cache/lyrics.py diff --git a/redbot/core/apis/audio/setting_cache/managed_lavalink_auto_update.py b/redbot/core/apis/audio/_internal/setting_cache/managed_lavalink_auto_update.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/managed_lavalink_auto_update.py rename to redbot/core/apis/audio/_internal/setting_cache/managed_lavalink_auto_update.py diff --git a/redbot/core/apis/audio/setting_cache/managed_lavalink_server.py b/redbot/core/apis/audio/_internal/setting_cache/managed_lavalink_server.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/managed_lavalink_server.py rename to redbot/core/apis/audio/_internal/setting_cache/managed_lavalink_server.py diff --git a/redbot/core/apis/audio/setting_cache/max_track_length.py b/redbot/core/apis/audio/_internal/setting_cache/max_track_length.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/max_track_length.py rename to redbot/core/apis/audio/_internal/setting_cache/max_track_length.py diff --git a/redbot/core/apis/audio/setting_cache/notify.py b/redbot/core/apis/audio/_internal/setting_cache/notify.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/notify.py rename to redbot/core/apis/audio/_internal/setting_cache/notify.py diff --git a/redbot/core/apis/audio/setting_cache/persist_queue.py b/redbot/core/apis/audio/_internal/setting_cache/persist_queue.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/persist_queue.py rename to redbot/core/apis/audio/_internal/setting_cache/persist_queue.py diff --git a/redbot/core/apis/audio/setting_cache/repeat.py b/redbot/core/apis/audio/_internal/setting_cache/repeat.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/repeat.py rename to redbot/core/apis/audio/_internal/setting_cache/repeat.py diff --git a/redbot/core/apis/audio/setting_cache/restrict.py b/redbot/core/apis/audio/_internal/setting_cache/restrict.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/restrict.py rename to redbot/core/apis/audio/_internal/setting_cache/restrict.py diff --git a/redbot/core/apis/audio/setting_cache/shuffle.py b/redbot/core/apis/audio/_internal/setting_cache/shuffle.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/shuffle.py rename to redbot/core/apis/audio/_internal/setting_cache/shuffle.py diff --git a/redbot/core/apis/audio/setting_cache/shuffle_bumped.py b/redbot/core/apis/audio/_internal/setting_cache/shuffle_bumped.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/shuffle_bumped.py rename to redbot/core/apis/audio/_internal/setting_cache/shuffle_bumped.py diff --git a/redbot/core/apis/audio/setting_cache/status.py b/redbot/core/apis/audio/_internal/setting_cache/status.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/status.py rename to redbot/core/apis/audio/_internal/setting_cache/status.py diff --git a/redbot/core/apis/audio/setting_cache/thumbnail.py b/redbot/core/apis/audio/_internal/setting_cache/thumbnail.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/thumbnail.py rename to redbot/core/apis/audio/_internal/setting_cache/thumbnail.py diff --git a/redbot/core/apis/audio/setting_cache/vc_restricted.py b/redbot/core/apis/audio/_internal/setting_cache/vc_restricted.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/vc_restricted.py rename to redbot/core/apis/audio/_internal/setting_cache/vc_restricted.py diff --git a/redbot/core/apis/audio/setting_cache/volume.py b/redbot/core/apis/audio/_internal/setting_cache/volume.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/volume.py rename to redbot/core/apis/audio/_internal/setting_cache/volume.py diff --git a/redbot/core/apis/audio/setting_cache/votes_percentage.py b/redbot/core/apis/audio/_internal/setting_cache/votes_percentage.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/votes_percentage.py rename to redbot/core/apis/audio/_internal/setting_cache/votes_percentage.py diff --git a/redbot/core/apis/audio/setting_cache/voting.py b/redbot/core/apis/audio/_internal/setting_cache/voting.py similarity index 100% rename from redbot/core/apis/audio/setting_cache/voting.py rename to redbot/core/apis/audio/_internal/setting_cache/voting.py diff --git a/redbot/core/apis/audio/sql/__init__.py b/redbot/core/apis/audio/_internal/sql/__init__.py similarity index 100% rename from redbot/core/apis/audio/sql/__init__.py rename to redbot/core/apis/audio/_internal/sql/__init__.py diff --git a/redbot/core/apis/audio/sql/lavalink.py b/redbot/core/apis/audio/_internal/sql/lavalink.py similarity index 100% rename from redbot/core/apis/audio/sql/lavalink.py rename to redbot/core/apis/audio/_internal/sql/lavalink.py diff --git a/redbot/core/apis/audio/sql/persist_queue.py b/redbot/core/apis/audio/_internal/sql/persist_queue.py similarity index 100% rename from redbot/core/apis/audio/sql/persist_queue.py rename to redbot/core/apis/audio/_internal/sql/persist_queue.py diff --git a/redbot/core/apis/audio/sql/playlists.py b/redbot/core/apis/audio/_internal/sql/playlists.py similarity index 100% rename from redbot/core/apis/audio/sql/playlists.py rename to redbot/core/apis/audio/_internal/sql/playlists.py diff --git a/redbot/core/apis/audio/sql/pragmas.py b/redbot/core/apis/audio/_internal/sql/pragmas.py similarity index 100% rename from redbot/core/apis/audio/sql/pragmas.py rename to redbot/core/apis/audio/_internal/sql/pragmas.py diff --git a/redbot/core/apis/audio/sql/spotify.py b/redbot/core/apis/audio/_internal/sql/spotify.py similarity index 100% rename from redbot/core/apis/audio/sql/spotify.py rename to redbot/core/apis/audio/_internal/sql/spotify.py diff --git a/redbot/core/apis/audio/sql/youtube.py b/redbot/core/apis/audio/_internal/sql/youtube.py similarity index 100% rename from redbot/core/apis/audio/sql/youtube.py rename to redbot/core/apis/audio/_internal/sql/youtube.py diff --git a/redbot/core/apis/audio/wavelink/__init__.py b/redbot/core/apis/audio/_internal/wavelink/__init__.py similarity index 100% rename from redbot/core/apis/audio/wavelink/__init__.py rename to redbot/core/apis/audio/_internal/wavelink/__init__.py diff --git a/redbot/core/apis/audio/wavelink/events.py b/redbot/core/apis/audio/_internal/wavelink/events.py similarity index 100% rename from redbot/core/apis/audio/wavelink/events.py rename to redbot/core/apis/audio/_internal/wavelink/events.py diff --git a/redbot/core/apis/audio/wavelink/overwrites.py b/redbot/core/apis/audio/_internal/wavelink/overwrites.py similarity index 99% rename from redbot/core/apis/audio/wavelink/overwrites.py rename to redbot/core/apis/audio/_internal/wavelink/overwrites.py index 1705475fa..0ec42d0a6 100644 --- a/redbot/core/apis/audio/wavelink/overwrites.py +++ b/redbot/core/apis/audio/_internal/wavelink/overwrites.py @@ -22,7 +22,7 @@ from discord.http import Route from redbot.core import commands -from .. import regex, constants +from ... import regex, constants from .events import QueueEnd __all__ = [ diff --git a/redbot/core/apis/audio/config.py b/redbot/core/apis/audio/config.py index bc7a0ade2..4d185f0dc 100644 --- a/redbot/core/apis/audio/config.py +++ b/redbot/core/apis/audio/config.py @@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Optional from redbot.core import Config from . import SettingCacheManager, constants -from .playlists.enums import PlaylistScope +from ._internal.playlists.enums import PlaylistScope if TYPE_CHECKING: from redbot.core.bot import Red diff --git a/redbot/core/bot.py b/redbot/core/bot.py index 941fffd0a..a8ae744b5 100644 --- a/redbot/core/bot.py +++ b/redbot/core/bot.py @@ -3,7 +3,6 @@ import inspect import logging import os import platform -import re import shutil import sys import contextlib @@ -19,7 +18,6 @@ from typing import ( Dict, NoReturn, Set, - Coroutine, TypeVar, Callable, Awaitable, @@ -30,7 +28,6 @@ from types import MappingProxyType import discord from discord.ext import commands as dpy_commands from discord.ext.commands import when_mentioned_or -from discord.ext.commands.bot import BotBase from . import Config, i18n, commands, errors, drivers, modlog, bank from .cog_manager import CogManager, CogManagerUI @@ -191,7 +188,7 @@ class RedBase( self._permissions_hooks: List[commands.CheckPredicate] = [] self._red_ready = asyncio.Event() self._red_before_invoke_objs: Set[PreInvokeCoroutine] = set() - from .apis.audio.wavelink.overwrites import ( + from redbot.core.apis.audio._internal.wavelink import ( RedClient, ) # This is needed to avoid objects not being ready @@ -593,7 +590,7 @@ class RedBase( from .apis import audio # This is needed to avoid objects not being ready await audio._init(self) - self.add_cog(audio.nodes.AudioAPIEvents(self)) + self.add_cog(redbot.core.apis.audio._internal.nodes.AudioAPIEvents(self)) packages = []