CCF_100/Minecraft-Updater
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix IPv6 weirdness?

Browse Source
This commit is contained in:
Chloe Fontenot 🏳️‍⚧️
2021-12-20 09:38:59 -06:00
parent e350811b05
commit b6fd956cc3
6 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parsers/paperMC.py
View File

@@ -1,6 +1,8 @@
from os import error
import requests
debug = False
#import requests
import socket
from request_wrapper import requests_wrapper as requests
debug = True
if debug == True:
import logging
from requests import api
@@ -10,7 +12,7 @@ if debug == True:
requests_log.setLevel(logging.DEBUG)
requests_log.propagate = True
timeoutTime = 1
base_api_url = "https://papermc.io/api/v2"
base_api_url = "https://papermc.io:443/api/v2"
def failCheck(response):
print("Status Code is: "+str(response.status_code))
if response.status_code != 200:
@@ -20,12 +22,13 @@ dataCache = {}
def cacheData(function_name, cached_data):
print("Caching data!")
dataCache[function_name] = cached_data
print("Stored "+function_name+"'s data to cache")
# This function returns the versions from a project from the Paper API.
def getVersions(project):
print("Calling getVersions()...")
if "getVersions" in dataCache:
return dataCache["getVersions"]
response = requests.get(base_api_url+"/projects/"+project, timeout=timeoutTime)
response = requests.get(base_api_url+"/projects/"+project, family=socket.AF_INET, timeout=timeoutTime)
failCheck(response)
api_response = response.json()
cacheData("getVersions", api_response['versions'])
@@ -40,7 +43,7 @@ def getBuildNumber(project, version):
print("Calling getBuildNumber()...")
if "getBuildNumber" in dataCache:
return dataCache["getBuildNumber"]
response = requests.get(base_api_url+"/projects/"+project+"/versions/"+version, timeout=timeoutTime)
response = requests.get(base_api_url+"/projects/"+project+"/versions/"+version, family=socket.AF_INET, timeout=timeoutTime)
failCheck(response)
api_response = response.json()
cacheData("getBuildNumber", api_response['builds'])
@@ -52,7 +55,7 @@ def getBuildInfo(project, version):
return dataCache["getBuildInfo"]
buildID1 = getBuildNumber(project, version)
buildID = str(buildID1[-1])
response = requests.get(base_api_url+"/projects/"+project+"/versions/"+version+"/builds/"+buildID, timeout=timeoutTime)
response = requests.get(base_api_url+"/projects/"+project+"/versions/"+version+"/builds/"+buildID, family=socket.AF_INET, timeout=timeoutTime)
failCheck(response)
api_response = response.json()
cacheData("getBuildInfo", api_response)
@@ -70,7 +73,7 @@ def downloadVersion(project, version):
jarName = getJarInfo(project, version)
buildID1 = getBuildNumber(project, version)
buildID = str(buildID1[-1])
response = requests.get(base_api_url+"/projects/"+project+"/versions/"+version+"/builds/"+buildID+"/downloads/"+jarName["name"], stream=True, timeout=timeoutTime)
response = requests.get(base_api_url+"/projects/"+project+"/versions/"+version+"/builds/"+buildID+"/downloads/"+jarName["name"], family=socket.AF_INET, stream=True, timeout=timeoutTime)
failCheck(response)
return response