CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-12-07 09:52:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add and use Red-Commons library (#5624)

Browse Source 
* update RC dep

* welp 100% tested

* fix import

* 120% tested

* Call _early_init even earlier

Not really in scope of this PR but the original was merged
before I could share any feedback.

* explicitly import getLogger

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>
This commit is contained in:
Draper
2022-03-18 22:41:42 +00:00
committed by GitHub
parent 335988c916
commit f763d29fd4
46 changed files with 110 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
redbot/cogs/audio/core/utilities/equalizer.py
View File

@@ -1,11 +1,11 @@
import asyncio
import contextlib
import logging
from typing import List
import discord
import lavalink
from red_commons.logging import getLogger
from redbot.core import commands
from redbot.core.utils.chat_formatting import box
@@ -14,7 +14,7 @@ from ...equalizer import Equalizer
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass
log = logging.getLogger("red.cogs.Audio.cog.Utilities.equalizer")
log = getLogger("red.cogs.Audio.cog.Utilities.equalizer")
class EqualizerUtilities(MixinMeta, metaclass=CompositeMetaClass):

4
redbot/cogs/audio/core/utilities/formatting.py
View File

@@ -1,4 +1,3 @@
import logging
import math
import re
import time
@@ -8,6 +7,7 @@ from typing import List, Optional
import discord
import lavalink
from red_commons.logging import getLogger
from discord.embeds import EmptyEmbed
from redbot.core import commands
@@ -19,7 +19,7 @@ from ...audio_dataclasses import LocalPath, Query
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass
log = logging.getLogger("red.cogs.Audio.cog.Utilities.formatting")
log = getLogger("red.cogs.Audio.cog.Utilities.formatting")
_ = Translator("Audio", Path(__file__))
RE_SQUARE = re.compile(r"[\[\]]")

4
redbot/cogs/audio/core/utilities/local_tracks.py
View File

@@ -1,11 +1,11 @@
import contextlib
import logging
from pathlib import Path
from typing import List, Union
import discord
import lavalink
from red_commons.logging import getLogger
from fuzzywuzzy import process
from redbot.core import commands
@@ -17,7 +17,7 @@ from ...errors import TrackEnqueueError
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass
log = logging.getLogger("red.cogs.Audio.cog.Utilities.local_tracks")
log = getLogger("red.cogs.Audio.cog.Utilities.local_tracks")
_ = Translator("Audio", Path(__file__))

4
redbot/cogs/audio/core/utilities/miscellaneous.py
View File

@@ -3,7 +3,6 @@ import contextlib
import datetime
import functools
import json
import logging
import re
import struct
from pathlib import Path
@@ -12,6 +11,7 @@ from typing import Any, Final, Mapping, MutableMapping, Pattern, Union, cast
import discord
import lavalink
from discord.embeds import EmptyEmbed
from red_commons.logging import getLogger
from redbot.core import bank, commands
from redbot.core.commands import Context
@@ -24,7 +24,7 @@ from ...utils import PlaylistScope, task_callback_trace
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass, DataReader
log = logging.getLogger("red.cogs.Audio.cog.Utilities.miscellaneous")
log = getLogger("red.cogs.Audio.cog.Utilities.miscellaneous")
_ = Translator("Audio", Path(__file__))
_RE_TIME_CONVERTER: Final[Pattern] = re.compile(r"(?:(\d+):)?([0-5]?[0-9]):([0-5][0-9])")
_prefer_lyrics_cache = {}

4
redbot/cogs/audio/core/utilities/parsers.py
View File

@@ -1,15 +1,15 @@
import logging
import re
import struct
from typing import Final, Optional
import aiohttp
from red_commons.logging import getLogger
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass
log = logging.getLogger("red.cogs.Audio.cog.Utilities.Parsing")
log = getLogger("red.cogs.Audio.cog.Utilities.Parsing")
STREAM_TITLE: Final[re.Pattern] = re.compile(br"StreamTitle='([^']*)';")

4
redbot/cogs/audio/core/utilities/player.py
View File

@@ -1,4 +1,3 @@
import logging
import time
from pathlib import Path
@@ -7,6 +6,7 @@ from typing import List, Optional, Tuple, Union
import aiohttp
import discord
import lavalink
from red_commons.logging import getLogger
from discord.embeds import EmptyEmbed
from redbot.core import commands
@@ -20,7 +20,7 @@ from ...utils import Notifier
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass
log = logging.getLogger("red.cogs.Audio.cog.Utilities.player")
log = getLogger("red.cogs.Audio.cog.Utilities.player")
_ = Translator("Audio", Path(__file__))

4
redbot/cogs/audio/core/utilities/playlists.py
View File

@@ -2,7 +2,6 @@ import asyncio
import contextlib
import datetime
import json
import logging
import math
import random
import time
@@ -14,6 +13,7 @@ import aiohttp
import discord
import lavalink
from discord.embeds import EmptyEmbed
from red_commons.logging import getLogger
from redbot.core import commands
from redbot.core.i18n import Translator
@@ -29,7 +29,7 @@ from ...utils import Notifier, PlaylistScope
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass
log = logging.getLogger("red.cogs.Audio.cog.Utilities.playlists")
log = getLogger("red.cogs.Audio.cog.Utilities.playlists")
_ = Translator("Audio", Path(__file__))
CURRATED_DATA = (
"https://gist.githubusercontent.com/aikaterna/4b5de6c420cd6f12b83cb895ca2de16a/raw/json"

4
redbot/cogs/audio/core/utilities/queue.py
View File

@@ -1,4 +1,3 @@
import logging
import math
from pathlib import Path
@@ -6,6 +5,7 @@ from typing import List, Tuple
import discord
import lavalink
from red_commons.logging import getLogger
from fuzzywuzzy import process
from redbot.core import commands
@@ -17,7 +17,7 @@ from ...audio_dataclasses import LocalPath, Query
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass
log = logging.getLogger("red.cogs.Audio.cog.Utilities.queue")
log = getLogger("red.cogs.Audio.cog.Utilities.queue")
_ = Translator("Audio", Path(__file__))

4
redbot/cogs/audio/core/utilities/validation.py
View File

@@ -1,10 +1,10 @@
import logging
import re
from typing import Final, List, Optional, Pattern, Set, Union
from urllib.parse import urlparse
import discord
from red_commons.logging import getLogger
from redbot.core import Config
from redbot.core.commands import Context
@@ -13,7 +13,7 @@ from ...audio_dataclasses import Query
from ..abc import MixinMeta
from ..cog_utils import CompositeMetaClass
log = logging.getLogger("red.cogs.Audio.cog.Utilities.validation")
log = getLogger("red.cogs.Audio.cog.Utilities.validation")
_RE_YT_LIST_PLAYLIST: Final[Pattern] = re.compile(
r"^(https?://)?(www\.)?(youtube\.com|youtu\.?be)(/playlist\?).*(list=)(.*)(&|$)"