Debug: log server version response
This commit is contained in:
@@ -95,9 +95,21 @@ public class Bootstrap {
|
|||||||
conn.setReadTimeout(5000);
|
conn.setReadTimeout(5000);
|
||||||
if (conn.getResponseCode() == 200) {
|
if (conn.getResponseCode() == 200) {
|
||||||
try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
|
try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
|
||||||
String line = br.readLine();
|
StringBuilder sb = new StringBuilder();
|
||||||
if (line != null && line.contains("version")) {
|
String line;
|
||||||
return line.replaceAll(".*\"version\"\\s*:\\s*\"([^\"]+)\".*", "$1");
|
while ((line = br.readLine()) != null) {
|
||||||
|
sb.append(line);
|
||||||
|
}
|
||||||
|
String response = sb.toString();
|
||||||
|
log("Server response: " + response);
|
||||||
|
|
||||||
|
int versionStart = response.indexOf("\"version\":\"");
|
||||||
|
if (versionStart >= 0) {
|
||||||
|
int afterVersion = versionStart + 11;
|
||||||
|
int versionEnd = response.indexOf("\"", afterVersion);
|
||||||
|
if (versionEnd > afterVersion) {
|
||||||
|
return response.substring(afterVersion, versionEnd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-4
@@ -878,6 +878,14 @@ def scan_launcher_version(version: str) -> Optional[dict]:
|
|||||||
return meta
|
return meta
|
||||||
|
|
||||||
|
|
||||||
|
def parse_version_key(v: str) -> tuple:
|
||||||
|
"""Parse version string for proper numeric sorting"""
|
||||||
|
try:
|
||||||
|
parts = v.split(".")
|
||||||
|
return tuple(int(p) for p in parts)
|
||||||
|
except:
|
||||||
|
return (0, 0, 0)
|
||||||
|
|
||||||
def get_launcher_versions() -> list:
|
def get_launcher_versions() -> list:
|
||||||
"""Get list of available launcher versions with meta"""
|
"""Get list of available launcher versions with meta"""
|
||||||
if not VERSIONS_DIR.exists():
|
if not VERSIONS_DIR.exists():
|
||||||
@@ -893,7 +901,7 @@ def get_launcher_versions() -> list:
|
|||||||
"meta": meta
|
"meta": meta
|
||||||
})
|
})
|
||||||
|
|
||||||
versions.sort(key=lambda x: x["version"], reverse=True)
|
versions.sort(key=lambda x: parse_version_key(x["version"]), reverse=True)
|
||||||
return versions
|
return versions
|
||||||
|
|
||||||
|
|
||||||
@@ -955,7 +963,7 @@ def get_available_zips() -> list:
|
|||||||
"is_legacy": parsed["is_legacy"]
|
"is_legacy": parsed["is_legacy"]
|
||||||
})
|
})
|
||||||
|
|
||||||
zips.sort(key=lambda x: x["version"], reverse=True)
|
zips.sort(key=lambda x: parse_version_key(x["version"]), reverse=True)
|
||||||
return zips
|
return zips
|
||||||
|
|
||||||
|
|
||||||
@@ -975,7 +983,7 @@ def get_new_format_zips() -> list:
|
|||||||
"modified": datetime.fromtimestamp(stat.st_mtime).isoformat()
|
"modified": datetime.fromtimestamp(stat.st_mtime).isoformat()
|
||||||
})
|
})
|
||||||
|
|
||||||
zips.sort(key=lambda x: x["version"], reverse=True)
|
zips.sort(key=lambda x: parse_version_key(x["version"]), reverse=True)
|
||||||
return zips
|
return zips
|
||||||
|
|
||||||
|
|
||||||
@@ -1005,7 +1013,7 @@ def get_legacy_zips() -> list:
|
|||||||
"is_legacy": True
|
"is_legacy": True
|
||||||
})
|
})
|
||||||
|
|
||||||
zips.sort(key=lambda x: x["version"], reverse=True)
|
zips.sort(key=lambda x: parse_version_key(x["version"]), reverse=True)
|
||||||
return zips
|
return zips
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user