Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get jars direct frrom paper

Browse Source
This commit is contained in:
amcmanu3 2024-01-12 11:23:35 -05:00
parent cd3b8d4d9c
commit 96d5ce58d2
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/classes/minecraft/serverjars.py
View File

@ -11,18 +11,18 @@ from app.classes.models.server_permissions import PermissionsServers
from app.classes.shared.websocket_manager import WebSocketManager
logger = logging.getLogger(__name__)
MINEACADEMYJARS = ["paper", "folia"]
PAPERJARS = ["paper", "folia"]
class ServerJars:
def __init__(self, helper):
self.helper = helper
self.base_url = "https://serverjars.com"
self.academy = "https://mineacademy.org"
self.paper_base = "https://api.papermc.io"
@staticmethod
def get_mineacademy_jars():
return MINEACADEMYJARS
def get_paper_jars():
return PAPERJARS
def _get_api_result(self, call_url: str):
full_url = f"{self.base_url}{call_url}"
@ -47,7 +47,7 @@ class ServerJars:
def get_paper_versions(self, project):
try:
response = requests.get(
f"https://api.papermc.io/v2/projects/{project}/", timeout=2
f"{self.paper_base}/v2/projects/{project}/", timeout=2
)
response.raise_for_status()
api_data = json.loads(response.content)
@ -61,6 +61,23 @@ class ServerJars:
versions.reverse()
return versions
def get_paper_build(self, project, version):
try:
response = requests.get(
f"{self.paper_base}/v2/projects/{project}/versions/{version}/builds/",
timeout=2,
)
response.raise_for_status()
api_data = json.loads(response.content)
except Exception as e:
logger.error(
f"Unable to load https://api.papermc.io/v2/projects/{project}/"
f"api due to error: {e}"
)
return {}
build = api_data.get("builds", [])[-1]
return build
def _read_cache(self):
cache_file = self.helper.serverjar_cache
cache = {}
@ -118,7 +135,7 @@ class ServerJars:
for j in data["types"].get(s):
versions = self._get_jar_details(j, s)
data["types"][s].update({j: versions})
for item in MINEACADEMYJARS:
for item in PAPERJARS:
data["types"]["servers"][item] = self.get_paper_versions(item)
# save our cache
try:
@ -158,7 +175,7 @@ class ServerJars:
for j in data["types"].get(s):
versions = self._get_jar_details(j, s)
data["types"][s].update({j: versions})
for item in MINEACADEMYJARS:
for item in PAPERJARS:
data["types"]["servers"][item] = self.get_paper_versions()
# save our cache
try:
@ -198,11 +215,16 @@ class ServerJars:
def a_download_jar(self, jar, server, version, path, server_id):
# delaying download for server register to finish
time.sleep(3)
if server not in MINEACADEMYJARS:
if server not in PAPERJARS:
fetch_url = f"{self.base_url}/api/fetchJar/{jar}/{server}/{version}"
else:
build = self.get_paper_build(server, version).get("build", None)
if not build:
return
fetch_url = (
f"https://mineacademy.org/api/{server}/{str(version).replace('.', '_')}"
f"{self.paper_base}/v2/projects"
f"/{server}/versions/{version}/builds/{build}/downloads/"
f"{server}-{version}-{build}.jar"
)
server_users = PermissionsServers.get_server_user_list(server_id)

2
app/classes/shared/main_controller.py
View File

@ -538,7 +538,7 @@ class Controller:
# modded update urls from server jars will only update the installer
if create_data["category"] != "modded":
server_obj = self.servers.get_server_obj(new_server_id)
if create_data["type"] not in ServerJars.get_mineacademy_jars():
if create_data["type"] not in ServerJars.get_paper_jars():
url = (
"https://serverjars.com/api/fetchJar/"
f"{create_data['category']}"