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

Single-source supported Java versions in Audio code (#6500)

Browse Source
This commit is contained in:
Jakub Kuczys
2025-01-26 23:03:20 +01:00
committed by GitHub
parent 22888f8014
commit 6bf2a88995
5 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
redbot/cogs/audio/manager.py
View File

@@ -21,6 +21,7 @@ from red_commons.logging import getLogger
from redbot.core import data_manager, Config
from redbot.core.i18n import Translator
from redbot.core.utils.chat_formatting import humanize_list
from . import managed_node
from .errors import (
@@ -36,6 +37,7 @@ from .errors import (
NoProcessFound,
NodeUnhealthy,
)
from .managed_node import version_pins
from .managed_node.ll_version import LAVALINK_BUILD_LINE, LavalinkVersion, LavalinkOldVersion
from .utils import (
get_max_allocation_size,
@@ -109,7 +111,7 @@ LAVALINK_BUILD_TIME_LINE: Final[Pattern] = re.compile(
class ServerManager:
LAVALINK_DOWNLOAD_URL: Final[str] = (
"https://github.com/Cog-Creators/Lavalink-Jars/releases/download/"
f"{managed_node.JAR_VERSION}/"
f"{version_pins.JAR_VERSION}/"
"Lavalink.jar"
)
@@ -254,15 +256,29 @@ class ServerManager:
if self._java_version is None:
extras = ""
else:
extras = f" however you have version {self._java_version} (executable: {self._java_exc})"
version = ".".join(map(str, self._java_version))
extras = f" however you have version {version} (executable: {self._java_exc})"
supported_versions = humanize_list(
list(map(str, version_pins.SUPPORTED_JAVA_VERSIONS)),
locale="en-US",
style="or-short",
)
latest_version = str(version_pins.LATEST_SUPPORTED_JAVA_VERSION)
older_versions = humanize_list(
list(map(str, reversed(version_pins.OLDER_SUPPORTED_JAVA_VERSIONS))),
locale="en-US",
style="or-short",
)
raise UnsupportedJavaException(
await replace_p_with_prefix(
self.cog.bot,
f"The managed Lavalink node requires Java 17 or 11 to run{extras};\n"
"Either install version 17 (or 11) and restart the bot or connect to an external Lavalink node "
"(https://docs.discord.red/en/stable/install_guides/index.html)\n"
"If you already have Java 17 or 11 installed then then you will need to specify the executable path, "
"use '[p]llset java' to set the correct Java 17 or 11 executable.",
f"The managed Lavalink node requires Java {supported_versions} to run{extras};\n"
f"Either install version {latest_version} (or {older_versions})"
" and restart the bot or connect to an external Lavalink node"
" (https://docs.discord.red/en/stable/install_guides/index.html)\n"
f"If you already have Java {supported_versions} installed"
" then you will need to specify the executable path,"
f" use '[p]llset java' to set the correct Java {supported_versions} executable.",
) # TODO: Replace with Audio docs when they are out
)
java_xms, java_xmx = list((await self._config.java.all()).values())
@@ -300,7 +316,7 @@ class ServerManager:
self._java_version = None
else:
self._java_version = await self._get_java_version()
self._java_available = self._java_version[0] in (11, 17)
self._java_available = self._java_version[0] in version_pins.SUPPORTED_JAVA_VERSIONS
self._java_exc = java_exec
return self._java_available, self._java_version
@@ -386,7 +402,7 @@ class ServerManager:
# A 404 means our LAVALINK_DOWNLOAD_URL is invalid, so likely the jar version
# hasn't been published yet
raise LavalinkDownloadFailed(
f"Lavalink jar version {managed_node.JAR_VERSION}"
f"Lavalink jar version {version_pins.JAR_VERSION}"
" hasn't been published yet",
response=response,
should_retry=False,
@@ -474,7 +490,7 @@ class ServerManager:
self._jvm = java["jvm"].decode()
self._lavaplayer = lavaplayer["lavaplayer"].decode()
self._buildtime = date
self._up_to_date = self._lavalink_version >= managed_node.JAR_VERSION
self._up_to_date = self._lavalink_version >= version_pins.JAR_VERSION
return self._up_to_date
async def maybe_download_jar(self):
@@ -494,7 +510,7 @@ class ServerManager:
log.info(
"Lavalink version outdated, triggering update from %s to %s...",
self._lavalink_version,
managed_node.JAR_VERSION,
version_pins.JAR_VERSION,
)
await self._download_jar()
else: