Enhance dumb library support

This commit is contained in:
Fierelier 2021-06-16 11:11:51 +02:00
parent 5f251b4593
commit 3b04739040

View File

@ -175,10 +175,10 @@ def processVersion(versionsPath,libraryPath,nativePath,version):
native = library["downloads"]["classifiers"]["natives-osx"]
elif "name" in library:
# Dumb libraries
if "url" in library:
l["url"] = library["url"]
while len(l["url"]) > 0 and l["url"][-1] == "/": l["url"] = l["url"][:-1]
l["url"] = l["url"] + "/" + l["filePath"]
if not "url" in library: library["url"] = "https://libraries.minecraft.net"
l["url"] = library["url"]
while len(l["url"]) > 0 and l["url"][-1] == "/": l["url"] = l["url"][:-1]
l["url"] = l["url"] + "/" + l["filePath"]
l["filePathOS"] = p(libraryPath,l["filePath"].replace("/",os.path.sep))
libraries.append(l)
@ -284,7 +284,10 @@ def main():
print("\nDownloading libraries...")
for library in libraries:
if "url" in library:
fileDl(library["url"],library["filePathOS"],read = False)
try:
fileDl(library["url"],library["filePathOS"],read = False)
except Exception as e:
print("Could not download: " +str(e))
loadLibraries = {}
for library in libraries:
@ -305,7 +308,7 @@ def main():
else:
print("- " +library["path"]+ ":" +library["version"])
else:
print("Lib not found: " +library["path"])
print("Lib not found: " +library["path"]+ ":" +library["version"])
libraryList += library["filePathOS"] + separator
libraryList = libraryList[:-1]