Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 20:40:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

Add trailing / to BukkitDL URLs. Fixes BUKKIT-2015.

Quellcode durchsuchen 
Also adds CraftBukkit version number to user agent when communicating with
BukkitDL.
Dieser Commit ist enthalten in:
Luke Granger-Brown 2012-08-02 23:35:08 +01:00 committet von Travis Watkins
Ursprung 8dc52123bf
Commit 35a3d701a9
1 geänderte Dateien mit 13 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

17
src/main/java/org/bukkit/craftbukkit/updater/BukkitDLUpdaterService.java
Datei anzeigen

@ -6,6 +6,7 @@ import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
import java.net.URL;
import java.net.URLConnection;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -34,12 +35,18 @@ public class BukkitDLUpdaterService {
return null;
}
private String getUserAgent() {
return "CraftBukkit/" + BukkitDLUpdaterService.class.getPackage().getImplementationVersion() + "/" + System.getProperty("java.version");
}
public ArtifactDetails fetchArtifact(String slug) throws UnsupportedEncodingException, IOException {
URL url = new URL("http", host, API_PREFIX_ARTIFACT + slug);
URL url = new URL("http", host, API_PREFIX_ARTIFACT + slug + "/");
InputStreamReader reader = null;
try {
reader = new InputStreamReader(url.openStream());
URLConnection connection = url.openConnection();
connection.setRequestProperty("User-Agent", getUserAgent());
reader = new InputStreamReader(connection.getInputStream());
Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, dateDeserializer).setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
ArtifactDetails fromJson = gson.fromJson(reader, ArtifactDetails.class);
@ -64,11 +71,13 @@ public class BukkitDLUpdaterService {
}
public ArtifactDetails.ChannelDetails fetchChannel(String slug) throws UnsupportedEncodingException, IOException {
URL url = new URL("http", host, API_PREFIX_CHANNEL + slug);
URL url = new URL("http", host, API_PREFIX_CHANNEL + slug + "/");
InputStreamReader reader = null;
try {
reader = new InputStreamReader(url.openStream());
URLConnection connection = url.openConnection();
connection.setRequestProperty("User-Agent", getUserAgent());
reader = new InputStreamReader(connection.getInputStream());
Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, dateDeserializer).setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
ArtifactDetails.ChannelDetails fromJson = gson.fromJson(reader, ArtifactDetails.ChannelDetails.class);