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/apis/api_utils.py
View File

@@ -1,6 +1,5 @@
import datetime
import json
import logging
from collections import namedtuple
from dataclasses import dataclass, field
from pathlib import Path
@@ -8,6 +7,7 @@ from typing import List, MutableMapping, Optional, Union
import discord
import lavalink
from red_commons.logging import getLogger
from redbot.core.bot import Red
from redbot.core.i18n import Translator
@@ -16,7 +16,7 @@ from redbot.core.utils.chat_formatting import humanize_list
from ..errors import InvalidPlaylistScope, MissingAuthor, MissingGuild
from ..utils import PlaylistScope
log = logging.getLogger("red.cogs.Audio.api.utils")
log = getLogger("red.cogs.Audio.api.utils")
_ = Translator("Audio", Path(__file__))

4
redbot/cogs/audio/apis/global_db.py
View File

@@ -1,7 +1,6 @@
import asyncio
import contextlib
import json
import logging
from copy import copy
from pathlib import Path
@@ -9,6 +8,7 @@ from typing import TYPE_CHECKING, Mapping, Optional, Union
import aiohttp
from lavalink.rest_api import LoadResult
from red_commons.logging import getLogger
from redbot.core import Config
from redbot.core.bot import Red
@@ -22,7 +22,7 @@ if TYPE_CHECKING:
_API_URL = "https://api.redbot.app/"
_ = Translator("Audio", Path(__file__))
log = logging.getLogger("red.cogs.Audio.api.GlobalDB")
log = getLogger("red.cogs.Audio.api.GlobalDB")
class GlobalCacheWrapper:

4
redbot/cogs/audio/apis/interface.py
View File

@@ -2,7 +2,6 @@ import asyncio
import contextlib
import datetime
import json
import logging
import random
import time
@@ -13,6 +12,7 @@ from typing import TYPE_CHECKING, Callable, List, MutableMapping, Optional, Tupl
import aiohttp
import discord
import lavalink
from red_commons.logging import getLogger
from lavalink.rest_api import LoadResult, LoadType
from redbot.core import Config, commands
@@ -38,7 +38,7 @@ if TYPE_CHECKING:
from .. import Audio
_ = Translator("Audio", Path(__file__))
log = logging.getLogger("red.cogs.Audio.api.AudioAPIInterface")
log = getLogger("red.cogs.Audio.api.AudioAPIInterface")
_TOP_100_US = "https://www.youtube.com/playlist?list=PL4fGSI1pDJn5rWitrRWFKdm-ulaFiIyoK"
# TODO: Get random from global Cache

6
redbot/cogs/audio/apis/local_db.py
View File

@@ -1,14 +1,14 @@
import concurrent
import contextlib
import datetime
import logging
import random
import time
from pathlib import Path
from types import SimpleNamespace
from typing import TYPE_CHECKING, Callable, List, MutableMapping, Optional, Tuple, Union
from red_commons.logging import getLogger
from redbot.core import Config
from redbot.core.bot import Red
from redbot.core.commands import Cog
@@ -59,7 +59,7 @@ if TYPE_CHECKING:
from .. import Audio
log = logging.getLogger("red.cogs.Audio.api.LocalDB")
log = getLogger("red.cogs.Audio.api.LocalDB")
_ = Translator("Audio", Path(__file__))
_SCHEMA_VERSION = 3

4
redbot/cogs/audio/apis/persist_queue_wrapper.py
View File

@@ -1,6 +1,5 @@
import concurrent
import json
import logging
import time
from pathlib import Path
@@ -8,6 +7,7 @@ from types import SimpleNamespace
from typing import TYPE_CHECKING, List, Union
import lavalink
from red_commons.logging import getLogger
from redbot.core import Config
from redbot.core.bot import Red
@@ -33,7 +33,7 @@ from ..sql_statements import (
)
from .api_utils import QueueFetchResult
log = logging.getLogger("red.cogs.Audio.api.PersistQueueWrapper")
log = getLogger("red.cogs.Audio.api.PersistQueueWrapper")
_ = Translator("Audio", Path(__file__))
if TYPE_CHECKING:

4
redbot/cogs/audio/apis/playlist_interface.py
View File

@@ -1,10 +1,10 @@
import logging
from pathlib import Path
from typing import List, MutableMapping, Optional, Union
import discord
import lavalink
from red_commons.logging import getLogger
from redbot.core import Config, commands
from redbot.core.bot import Red
@@ -16,7 +16,7 @@ from ..utils import PlaylistScope
from .api_utils import PlaylistFetchResult, prepare_config_scope, standardize_scope
from .playlist_wrapper import PlaylistWrapper
log = logging.getLogger("red.cogs.Audio.api.PlaylistsInterface")
log = getLogger("red.cogs.Audio.api.PlaylistsInterface")
_ = Translator("Audio", Path(__file__))

5
redbot/cogs/audio/apis/playlist_wrapper.py
View File

@@ -1,11 +1,12 @@
import concurrent
import json
import logging
from pathlib import Path
from types import SimpleNamespace
from typing import List, MutableMapping, Optional
from red_commons.logging import getLogger
from redbot.core import Config
from redbot.core.bot import Red
from redbot.core.i18n import Translator
@@ -33,7 +34,7 @@ from ..sql_statements import (
from ..utils import PlaylistScope
from .api_utils import PlaylistFetchResult
log = logging.getLogger("red.cogs.Audio.api.Playlists")
log = getLogger("red.cogs.Audio.api.Playlists")
_ = Translator("Audio", Path(__file__))

4
redbot/cogs/audio/apis/spotify.py
View File

@@ -1,13 +1,13 @@
import base64
import contextlib
import json
import logging
import time
from pathlib import Path
from typing import TYPE_CHECKING, List, Mapping, MutableMapping, Optional, Tuple, Union
import aiohttp
from red_commons.logging import getLogger
from redbot.core import Config
from redbot.core.bot import Red
@@ -22,7 +22,7 @@ if TYPE_CHECKING:
_ = Translator("Audio", Path(__file__))
log = logging.getLogger("red.cogs.Audio.api.Spotify")
log = getLogger("red.cogs.Audio.api.Spotify")
CATEGORY_ENDPOINT = "https://api.spotify.com/v1/browse/categories"

4
redbot/cogs/audio/apis/youtube.py
View File

@@ -1,10 +1,10 @@
import json
import logging
from pathlib import Path
from typing import TYPE_CHECKING, Mapping, Optional, Union
import aiohttp
from red_commons.logging import getLogger
from redbot.core import Config
from redbot.core.bot import Red
@@ -16,7 +16,7 @@ from ..errors import YouTubeApiError
if TYPE_CHECKING:
from .. import Audio
log = logging.getLogger("red.cogs.Audio.api.YouTube")
log = getLogger("red.cogs.Audio.api.YouTube")
_ = Translator("Audio", Path(__file__))
SEARCH_ENDPOINT = "https://www.googleapis.com/youtube/v3/search"